229332 2021-08-20 03:18:56 -0700 Add some offlineasm enhancements. 2021-08-24 19:35:49 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=229340 InRadar P2 Normal --- 229449 1 mark.lam mark.lam commit-queue ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1785771 0 mark.lam 2021-08-20 03:18:56 -0700 And also fix a minor LLInt code alignment bug. 1785772 1 webkit-bug-importer 2021-08-20 03:19:16 -0700 <rdar://problem/82163923> 1785774 2 435966 mark.lam 2021-08-20 03:27:06 -0700 Created attachment 435966 proposed patch. 1785857 3 435966 keith_miller 2021-08-20 09:08:54 -0700 Comment on attachment 435966 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=435966&action=review r=me with nits > Source/JavaScriptCore/ChangeLog:10 > + file from /usr/local/include/WebKitAdditions/ first. If the specified file is Nit: This is technically <build-products>/usr/local/include/WebKitAdditions. > Source/JavaScriptCore/offlineasm/parser.rb:266 > + @buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR']; Can you add a FIXME for CMake support here with a bug? I'm fairly sure CMake doesn't set that environment variable. 1785882 4 mark.lam 2021-08-20 09:59:19 -0700 Thanks for the review. (In reply to Keith Miller from comment #3) > > Source/JavaScriptCore/ChangeLog:10 > > + file from /usr/local/include/WebKitAdditions/ first. If the specified file is > > Nit: This is technically <build-products>/usr/local/include/WebKitAdditions. Fixed. > > Source/JavaScriptCore/offlineasm/parser.rb:266 > > + @buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR']; > > Can you add a FIXME for CMake support here with a bug? I'm fairly sure CMake > doesn't set that environment variable. Done. Ref: https://bugs.webkit.org/show_bug.cgi?id=229340 1785884 5 mark.lam 2021-08-20 10:01:35 -0700 Landed in r281321: <http://trac.webkit.org/r281321>. 1786774 6 commit-queue 2021-08-24 09:54:33 -0700 Re-opened since this is blocked by bug 229449 1787065 7 mark.lam 2021-08-24 19:35:49 -0700 Re-landed in r281541: <http://trac.webkit.org/r281541>. 435966 2021-08-20 03:27:06 -0700 2021-08-20 09:08:54 -0700 proposed patch. bug-229332.patch text/plain 8927 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjgxMzA0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDYxIEBA CisyMDIxLTA4LTIwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgc29tZSBvZmZsaW5lYXNtIGVuaGFuY2VtZW50cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTMzMgorICAgICAgICByZGFyOi8vODIxNjM5MjMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAxLiBFbmhh bmNlICJpbmNsdWRlIiBvZmZsaW5lYXNtIEluc3RydWN0aW9uIHRvIGFsd2F5cyBhdHRlbXB0IHRv IGluY2x1ZGUgYW4gYXNtCisgICAgICAgICAgIGZpbGUgZnJvbSAvdXNyL2xvY2FsL2luY2x1ZGUv V2ViS2l0QWRkaXRpb25zLyBmaXJzdC4gIElmIHRoZSBzcGVjaWZpZWQgZmlsZSBpcworICAgICAg ICAgICBub3QgYXZhaWxhYmxlIHRoZXJlLCB0aGVuIGl0IHdpbGwgYXR0ZW1wdCB0byBpbmNsdWRl IHRoZSBmaWxlIGZyb20gdGhlIHNhbWUKKyAgICAgICAgICAgZGlyZWN0b3J5IGFzIHRoZSBjdXJy ZW50IHNvdXJjZSBmaWxlICh3aGljaCBpbiBwcmFjdGljZSwgbWVhbnM9CisgICAgICAgICAgIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC8pLgorCisgICAgICAgIDIuIEVuaGFuY2UgImluY2x1 ZGUiIG9mZmxpbmVhc20gSW5zdHJ1Y3Rpb24gdG8gYWxsb3cgYW4gb3B0aW9uYWwgZmlsZSB0byBi ZQorICAgICAgICAgICBpbmNsdWRlZCBpZiBpdCBleGlzdHMuICBGb3IgZXhhbXBsZSwgdGhlIGZv bGxvd2luZyBvZmZsaW5lYXNtIGNvZGU6CisKKyAgICAgICAgICAgICAgICBpbmNsdWRlPyBMb3dM ZXZlbEludGVycHJldGVyQWRkaXRpb25zCisKKyAgICAgICAgICAgLi4uIHdpbGwgYXR0ZW1wdCB0 byBpbmNsdWRlIGEgZmlsZSBMb3dMZXZlbEludGVycHJldGVyQWRkaXRpb25zLmFzbS4gIElmIHRo ZQorICAgICAgICAgICBmaWxlIGRvZXMgbm90IGV4aXN0LCB0aGlzIHdpbGwgYmUgYSBuby1vcC4g IE5vdGU6IHRoZSAiPyIgYWZ0ZXIgdGhlICJpbmNsdWRlIgorICAgICAgICAgICBtZWFucyB0aGUg aW5jbHVkZSBpcyBvcHRpb25hbC4KKworICAgICAgICAzLiBFbmhhbmNlZCAiZW1pdCIgb2ZmbGlu ZWFzbSBJbnN0cnVjdGlvbiB0byBiZSBhYmxlIHRvIHRha2UgbW9yZSB0aGFuIG9uZSBvcGVyYW5k LgorCisgICAgICAgICAgICJlbWl0IiB1c2VkIHRvIGp1c3QgY29weSB0aGUgc3RyaW5nIG9wZXJh bmQgdGhhdCBmb2xsb3dzIGludG8gdGhlIGdlbmVyYXRlZAorICAgICAgICAgICBMTEludEFzc2Vt Ymx5LmguICBOb3csICJlbWl0IiBjYW4gdGFrZSBtdWx0aXBsZSBjb21tYSBzZXBhcmF0ZWQgb3Bl cmFuZHMsIGFuZAorICAgICAgICAgICB3aWxsIGNvbmNhdGVuYXRlIGFsbCB0aGUgb3BlcmFuZHMu CisKKyAgICAgICAgICAgQWRkaXRpb25hbGx5LCAiZW1pdCIgY2FuIG5vdyB0YWtlIGEgTG9jYWxM YWJlbFJlZmVyZW5jZSBhcyBhbiBvcGVyYW5kLiAgRm9yCisgICAgICAgICAgIGV4YW1wbGUsIHRo aXMgb2ZmbGluZSBhc20gY29kZToKKworICAgICAgICAgICAgICAgICAgIGVtaXQgImIgIiwgLmRv bmUKKyAgICAgICAgICAgICAgICAgICAuLi4KKyAgICAgICAgICAgICAgICAuZG9uZToKKworICAg ICAgICAgICAuLi4gd2lsbCBnZW5lcmF0ZSB0aGlzIGlubGluZSBhc20gY29kZSBpbiBMTEludEFz c2VtYmx5Lmg6CisKKyAgICAgICAgICAgICAgICAiYiAiIExPQ0FMX0xBQkVMX1NUUklORyhfb2Zm bGluZWFzbV9zb21lTGFiZWxfZG9uZSkgIlxuIgorCisgICAgICAgICAgIFRoaXMgbWFrZXMgaXQg ZWFzaWVyIHRvIGVtaXQgYnJhbmNoZXMgdG8gbG9jYWwgbGFiZWxzLgorCisgICAgICAgIDQuIEFs c28gZml4ZWQgTExJbnQgY29kZSBhbGlnbm1lbnQgZm9yIEFSTV9USFVNQjIgYW5kIEFSTTY0Lgor CisgICAgICAgICAgIFByZXZpb3VzbHksIGl0IHdhcyBhbGlnbmVkIHVzaW5nICIuYWxpZ24gNCIg d2hpY2ggbWVhbnMgYWxpZ25lZCBvbiBhIDQKKyAgICAgICAgICAgaW5zdHJ1Y3Rpb24gYm91bmRh cnkuICBOb3RlOiB0aGUgaW50ZXJwcmV0YXRpb24gb2YgLmFsaWduIHZhcmllcyBmb3IgZGlmZmVy ZW50CisgICAgICAgICAgIHRhcmdldCBDUFUgYXJjaGl0ZWN0dXJlcy4KKworICAgICAgICAgICBO b3csIHdlIGRvIHRoZSBhbGlnbm1lbnQgdXNpbmcgIi5iYWxpZ24gNCIgd2hpY2ggbWVhbnMgYWxp Z24gb24gYSA0IGJ5dGUKKyAgICAgICAgICAgYm91bmRhcnkuICBUaGlzIGlzIHRoZSBpbnRlbmRl ZCBhbGlnbm1lbnQgYmVjYXVzZSBBUk02NCBpbnN0cnVjdGlvbiBzaXplIGlzCisgICAgICAgICAg IDQgYnl0ZXMsIGFuZCBBUk1fVEhVTUIyIGluc3RydWN0aW9uIHNpemUgaXMgZWl0aGVyIDIgYnl0 ZXMgb3IgNCBieXRlcy4KKyAgICAgICAgICAgVXNpbmcgLmFsaWduIGJlZm9yZSB3YXMgcG90ZW50 aWFsbHkgd2FzdGluZyBzb21lIGNvZGUgc3BhY2UuCisKKyAgICAgICAgKiBsbGludC9Mb3dMZXZl bEludGVycHJldGVyLmFzbToKKyAgICAgICAgKiBsbGludC9Mb3dMZXZlbEludGVycHJldGVyLmNw cDoKKyAgICAgICAgKiBvZmZsaW5lYXNtL2FzdC5yYjoKKyAgICAgICAgKiBvZmZsaW5lYXNtL3Bh cnNlci5yYjoKKwogMjAyMS0wOC0xOSAgVGltIE5ndXllbiAgPG50aW1AYXBwbGUuY29tPgogCiAg ICAgICAgIEltcGxlbWVudCA6OmJhY2tkcm9wIHBzZXVkbyBlbGVtZW50CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlci5hc20KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuYXNtCShy ZXZpc2lvbiAyODEyOTcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJ bnRlcnByZXRlci5hc20JKHdvcmtpbmcgY29weSkKQEAgLTE5NjQsNiArMTk2NCw4IEBAIF9qc190 cmFtcG9saW5lX2xsaW50X2Z1bmN0aW9uX2Zvcl9jb25zdHIKIF9qc190cmFtcG9saW5lX2xsaW50 X2Z1bmN0aW9uX2Zvcl9jb25zdHJ1Y3RfYXJpdHlfY2hlY2tfdGFnX3dpZGUzMjoKICAgICBjcmFz aCgpCiAKK2luY2x1ZGU/IExvd0xldmVsSW50ZXJwcmV0ZXJBZGRpdGlvbnMKKwogIyBWYWx1ZS1y ZXByZXNlbnRhdGlvbi1zcGVjaWZpYyBjb2RlLgogaWYgSlNWQUxVRTY0CiAgICAgaW5jbHVkZSBM b3dMZXZlbEludGVycHJldGVyNjQKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9M b3dMZXZlbEludGVycHJldGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlci5jcHAJKHJldmlzaW9uIDI4MTI5NykKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDk1LDcgKzQ5NSw3IEBAIEpTVmFsdWUgQ0xvb3A6OmV4ZWN1dGUoT3Bjb2Rl SUQgZW50cnlPcGMKICNpZiBDUFUoQVJNX1RIVU1CMikKICNkZWZpbmUgT0ZGTElORV9BU01fR0xP QkFMX0xBQkVMKGxhYmVsKSAgICAgICAgICBcCiAgICAgIi50ZXh0XG4iICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAotICAgICIuYWxpZ24gNFxuIiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKKyAgICAiLmJhbGlnbiA0XG4iICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXAogICAgICIuZ2xvYmwgIiBTWU1CT0xfU1RSSU5HKGxhYmVsKSAiXG4iICAg ICAgICAgIFwKICAgICBISURFX1NZTUJPTChsYWJlbCkgIlxuIiAgICAgICAgICAgICAgICAgICAg ICBcCiAgICAgIi50aHVtYlxuIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXApA QCAtNTA0LDcgKzUwNCw3IEBAIEpTVmFsdWUgQ0xvb3A6OmV4ZWN1dGUoT3Bjb2RlSUQgZW50cnlP cGMKICNlbGlmIENQVShBUk02NCkKICNkZWZpbmUgT0ZGTElORV9BU01fR0xPQkFMX0xBQkVMKGxh YmVsKSAgICAgICAgIFwKICAgICAiLnRleHRcbiIgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFwKLSAgICAiLmFsaWduIDRcbiIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKKyAgICAiLmJhbGlnbiA0XG4iICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAg ICAgIi5nbG9ibCAiIFNZTUJPTF9TVFJJTkcobGFiZWwpICJcbiIgICAgICAgICBcCiAgICAgSElE RV9TWU1CT0wobGFiZWwpICJcbiIgICAgICAgICAgICAgICAgICAgICBcCiAgICAgU1lNQk9MX1NU UklORyhsYWJlbCkgIjpcbiIKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNt L2FzdC5yYgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9h c3QucmIJKHJldmlzaW9uIDI4MTI5NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5l YXNtL2FzdC5yYgkod29ya2luZyBjb3B5KQpAQCAtOTQ0LDcgKzk0NCwxNSBAQCBjbGFzcyBJbnN0 cnVjdGlvbiA8IE5vZGUKICAgICAgICAgd2hlbiAiZ2xvYmFsQW5ub3RhdGlvbiIKICAgICAgICAg ICAgICRhc20ucHV0R2xvYmFsQW5ub3RhdGlvbgogICAgICAgICB3aGVuICJlbWl0IgotICAgICAg ICAgICAgJGFzbS5wdXRzICIje29wZXJhbmRzWzBdLmR1bXB9IgorICAgICAgICAgICAgc3RyID0g IiI7CisgICAgICAgICAgICBmb3Igb3BlcmFuZCBpbiBvcGVyYW5kcyBkbworICAgICAgICAgICAg ICAgIGlmIChvcGVyYW5kLmlzX2E/IExvY2FsTGFiZWxSZWZlcmVuY2UpCisgICAgICAgICAgICAg ICAgICAgIHN0ciArPSBvcGVyYW5kLmFzbUxhYmVsCisgICAgICAgICAgICAgICAgZWxzZQorICAg ICAgICAgICAgICAgICAgICBzdHIgKz0gIiN7b3BlcmFuZC5kdW1wfSIKKyAgICAgICAgICAgICAg ICBlbmQKKyAgICAgICAgICAgIGVuZAorICAgICAgICAgICAgJGFzbS5wdXRzICIje3N0cn0iCiAg ICAgICAgIHdoZW4gInRhZ0NvZGVQdHIiLCAidGFnUmV0dXJuQWRkcmVzcyIsICJ1bnRhZ1JldHVy bkFkZHJlc3MiLCAicmVtb3ZlQ29kZVB0clRhZyIsICJ1bnRhZ0FycmF5UHRyIiwgInJlbW92ZUFy cmF5UHRyVGFnIgogICAgICAgICBlbHNlCiAgICAgICAgICAgICByYWlzZSAiVW5oYW5kbGVkIG9w Y29kZSAje29wY29kZX0gYXQgI3tjb2RlT3JpZ2luU3RyaW5nfSIKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9vZmZsaW5lYXNtL3BhcnNlci5yYgo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9wYXJzZXIucmIJKHJldmlzaW9uIDI4MTI5NykKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3BhcnNlci5yYgkod29ya2luZyBjb3B5KQpA QCAtMjAwLDYgKzIwMCw4IEBAIGRlZiBsZXgoc3RyLCBmaWxlKQogICAgICAgICAgICAgcmVzdWx0 IDw8IFRva2VuLm5ldyhDb2RlT3JpZ2luLm5ldyhmaWxlLCBsaW5lTnVtYmVyKSwgJCYpCiAgICAg ICAgIHdoZW4gL1xBIi4qIi8KICAgICAgICAgICAgIHJlc3VsdCA8PCBUb2tlbi5uZXcoQ29kZU9y aWdpbi5uZXcoZmlsZSwgbGluZU51bWJlciksICQmKQorICAgICAgICB3aGVuIC9cPy8KKyAgICAg ICAgICAgIHJlc3VsdCA8PCBUb2tlbi5uZXcoQ29kZU9yaWdpbi5uZXcoZmlsZSwgbGluZU51bWJl ciksICQmKQogICAgICAgICBlbHNlCiAgICAgICAgICAgICByYWlzZSAiTGV4ZXIgZXJyb3IgYXQg I3tDb2RlT3JpZ2luLm5ldyhmaWxlLCBsaW5lTnVtYmVyKS50b19zfSwgdW5leHBlY3RlZCBzZXF1 ZW5jZSAje3N0clswLi4yMF0uaW5zcGVjdH0iCiAgICAgICAgIGVuZApAQCAtMjYxLDYgKzI2Myw3 IEBAIGNsYXNzIFBhcnNlcgogICAgICAgICBAdG9rZW5zID0gbGV4KGRhdGEsIGZpbGVOYW1lKQog ICAgICAgICBAaWR4ID0gMAogICAgICAgICBAYW5ub3RhdGlvbiA9IG5pbAorICAgICAgICBAYnVp bGRQcm9kdWN0c0RpcmVjdG9yeSA9IEVOVlsnQlVJTFRfUFJPRFVDVFNfRElSJ107CiAgICAgZW5k CiAgICAgCiAgICAgZGVmIHBhcnNlRXJyb3IoKmNvbW1lbnQpCkBAIC04MTcsMTEgKzgyMCwyMiBA QCBjbGFzcyBQYXJzZXIKICAgICAgICAgICAgICAgICBAaWR4ICs9IDEKICAgICAgICAgICAgIGVs c2lmIEB0b2tlbnNbQGlkeF0gPT0gImluY2x1ZGUiCiAgICAgICAgICAgICAgICAgQGlkeCArPSAx CisgICAgICAgICAgICAgICAgaXNPcHRpb25hbCA9IGZhbHNlCisgICAgICAgICAgICAgICAgaWYg QHRva2Vuc1tAaWR4XSA9PSAiPyIKKyAgICAgICAgICAgICAgICAgICAgaXNPcHRpb25hbCA9IHRy dWUKKyAgICAgICAgICAgICAgICAgICAgQGlkeCArPSAxCisgICAgICAgICAgICAgICAgZW5kCiAg ICAgICAgICAgICAgICAgcGFyc2VFcnJvciB1bmxlc3MgaXNJZGVudGlmaWVyKEB0b2tlbnNbQGlk eF0pCiAgICAgICAgICAgICAgICAgbW9kdWxlTmFtZSA9IEB0b2tlbnNbQGlkeF0uc3RyaW5nCi0g ICAgICAgICAgICAgICAgZmlsZU5hbWUgPSBJbmNsdWRlRmlsZS5uZXcobW9kdWxlTmFtZSwgQHRv a2Vuc1tAaWR4XS5jb2RlT3JpZ2luLmZpbGVOYW1lLmRpcm5hbWUpLmZpbGVOYW1lCiAgICAgICAg ICAgICAgICAgQGlkeCArPSAxCi0gICAgICAgICAgICAgICAgbGlzdCA8PCBwYXJzZShmaWxlTmFt ZSkKKyAgICAgICAgICAgICAgICBhZGRpdGlvbnNEaXJlY3RvcnlOYW1lID0gIiN7QGJ1aWxkUHJv ZHVjdHNEaXJlY3Rvcnl9L3Vzci9sb2NhbC9pbmNsdWRlL1dlYktpdEFkZGl0aW9ucy8iCisgICAg ICAgICAgICAgICAgZmlsZU5hbWUgPSBJbmNsdWRlRmlsZS5uZXcobW9kdWxlTmFtZSwgYWRkaXRp b25zRGlyZWN0b3J5TmFtZSkuZmlsZU5hbWUKKyAgICAgICAgICAgICAgICBpZiBub3QgRmlsZS5l eGlzdHM/KGZpbGVOYW1lKQorICAgICAgICAgICAgICAgICAgICBmaWxlTmFtZSA9IEluY2x1ZGVG aWxlLm5ldyhtb2R1bGVOYW1lLCBAdG9rZW5zW0BpZHhdLmNvZGVPcmlnaW4uZmlsZU5hbWUuZGly bmFtZSkuZmlsZU5hbWUKKyAgICAgICAgICAgICAgICBlbmQKKyAgICAgICAgICAgICAgICBmaWxl RXhpc3RzID0gRmlsZS5leGlzdHM/KGZpbGVOYW1lKQorICAgICAgICAgICAgICAgIHJhaXNlICJG aWxlIG5vdCBmb3VuZDogI3tmaWxlTmFtZX0iIGlmIG5vdCBmaWxlRXhpc3RzIGFuZCBub3QgaXNP cHRpb25hbAorICAgICAgICAgICAgICAgIGxpc3QgPDwgcGFyc2UoZmlsZU5hbWUpIGlmIGZpbGVF eGlzdHMKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBwYXJzZUVycm9yICJFeHBl Y3RpbmcgdGVybWluYWwgI3tmaW5hbH0gI3tjb21tZW50fSIKICAgICAgICAgICAgIGVuZApAQCAt ODM4LDEyICs4NTIsMjIgQEAgY2xhc3MgUGFyc2VyCiAgICAgICAgICAgICAgICAgYnJlYWsKICAg ICAgICAgICAgIGVsc2lmIEB0b2tlbnNbQGlkeF0gPT0gImluY2x1ZGUiCiAgICAgICAgICAgICAg ICAgQGlkeCArPSAxCisgICAgICAgICAgICAgICAgaXNPcHRpb25hbCA9IGZhbHNlCisgICAgICAg ICAgICAgICAgaWYgQHRva2Vuc1tAaWR4XSA9PSAiPyIKKyAgICAgICAgICAgICAgICAgICAgaXNP cHRpb25hbCA9IHRydWUKKyAgICAgICAgICAgICAgICAgICAgQGlkeCArPSAxCisgICAgICAgICAg ICAgICAgZW5kCiAgICAgICAgICAgICAgICAgcGFyc2VFcnJvciB1bmxlc3MgaXNJZGVudGlmaWVy KEB0b2tlbnNbQGlkeF0pCiAgICAgICAgICAgICAgICAgbW9kdWxlTmFtZSA9IEB0b2tlbnNbQGlk eF0uc3RyaW5nCi0gICAgICAgICAgICAgICAgZmlsZU5hbWUgPSBJbmNsdWRlRmlsZS5uZXcobW9k dWxlTmFtZSwgQHRva2Vuc1tAaWR4XS5jb2RlT3JpZ2luLmZpbGVOYW1lLmRpcm5hbWUpLmZpbGVO YW1lCiAgICAgICAgICAgICAgICAgQGlkeCArPSAxCi0gICAgICAgICAgICAgICAgCi0gICAgICAg ICAgICAgICAgZmlsZUxpc3QgPDwgZmlsZU5hbWUKKyAgICAgICAgICAgICAgICBhZGRpdGlvbnNE aXJlY3RvcnlOYW1lID0gIiN7QGJ1aWxkUHJvZHVjdHNEaXJlY3Rvcnl9L3Vzci9sb2NhbC9pbmNs dWRlL1dlYktpdEFkZGl0aW9ucy8iCisgICAgICAgICAgICAgICAgZmlsZU5hbWUgPSBJbmNsdWRl RmlsZS5uZXcobW9kdWxlTmFtZSwgYWRkaXRpb25zRGlyZWN0b3J5TmFtZSkuZmlsZU5hbWUKKyAg ICAgICAgICAgICAgICBpZiBub3QgRmlsZS5leGlzdHM/KGZpbGVOYW1lKQorICAgICAgICAgICAg ICAgICAgICBmaWxlTmFtZSA9IEluY2x1ZGVGaWxlLm5ldyhtb2R1bGVOYW1lLCBAdG9rZW5zW0Bp ZHhdLmNvZGVPcmlnaW4uZmlsZU5hbWUuZGlybmFtZSkuZmlsZU5hbWUKKyAgICAgICAgICAgICAg ICBlbmQKKyAgICAgICAgICAgICAgICBmaWxlRXhpc3RzID0gRmlsZS5leGlzdHM/KGZpbGVOYW1l KQorICAgICAgICAgICAgICAgIHJhaXNlICJGaWxlIG5vdCBmb3VuZDogI3tmaWxlTmFtZX0iIGlm IG5vdCBmaWxlRXhpc3RzIGFuZCBub3QgaXNPcHRpb25hbAorICAgICAgICAgICAgICAgIGZpbGVM aXN0IDw8IGZpbGVOYW1lIGlmIGZpbGVFeGlzdHMKICAgICAgICAgICAgIGVsc2UKICAgICAgICAg ICAgICAgICBAaWR4ICs9IDEKICAgICAgICAgICAgIGVuZAo=