237779 2022-03-11 06:34:00 -0800 [JSC] Nested includes do not change offlineasm hash output 2022-04-06 02:06:15 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=221260 InRadar P2 Normal --- 1 aperez aperez ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer xan.lopez ysuzuki oldest_to_newest 1850491 0 aperez 2022-03-11 06:34:00 -0800 If the offlineasm input for scripts like generate_offset_extractor.rb or generate_settings_extractor.rb results in nested includes, modifying files which are not top-level includes does not regenerate the output. For example, if the top-level file “input.asm” includes “foo.asm”, and that in turn includes “bar.asm”, modifying “bar.asm” and re-running generate_offset_extractor.rb on “input.asm” will exit early without parsing the changed file(s) to update the output file. 1850492 1 aperez 2022-03-11 06:34:57 -0800 Xan López found the issue while working on bug #221260 :-) 1850493 2 xan.lopez 2022-03-11 06:36:44 -0800 (In reply to Adrian Perez from comment #0) > If the offlineasm input for scripts like generate_offset_extractor.rb or > generate_settings_extractor.rb > results in nested includes, modifying files which are not top-level includes > does not regenerate the > output. > > For example, if the top-level file “input.asm” includes “foo.asm”, and that > in turn includes “bar.asm”, > modifying “bar.asm” and re-running generate_offset_extractor.rb on > “input.asm” will exit early without > parsing the changed file(s) to update the output file. FWIW I think the code as-is will detect changes to both input.asm and foo.asm, but *not* to bar.asm, because it's already one level too deep. There are no examples of this in the tree right now, but the wasm32 patch includes one (LowLevelInterpreter.asm -> WebAssembly.asm -> WebAssembly32_64.asm, for example]. This patch fixes that situation. 1850496 3 454481 aperez 2022-03-11 06:48:07 -0800 Created attachment 454481 Patch 1852712 4 webkit-bug-importer 2022-03-18 07:34:16 -0700 <rdar://problem/90484720> 1855894 5 454481 mark.lam 2022-03-28 20:09:35 -0700 Comment on attachment 454481 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454481&action=review > Source/JavaScriptCore/offlineasm/parser.rb:884 > + fileList << fileName I think this is not needed because line 858 above will add it when we recurse into parseIncludes(). Can you confirm by dumping the flattened fileList in parseHash()? I suspect the way you have it now, we're hashing every included file twice. 1858521 6 aperez 2022-04-05 12:57:21 -0700 (In reply to Mark Lam from comment #5) > Comment on attachment 454481 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=454481&action=review > > > Source/JavaScriptCore/offlineasm/parser.rb:884 > > + fileList << fileName > > I think this is not needed because line 858 above will add it when we > recurse into parseIncludes(). Can you confirm by dumping the flattened > fileList in parseHash()? I suspect the way you have it now, we're hashing > every included file twice. You are right, we don't need to re-add the “fileName” to the list, given that the path was already recorded in the list in line above 858—good catch, thanks! I'll upload a new version of the patch without it. 1858523 7 456735 aperez 2022-04-05 12:59:45 -0700 Created attachment 456735 Patch v2 1858532 8 456735 mark.lam 2022-04-05 13:14:29 -0700 Comment on attachment 456735 Patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=456735&action=review r=me with suggested ChangeLog clarification. > Source/JavaScriptCore/ChangeLog:13 > + further processed. This adds the missing recursive processing of "include" directives /processed./processed for 2nd or additional nested levels of includes./ The 1st level is being parsed. "processed" here is a bit ambiguous as in "was it parsed for the hash" or "was it parsed for additional levels of include". I understand that you meant the latter, but rephrasing as above would make it clear. 1858706 9 aperez 2022-04-06 00:25:11 -0700 (In reply to Mark Lam from comment #8) > Comment on attachment 456735 [details] > Patch v2 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=456735&action=review > > r=me with suggested ChangeLog clarification. > > > Source/JavaScriptCore/ChangeLog:13 > > + further processed. This adds the missing recursive processing of "include" directives > > /processed./processed for 2nd or additional nested levels of includes./ > > The 1st level is being parsed. "processed" here is a bit ambiguous as in > "was it parsed for the hash" or "was it parsed for additional levels of > include". I understand that you meant the latter, but rephrasing as above > would make it clear. Yes, you understood correctly. I'll write down the ChangeLog entry with the suggested wording before landing, which makes the intention of the patch clearer. Thanks! 1858721 10 456790 aperez 2022-04-06 01:22:20 -0700 Created attachment 456790 Patch for landing 1858736 11 ews-feeder 2022-04-06 02:06:11 -0700 Committed r292454 (249305@main): <https://commits.webkit.org/249305@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456790. 454481 2022-03-11 06:48:07 -0800 2022-04-05 12:59:41 -0700 Patch bug-237779-20220311164806.patch text/plain 2843 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwOTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh NmM5ZTg2YTQ1NDFlNDRmYzhlMTg2NjI3YTZmYmM4YWMzMzBmNDE4Li40YTI4NjI2ZWVmODQ5Nzhk YWM3ZjRmYzk4NDNmNWEyY2Q2ZTBkNjRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMi0wMy0xMSAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBp Z2FsaWEuY29tPgorCisgICAgICAgIFtKU0NdIE5lc3RlZCBpbmNsdWRlcyBkbyBub3QgY2hhbmdl IG9mZmxpbmVhc20gaGFzaCBvdXRwdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNzc3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZSBSdWJ5IHRvb2xpbmcgYXJvdW5kIG9mZmxpbmVhc20gY2FuIHBy b2R1Y2Ugb24gdGhlaXIgb3V0cHV0IGEgbGluZSBjb250YWluaW5nIGEKKyAgICAgICAgY2hlY2tz dW0gd2hpY2ggZGVwZW5kcyBvbiB0aGUgaW5wdXQgZmlsZXMgcHJvY2Vzc2VkLiBUaGlzIGlzIHVz ZWQgdG8gYXZvaWQgcmVkb2luZworICAgICAgICBpbiBjYXNlIHRoZSBzb3VyY2UgZmlsZXMgaGF2 ZSBub3QgYmVlbiBjaGFuZ2VkIHNpbmNlIHRoZSBsYXN0IHJ1bi4gV2hpbGUgdGhlcmUgaXMKKyAg ICAgICAgY29kZSB0byBzY2FuIHRoZSAiaW5jbHVkZSIgZGlyZWN0aXZlcyBpbiB0aGUgbWFpbiBp bnB1dCBmaWxlIGFuZCB0YWtlIHRoZSBpbmNsdWRlZAorICAgICAgICBmaWxlcyBpbnRvIGFjY291 bnQgZm9yIGNoZWNrc3VtIGNhbGN1bGF0aW9uLCBpbmNsdWRlZCBmaWxlcyB0aGVtc2VsdmVzIHdl cmUgbm90IGJlaW5nCisgICAgICAgIGZ1cnRoZXIgcHJvY2Vzc2VkLiBUaGlzIGFkZHMgdGhlIG1p c3NpbmcgcmVjdXJzaXZlIHByb2Nlc3Npbmcgb2YgImluY2x1ZGUiIGRpcmVjdGl2ZXMKKyAgICAg ICAgaW4gb3JkZXIgdG8gdGFrZSBuZXN0ZWQgaW5jbHVkZXMgaW50byBhY2NvdW50LgorCisgICAg ICAgICogb2ZmbGluZWFzbS9wYXJzZXIucmI6IFByb2Nlc3MgbmVzdGVkIGluY2x1ZGVzIHJlY3Vy c2l2ZWx5IGZvciBjaGVja3N1bSBjYWxjdWxhdGlvbi4KKwogMjAyMi0wMy0wOCAgTWFyayBMYW0g IDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGludmFsaWQgQVNTRVJUIGlu IExvY2FsZUlEQnVpbGRlcjo6b3ZlcnJpZGVMYW5ndWFnZVNjcmlwdFJlZ2lvbigpLgpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vcGFyc2VyLnJiIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vcGFyc2VyLnJiCmluZGV4IDI3ZGVjYmE5NzQ3OTQx ZDNjYjc5NWNkMGQwOGY2OTMzNDVmNmMxYTguLmY2MWVkZmFhYmNhZTc1MTQ1OWNhMTc3YTg5YTBl NjhmZGVkNGU0MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNt L3BhcnNlci5yYgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9wYXJzZXIu cmIKQEAgLTg1Miw3ICs4NTIsNyBAQCBjbGFzcyBQYXJzZXIKICAgICAgICAgU2VxdWVuY2UubmV3 KGZpcnN0Q29kZU9yaWdpbiwgbGlzdCkKICAgICBlbmQKIAotICAgIGRlZiBwYXJzZUluY2x1ZGVz KGZpbmFsLCBjb21tZW50KQorICAgIGRlZiBwYXJzZUluY2x1ZGVzKGZpbmFsLCBjb21tZW50LCBv cHRpb25zKQogICAgICAgICBmaXJzdENvZGVPcmlnaW4gPSBAdG9rZW5zW0BpZHhdLmNvZGVPcmln aW4KICAgICAgICAgZmlsZUxpc3QgPSBbXQogICAgICAgICBmaWxlTGlzdCA8PCBAdG9rZW5zW0Bp ZHhdLmNvZGVPcmlnaW4uZmlsZU5hbWUKQEAgLTg4MCw3ICs4ODAsMTEgQEAgY2xhc3MgUGFyc2Vy CiAgICAgICAgICAgICAgICAgZW5kCiAgICAgICAgICAgICAgICAgZmlsZUV4aXN0cyA9IEZpbGUu ZXhpc3RzPyhmaWxlTmFtZSkKICAgICAgICAgICAgICAgICByYWlzZSAiRmlsZSBub3QgZm91bmQ6 ICN7ZmlsZU5hbWV9IiBpZiBub3QgZmlsZUV4aXN0cyBhbmQgbm90IGlzT3B0aW9uYWwKLSAgICAg ICAgICAgICAgICBmaWxlTGlzdCA8PCBmaWxlTmFtZSBpZiBmaWxlRXhpc3RzCisgICAgICAgICAg ICAgICAgaWYgZmlsZUV4aXN0cworICAgICAgICAgICAgICAgICAgICBmaWxlTGlzdCA8PCBmaWxl TmFtZQorICAgICAgICAgICAgICAgICAgICBwYXJzZXIgPSBQYXJzZXIubmV3KHJlYWRUZXh0Rmls ZShmaWxlTmFtZSksIFNvdXJjZUZpbGUubmV3KGZpbGVOYW1lKSwgb3B0aW9ucykKKyAgICAgICAg ICAgICAgICAgICAgZmlsZUxpc3QgPDwgcGFyc2VyLnBhcnNlSW5jbHVkZXMobmlsLCAiIiwgb3B0 aW9ucykKKyAgICAgICAgICAgICAgICBlbmQKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAg ICAgICBAaWR4ICs9IDEKICAgICAgICAgICAgIGVuZApAQCAtOTEzLDcgKzkxNyw4IEBAIGVuZAog CiBkZWYgcGFyc2VIYXNoKGZpbGVOYW1lLCBvcHRpb25zKQogICAgIHBhcnNlciA9IFBhcnNlci5u ZXcocmVhZFRleHRGaWxlKGZpbGVOYW1lKSwgU291cmNlRmlsZS5uZXcoZmlsZU5hbWUpLCBvcHRp b25zKQotICAgIGZpbGVMaXN0ID0gcGFyc2VyLnBhcnNlSW5jbHVkZXMobmlsLCAiIikKKyAgICBm aWxlTGlzdCA9IHBhcnNlci5wYXJzZUluY2x1ZGVzKG5pbCwgIiIsIG9wdGlvbnMpCisgICAgZmls ZUxpc3QuZmxhdHRlbiEKICAgICBmaWxlTGlzdEhhc2goZmlsZUxpc3QpCiBlbmQKIAo= 456735 2022-04-05 12:59:45 -0700 2022-04-06 01:22:15 -0700 Patch v2 bug-237779-20220405225944.patch text/plain 2777 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNDA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 MWZhNTE2NzY2NGRhOWY0YTBlZTJjNWNjZTcxZTVmYThlZGY5MDU5Li4zYTA0NWVkNjFhNTY4ZDcy YmFiYTk2MGU0Y2UwYzQyOTEyZGY2OGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMi0wNC0wNSAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBp Z2FsaWEuY29tPgorCisgICAgICAgIFtKU0NdIE5lc3RlZCBpbmNsdWRlcyBkbyBub3QgY2hhbmdl IG9mZmxpbmVhc20gaGFzaCBvdXRwdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNzc3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZSBSdWJ5IHRvb2xpbmcgYXJvdW5kIG9mZmxpbmVhc20gY2FuIHBy b2R1Y2Ugb24gdGhlaXIgb3V0cHV0IGEgbGluZSBjb250YWluaW5nIGEKKyAgICAgICAgY2hlY2tz dW0gd2hpY2ggZGVwZW5kcyBvbiB0aGUgaW5wdXQgZmlsZXMgcHJvY2Vzc2VkLiBUaGlzIGlzIHVz ZWQgdG8gYXZvaWQgcmVkb2luZworICAgICAgICBpbiBjYXNlIHRoZSBzb3VyY2UgZmlsZXMgaGF2 ZSBub3QgYmVlbiBjaGFuZ2VkIHNpbmNlIHRoZSBsYXN0IHJ1bi4gV2hpbGUgdGhlcmUgaXMKKyAg ICAgICAgY29kZSB0byBzY2FuIHRoZSAiaW5jbHVkZSIgZGlyZWN0aXZlcyBpbiB0aGUgbWFpbiBp bnB1dCBmaWxlIGFuZCB0YWtlIHRoZSBpbmNsdWRlZAorICAgICAgICBmaWxlcyBpbnRvIGFjY291 bnQgZm9yIGNoZWNrc3VtIGNhbGN1bGF0aW9uLCBpbmNsdWRlZCBmaWxlcyB0aGVtc2VsdmVzIHdl cmUgbm90IGJlaW5nCisgICAgICAgIGZ1cnRoZXIgcHJvY2Vzc2VkLiBUaGlzIGFkZHMgdGhlIG1p c3NpbmcgcmVjdXJzaXZlIHByb2Nlc3Npbmcgb2YgImluY2x1ZGUiIGRpcmVjdGl2ZXMKKyAgICAg ICAgaW4gb3JkZXIgdG8gdGFrZSBuZXN0ZWQgaW5jbHVkZXMgaW50byBhY2NvdW50LgorCisgICAg ICAgICogb2ZmbGluZWFzbS9wYXJzZXIucmI6IFByb2Nlc3MgbmVzdGVkIGluY2x1ZGVzIHJlY3Vy c2l2ZWx5IGZvciBjaGVja3N1bSBjYWxjdWxhdGlvbi4KKwogMjAyMi0wNC0wNSAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIE1hcmsgU3RyaW5nKGNvbnN0IGNoYXIq KSBjb25zdHJ1Y3RvciBhcyBleHBsaWNpdApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL29mZmxpbmVhc20vcGFyc2VyLnJiIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVh c20vcGFyc2VyLnJiCmluZGV4IDI3ZGVjYmE5NzQ3OTQxZDNjYjc5NWNkMGQwOGY2OTMzNDVmNmMx YTguLjczNjJkNWQ3NDhhNmI2NGEyZTNhY2NmMWU5MWQ0MzRjNDY0Mjc0YzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3BhcnNlci5yYgorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9wYXJzZXIucmIKQEAgLTg1Miw3ICs4NTIsNyBAQCBj bGFzcyBQYXJzZXIKICAgICAgICAgU2VxdWVuY2UubmV3KGZpcnN0Q29kZU9yaWdpbiwgbGlzdCkK ICAgICBlbmQKIAotICAgIGRlZiBwYXJzZUluY2x1ZGVzKGZpbmFsLCBjb21tZW50KQorICAgIGRl ZiBwYXJzZUluY2x1ZGVzKGZpbmFsLCBjb21tZW50LCBvcHRpb25zKQogICAgICAgICBmaXJzdENv ZGVPcmlnaW4gPSBAdG9rZW5zW0BpZHhdLmNvZGVPcmlnaW4KICAgICAgICAgZmlsZUxpc3QgPSBb XQogICAgICAgICBmaWxlTGlzdCA8PCBAdG9rZW5zW0BpZHhdLmNvZGVPcmlnaW4uZmlsZU5hbWUK QEAgLTg4MCw3ICs4ODAsMTAgQEAgY2xhc3MgUGFyc2VyCiAgICAgICAgICAgICAgICAgZW5kCiAg ICAgICAgICAgICAgICAgZmlsZUV4aXN0cyA9IEZpbGUuZXhpc3RzPyhmaWxlTmFtZSkKICAgICAg ICAgICAgICAgICByYWlzZSAiRmlsZSBub3QgZm91bmQ6ICN7ZmlsZU5hbWV9IiBpZiBub3QgZmls ZUV4aXN0cyBhbmQgbm90IGlzT3B0aW9uYWwKLSAgICAgICAgICAgICAgICBmaWxlTGlzdCA8PCBm aWxlTmFtZSBpZiBmaWxlRXhpc3RzCisgICAgICAgICAgICAgICAgaWYgZmlsZUV4aXN0cworICAg ICAgICAgICAgICAgICAgICBwYXJzZXIgPSBQYXJzZXIubmV3KHJlYWRUZXh0RmlsZShmaWxlTmFt ZSksIFNvdXJjZUZpbGUubmV3KGZpbGVOYW1lKSwgb3B0aW9ucykKKyAgICAgICAgICAgICAgICAg ICAgZmlsZUxpc3QgPDwgcGFyc2VyLnBhcnNlSW5jbHVkZXMobmlsLCAiIiwgb3B0aW9ucykKKyAg ICAgICAgICAgICAgICBlbmQKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBAaWR4 ICs9IDEKICAgICAgICAgICAgIGVuZApAQCAtOTEzLDcgKzkxNiw4IEBAIGVuZAogCiBkZWYgcGFy c2VIYXNoKGZpbGVOYW1lLCBvcHRpb25zKQogICAgIHBhcnNlciA9IFBhcnNlci5uZXcocmVhZFRl eHRGaWxlKGZpbGVOYW1lKSwgU291cmNlRmlsZS5uZXcoZmlsZU5hbWUpLCBvcHRpb25zKQotICAg IGZpbGVMaXN0ID0gcGFyc2VyLnBhcnNlSW5jbHVkZXMobmlsLCAiIikKKyAgICBmaWxlTGlzdCA9 IHBhcnNlci5wYXJzZUluY2x1ZGVzKG5pbCwgIiIsIG9wdGlvbnMpCisgICAgZmlsZUxpc3QuZmxh dHRlbiEKICAgICBmaWxlTGlzdEhhc2goZmlsZUxpc3QpCiBlbmQKIAo= 456790 2022-04-06 01:22:20 -0700 2022-04-06 02:06:13 -0700 Patch for landing bug-237779-20220406112218.patch text/plain 2830 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 MTIwZjZhNzU5ODMyZGZiNGIxNGVhZWEyZmQzZGUwNDMyMGJkYzEzLi43NzlhNDc1MWNiYWFkMzM5 OWY4YzNmNWQwOWNjMzUwM2QwOWU3YmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMi0wNC0wNiAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBp Z2FsaWEuY29tPgorCisgICAgICAgIFtKU0NdIE5lc3RlZCBpbmNsdWRlcyBkbyBub3QgY2hhbmdl IG9mZmxpbmVhc20gaGFzaCBvdXRwdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNzc3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgTGFtLgor CisgICAgICAgIFRoZSBSdWJ5IHRvb2xpbmcgYXJvdW5kIG9mZmxpbmVhc20gY2FuIHByb2R1Y2Ug b24gdGhlaXIgb3V0cHV0IGEgbGluZSBjb250YWluaW5nIGEKKyAgICAgICAgY2hlY2tzdW0gd2hp Y2ggZGVwZW5kcyBvbiB0aGUgaW5wdXQgZmlsZXMgcHJvY2Vzc2VkLiBUaGlzIGlzIHVzZWQgdG8g YXZvaWQgcmVkb2luZworICAgICAgICBpbiBjYXNlIHRoZSBzb3VyY2UgZmlsZXMgaGF2ZSBub3Qg YmVlbiBjaGFuZ2VkIHNpbmNlIHRoZSBsYXN0IHJ1bi4gV2hpbGUgdGhlcmUgaXMKKyAgICAgICAg Y29kZSB0byBzY2FuIHRoZSAiaW5jbHVkZSIgZGlyZWN0aXZlcyBpbiB0aGUgbWFpbiBpbnB1dCBm aWxlIGFuZCB0YWtlIHRoZSBpbmNsdWRlZAorICAgICAgICBmaWxlcyBpbnRvIGFjY291bnQgZm9y IGNoZWNrc3VtIGNhbGN1bGF0aW9uLCBpbmNsdWRlZCBmaWxlcyB0aGVtc2VsdmVzIHdlcmUgbm90 IGJlaW5nCisgICAgICAgIGZ1cnRoZXIgcHJvY2Vzc2VkIGZvciB0aGUgc2Vjb25kIG9yIGFkZGl0 aW9uYWwgbGV2ZWxzIG9mICJpbmNsdWRlOi4gVGhpcyBhZGRzIHRoZQorICAgICAgICBtaXNzaW5n IHJlY3Vyc2l2ZSBwcm9jZXNzaW5nIG9mICJpbmNsdWRlIiBkaXJlY3RpdmVzIGluIG9yZGVyIHRv IHRha2UgbmVzdGVkIGluY2x1ZGVzCisgICAgICAgIGludG8gYWNjb3VudC4KKworICAgICAgICAq IG9mZmxpbmVhc20vcGFyc2VyLnJiOiBQcm9jZXNzIG5lc3RlZCBpbmNsdWRlcyByZWN1cnNpdmVs eSBmb3IgY2hlY2tzdW0gY2FsY3VsYXRpb24uCisKIDIwMjItMDQtMDUgIFl1c3VrZSBTdXp1a2kg IDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBVc2UgaW5saW5lZCBhc3NlcnRp b24gZm9yIENvZGVCbG9jayB0eXBlCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv b2ZmbGluZWFzbS9wYXJzZXIucmIgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9w YXJzZXIucmIKaW5kZXggMjdkZWNiYTk3NDc5NDFkM2NiNzk1Y2QwZDA4ZjY5MzM0NWY2YzFhOC4u NzM2MmQ1ZDc0OGE2YjY0YTJlM2FjY2YxZTkxZDQzNGM0NjQyNzRjNCAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vcGFyc2VyLnJiCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9vZmZsaW5lYXNtL3BhcnNlci5yYgpAQCAtODUyLDcgKzg1Miw3IEBAIGNsYXNz IFBhcnNlcgogICAgICAgICBTZXF1ZW5jZS5uZXcoZmlyc3RDb2RlT3JpZ2luLCBsaXN0KQogICAg IGVuZAogCi0gICAgZGVmIHBhcnNlSW5jbHVkZXMoZmluYWwsIGNvbW1lbnQpCisgICAgZGVmIHBh cnNlSW5jbHVkZXMoZmluYWwsIGNvbW1lbnQsIG9wdGlvbnMpCiAgICAgICAgIGZpcnN0Q29kZU9y aWdpbiA9IEB0b2tlbnNbQGlkeF0uY29kZU9yaWdpbgogICAgICAgICBmaWxlTGlzdCA9IFtdCiAg ICAgICAgIGZpbGVMaXN0IDw8IEB0b2tlbnNbQGlkeF0uY29kZU9yaWdpbi5maWxlTmFtZQpAQCAt ODgwLDcgKzg4MCwxMCBAQCBjbGFzcyBQYXJzZXIKICAgICAgICAgICAgICAgICBlbmQKICAgICAg ICAgICAgICAgICBmaWxlRXhpc3RzID0gRmlsZS5leGlzdHM/KGZpbGVOYW1lKQogICAgICAgICAg ICAgICAgIHJhaXNlICJGaWxlIG5vdCBmb3VuZDogI3tmaWxlTmFtZX0iIGlmIG5vdCBmaWxlRXhp c3RzIGFuZCBub3QgaXNPcHRpb25hbAotICAgICAgICAgICAgICAgIGZpbGVMaXN0IDw8IGZpbGVO YW1lIGlmIGZpbGVFeGlzdHMKKyAgICAgICAgICAgICAgICBpZiBmaWxlRXhpc3RzCisgICAgICAg ICAgICAgICAgICAgIHBhcnNlciA9IFBhcnNlci5uZXcocmVhZFRleHRGaWxlKGZpbGVOYW1lKSwg U291cmNlRmlsZS5uZXcoZmlsZU5hbWUpLCBvcHRpb25zKQorICAgICAgICAgICAgICAgICAgICBm aWxlTGlzdCA8PCBwYXJzZXIucGFyc2VJbmNsdWRlcyhuaWwsICIiLCBvcHRpb25zKQorICAgICAg ICAgICAgICAgIGVuZAogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIEBpZHggKz0g MQogICAgICAgICAgICAgZW5kCkBAIC05MTMsNyArOTE2LDggQEAgZW5kCiAKIGRlZiBwYXJzZUhh c2goZmlsZU5hbWUsIG9wdGlvbnMpCiAgICAgcGFyc2VyID0gUGFyc2VyLm5ldyhyZWFkVGV4dEZp bGUoZmlsZU5hbWUpLCBTb3VyY2VGaWxlLm5ldyhmaWxlTmFtZSksIG9wdGlvbnMpCi0gICAgZmls ZUxpc3QgPSBwYXJzZXIucGFyc2VJbmNsdWRlcyhuaWwsICIiKQorICAgIGZpbGVMaXN0ID0gcGFy c2VyLnBhcnNlSW5jbHVkZXMobmlsLCAiIiwgb3B0aW9ucykKKyAgICBmaWxlTGlzdC5mbGF0dGVu IQogICAgIGZpbGVMaXN0SGFzaChmaWxlTGlzdCkKIGVuZAogCg==