189902 2018-09-23 18:23:34 -0700 offlineasm: fix macro scoping 2018-09-24 16:00:42 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tzagallo tzagallo commit-queue ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1462584 0 tzagallo 2018-09-23 18:23:34 -0700 In the code below, the reference to `f` in `g`, which should refer to the outer macro definition will instead refer to the f argument of the anonymous macro passed to `g`. That leads to this code failing to compile (f expected 0 args but got 1). ``` macro f(x) move x, t0 end macro g(fn) fn(macro () f(42) end) end g(macro(f) f() end) ``` 1462585 1 350594 tzagallo 2018-09-23 18:28:27 -0700 Created attachment 350594 Patch 1462830 2 350670 tzagallo 2018-09-24 12:50:53 -0700 Created attachment 350670 fix error reporting 1462887 3 350670 mark.lam 2018-09-24 14:27:25 -0700 Comment on attachment 350670 fix error reporting View in context: https://bugs.webkit.org/attachment.cgi?id=350670&action=review r+ if your local testing doesn't show any issues and EWS bots are happy. > Source/JavaScriptCore/offlineasm/transform.rb:137 > +$uniqueVarID = 0 nit: Let's name this uniqueMacroVarID since it's only used for macro vars. 1462910 4 350696 tzagallo 2018-09-24 14:53:19 -0700 Created attachment 350696 patch for landing 1462961 5 350696 commit-queue 2018-09-24 15:59:31 -0700 Comment on attachment 350696 patch for landing Clearing flags on attachment: 350696 Committed r236434: <https://trac.webkit.org/changeset/236434> 1462962 6 commit-queue 2018-09-24 15:59:32 -0700 All reviewed patches have been landed. Closing bug. 1462963 7 webkit-bug-importer 2018-09-24 16:00:42 -0700 <rdar://problem/44744036> 350594 2018-09-23 18:28:27 -0700 2018-09-24 12:50:51 -0700 Patch bug-189902-20180923182827.patch text/plain 4429 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw OGE1MjQ0YjA0MGRjMTZhYzY4Mzg5NzRhOWJlOTgzNzNmNDdhNDliLi5lNThlZjczMDMwODRjNTQw YjQ1ZjFiNmIxODgzMDdiYWY1NjEzZjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxOC0wOS0yMyAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBvZmZsaW5lYXNtOiBmaXggbWFjcm8gc2NvcGluZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5OTAyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gdGhlIGNvZGUgYmVsb3csIHRo ZSByZWZlcmVuY2UgdG8gYGZgIGluIGBnYCwgd2hpY2ggc2hvdWxkIHJlZmVyIHRvCisgICAgICAg IHRoZSBvdXRlciBtYWNybyBkZWZpbml0aW9uIHdpbGwgaW5zdGVhZCByZWZlciB0byB0aGUgZiBh cmd1bWVudCBvZiB0aGUKKyAgICAgICAgYW5vbnltb3VzIG1hY3JvIHBhc3NlZCB0byBgZ2AuIFRo YXQgbGVhZHMgdG8gdGhpcyBjb2RlIGZhaWxpbmcgdG8KKyAgICAgICAgY29tcGlsZSAoZiBleHBl Y3RlZCAwIGFyZ3MgYnV0IGdvdCAxKS4KKyAgICAgICAgCisgICAgICAgIGBgYAorICAgICAgICBt YWNybyBmKHgpCisgICAgICAgICAgICBtb3ZlIHgsIHQwCisgICAgICAgIGVuZAorICAgICAgICAK KyAgICAgICAgbWFjcm8gZyhmbikKKyAgICAgICAgICAgIGZuKG1hY3JvICgpIGYoNDIpIGVuZCkK KyAgICAgICAgZW5kCisgICAgICAgIAorICAgICAgICBnKG1hY3JvKGYpIGYoKSBlbmQpCisgICAg ICAgIGBgYAorCisgICAgICAgICogb2ZmbGluZWFzbS9hc3QucmI6CisgICAgICAgICogb2ZmbGlu ZWFzbS90cmFuc2Zvcm0ucmI6CisKIDIwMTgtMDktMjIgIFNhYW0gYmFyYXRpICA8c2JhcmF0aUBh cHBsZS5jb20+CiAKICAgICAgICAgVGhlIHNhbXBsaW5nIHNob3VsZCBub3QgdXNlIFN0cm9uZzxD b2RlQmxvY2s+IGluIGl0cyBtYWNoaW5lTG9jYXRpb24gZmllbGQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FzdC5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9vZmZsaW5lYXNtL2FzdC5yYgppbmRleCAwY2NmN2IzMzFiYmIzMGVlMTFjOTc2YzA4ZWI2YjI5 NjYwZDhkZTE1Li43ZmM3NjE5YTFmOGNhODJjMTUwY2EwNDA0MmEzNmYxOGI0ZWRkYjI2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc3QucmIKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXN0LnJiCkBAIC03MjcsMjIgKzcyNywyMyBA QCBlbmQKIGNsYXNzIFZhcmlhYmxlIDwgTm9DaGlsZHJlbgogICAgIGF0dHJfcmVhZGVyIDpuYW1l CiAgICAgCi0gICAgZGVmIGluaXRpYWxpemUoY29kZU9yaWdpbiwgbmFtZSkKKyAgICBkZWYgaW5p dGlhbGl6ZShjb2RlT3JpZ2luLCBuYW1lLCBvcmlnaW5hbE5hbWUgPSBuaWwpCiAgICAgICAgIHN1 cGVyKGNvZGVPcmlnaW4pCiAgICAgICAgIEBuYW1lID0gbmFtZQorICAgICAgICBAb3JpZ2luYWxO YW1lID0gb3JpZ2luYWxOYW1lCiAgICAgZW5kCiAgICAgCiAgICAgQEBtYXBwaW5nID0ge30KICAg ICAKLSAgICBkZWYgc2VsZi5mb3JOYW1lKGNvZGVPcmlnaW4sIG5hbWUpCisgICAgZGVmIHNlbGYu Zm9yTmFtZShjb2RlT3JpZ2luLCBuYW1lLCBvcmlnaW5hbE5hbWUgPSBuaWwpCiAgICAgICAgIHVu bGVzcyBAQG1hcHBpbmdbbmFtZV0KLSAgICAgICAgICAgIEBAbWFwcGluZ1tuYW1lXSA9IFZhcmlh YmxlLm5ldyhjb2RlT3JpZ2luLCBuYW1lKQorICAgICAgICAgICAgQEBtYXBwaW5nW25hbWVdID0g VmFyaWFibGUubmV3KGNvZGVPcmlnaW4sIG5hbWUsIG9yaWdpbmFsTmFtZSkKICAgICAgICAgZW5k CiAgICAgICAgIEBAbWFwcGluZ1tuYW1lXQogICAgIGVuZAogICAgIAogICAgIGRlZiBkdW1wCi0g ICAgICAgIG5hbWUKKyAgICAgICAgQG9yaWdpbmFsTmFtZSB8fCBuYW1lCiAgICAgZW5kCiAgICAg CiAgICAgZGVmIGluc3BlY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZs aW5lYXNtL3RyYW5zZm9ybS5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3Ry YW5zZm9ybS5yYgppbmRleCAyYTA4MjU1NWI3NGE5ZmMyMWI1NTcwMTE3ZjU1MzdlYzE1YWZmZWNm Li40MGNkNDVhZGIzMGJmNDE4ZTU4Yjc3MDk2OWI5Y2YxNjgwYzQwYzgxIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS90cmFuc2Zvcm0ucmIKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vdHJhbnNmb3JtLnJiCkBAIC0xMzQsNyArMTM0LDIw IEBAIGNsYXNzIE5vZGUKICAgICBlbmQKIGVuZAogCiskdW5pcXVlVmFySUQgPSAwCiBjbGFzcyBN YWNybworICAgIGRlZiBjYXB0dXJlCisgICAgICAgIG1hcHBpbmcgPSB7fQorICAgICAgICBuZXdW YXJzID0gW10KKyAgICAgICAgdmFyaWFibGVzLmVhY2ggZG8gfHZhcnwKKyAgICAgICAgICAgICR1 bmlxdWVWYXJJRCArPSAxCisgICAgICAgICAgICBuZXdWYXIgPSBWYXJpYWJsZS5mb3JOYW1lKHZh ci5jb2RlT3JpZ2luLCAiX3ZhciN7JHVuaXF1ZVZhcklEfSIsIHZhci5uYW1lKQorICAgICAgICAg ICAgbmV3VmFycyA8PCBuZXdWYXIKKyAgICAgICAgICAgIG1hcHBpbmdbdmFyXSA9IG5ld1Zhcgor ICAgICAgICBlbmQKKyAgICAgICAgTWFjcm8ubmV3KGNvZGVPcmlnaW4sIG5hbWUsIG5ld1ZhcnMs IGJvZHkuc3Vic3RpdHV0ZShtYXBwaW5nKSkKKyAgICBlbmQKKwogICAgIGRlZiBzdWJzdGl0dXRl KG1hcHBpbmcpCiAgICAgICAgIG15TWFwcGluZyA9IHt9CiAgICAgICAgIG1hcHBpbmcuZWFjaF9w YWlyIHsKQEAgLTE1MCw2ICsxNjMsMTcgQEAgY2xhc3MgTWFjcm8KICAgICBlbmQKIGVuZAogCitj bGFzcyBNYWNyb0NhbGwKKyAgICBkZWYgc3Vic3RpdHV0ZShtYXBwaW5nKQorICAgICAgICBuZXdO YW1lID0gVmFyaWFibGUuZm9yTmFtZShjb2RlT3JpZ2luLCBuYW1lKQorICAgICAgICBpZiBtYXBw aW5nW25ld05hbWVdCisgICAgICAgICAgICBuZXdOYW1lID0gbWFwcGluZ1tuZXdOYW1lXQorICAg ICAgICBlbmQKKyAgICAgICAgbmV3T3BlcmFuZHMgPSBvcGVyYW5kcy5tYXAgeyB8b3BlcmFuZHwg b3BlcmFuZC5zdWJzdGl0dXRlKG1hcHBpbmcpIH0KKyAgICAgICAgTWFjcm9DYWxsLm5ldyhjb2Rl T3JpZ2luLCBuZXdOYW1lLm5hbWUsIG5ld09wZXJhbmRzLCBhbm5vdGF0aW9uKQorICAgIGVuZAor ZW5kCisKIGNsYXNzIFZhcmlhYmxlCiAgICAgZGVmIHN1YnN0aXR1dGUobWFwcGluZykKICAgICAg ICAgaWYgbWFwcGluZ1tzZWxmXQpAQCAtMjAzLDcgKzIyNyw3IEBAIGNsYXNzIFNlcXVlbmNlCiAg ICAgICAgIEBsaXN0LmVhY2ggewogICAgICAgICAgICAgfCBpdGVtIHwKICAgICAgICAgICAgIGlm IGl0ZW0uaXNfYT8gTWFjcm8KLSAgICAgICAgICAgICAgICBteU1hY3Jvc1tpdGVtLm5hbWVdID0g aXRlbQorICAgICAgICAgICAgICAgIG15TWFjcm9zW2l0ZW0ubmFtZV0gPSBpdGVtLmNhcHR1cmUK ICAgICAgICAgICAgIGVuZAogICAgICAgICB9CiAgICAgICAgIG5ld0xpc3QgPSBbXQpAQCAtMjIy LDcgKzI0Niw3IEBAIGNsYXNzIFNlcXVlbmNlCiAgICAgICAgICAgICAgICAgICAgICAgICBteU15 TWFjcm9zW215TWFjcm9zW2l0ZW0ubmFtZV0udmFyaWFibGVzW2lkeF0ubmFtZV0gPSBteU1hY3Jv c1tpdGVtLm9wZXJhbmRzW2lkeF0ubmFtZV0KICAgICAgICAgICAgICAgICAgICAgICAgIG1hcHBp bmdbbXlNYWNyb3NbaXRlbS5uYW1lXS52YXJpYWJsZXNbaWR4XS5uYW1lXSA9IG5pbAogICAgICAg ICAgICAgICAgICAgICBlbHNpZiBpdGVtLm9wZXJhbmRzW2lkeF0uaXNfYT8gTWFjcm8KLSAgICAg ICAgICAgICAgICAgICAgICAgIG15TXlNYWNyb3NbbXlNYWNyb3NbaXRlbS5uYW1lXS52YXJpYWJs ZXNbaWR4XS5uYW1lXSA9IGl0ZW0ub3BlcmFuZHNbaWR4XQorICAgICAgICAgICAgICAgICAgICAg ICAgbXlNeU1hY3Jvc1tteU1hY3Jvc1tpdGVtLm5hbWVdLnZhcmlhYmxlc1tpZHhdLm5hbWVdID0g aXRlbS5vcGVyYW5kc1tpZHhdLmNhcHR1cmUKICAgICAgICAgICAgICAgICAgICAgICAgIG1hcHBp bmdbbXlNYWNyb3NbaXRlbS5uYW1lXS52YXJpYWJsZXNbaWR4XS5uYW1lXSA9IG5pbAogICAgICAg ICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgICBteU15TWFjcm9zW215 TWFjcm9zW2l0ZW0ubmFtZV0udmFyaWFibGVzW2lkeF1dID0gbmlsCg== 350670 2018-09-24 12:50:53 -0700 2018-09-24 14:53:17 -0700 fix error reporting bug-189902-20180924125052.patch text/plain 6517 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw OGE1MjQ0YjA0MGRjMTZhYzY4Mzg5NzRhOWJlOTgzNzNmNDdhNDliLi5lNThlZjczMDMwODRjNTQw YjQ1ZjFiNmIxODgzMDdiYWY1NjEzZjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxOC0wOS0yMyAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBvZmZsaW5lYXNtOiBmaXggbWFjcm8gc2NvcGluZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5OTAyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gdGhlIGNvZGUgYmVsb3csIHRo ZSByZWZlcmVuY2UgdG8gYGZgIGluIGBnYCwgd2hpY2ggc2hvdWxkIHJlZmVyIHRvCisgICAgICAg IHRoZSBvdXRlciBtYWNybyBkZWZpbml0aW9uIHdpbGwgaW5zdGVhZCByZWZlciB0byB0aGUgZiBh cmd1bWVudCBvZiB0aGUKKyAgICAgICAgYW5vbnltb3VzIG1hY3JvIHBhc3NlZCB0byBgZ2AuIFRo YXQgbGVhZHMgdG8gdGhpcyBjb2RlIGZhaWxpbmcgdG8KKyAgICAgICAgY29tcGlsZSAoZiBleHBl Y3RlZCAwIGFyZ3MgYnV0IGdvdCAxKS4KKyAgICAgICAgCisgICAgICAgIGBgYAorICAgICAgICBt YWNybyBmKHgpCisgICAgICAgICAgICBtb3ZlIHgsIHQwCisgICAgICAgIGVuZAorICAgICAgICAK KyAgICAgICAgbWFjcm8gZyhmbikKKyAgICAgICAgICAgIGZuKG1hY3JvICgpIGYoNDIpIGVuZCkK KyAgICAgICAgZW5kCisgICAgICAgIAorICAgICAgICBnKG1hY3JvKGYpIGYoKSBlbmQpCisgICAg ICAgIGBgYAorCisgICAgICAgICogb2ZmbGluZWFzbS9hc3QucmI6CisgICAgICAgICogb2ZmbGlu ZWFzbS90cmFuc2Zvcm0ucmI6CisKIDIwMTgtMDktMjIgIFNhYW0gYmFyYXRpICA8c2JhcmF0aUBh cHBsZS5jb20+CiAKICAgICAgICAgVGhlIHNhbXBsaW5nIHNob3VsZCBub3QgdXNlIFN0cm9uZzxD b2RlQmxvY2s+IGluIGl0cyBtYWNoaW5lTG9jYXRpb24gZmllbGQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FzdC5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9vZmZsaW5lYXNtL2FzdC5yYgppbmRleCAwY2NmN2IzMzFiYmIzMGVlMTFjOTc2YzA4ZWI2YjI5 NjYwZDhkZTE1Li5iZmU4NjZiMDJjNGY2MWM0MDJkZDg2ZThhMzBmNmZmZWU5ZDU3YTBhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc3QucmIKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXN0LnJiCkBAIC03MjcsMjYgKzcyNywzMSBA QCBlbmQKIGNsYXNzIFZhcmlhYmxlIDwgTm9DaGlsZHJlbgogICAgIGF0dHJfcmVhZGVyIDpuYW1l CiAgICAgCi0gICAgZGVmIGluaXRpYWxpemUoY29kZU9yaWdpbiwgbmFtZSkKKyAgICBkZWYgaW5p dGlhbGl6ZShjb2RlT3JpZ2luLCBuYW1lLCBvcmlnaW5hbE5hbWUgPSBuaWwpCiAgICAgICAgIHN1 cGVyKGNvZGVPcmlnaW4pCiAgICAgICAgIEBuYW1lID0gbmFtZQorICAgICAgICBAb3JpZ2luYWxO YW1lID0gb3JpZ2luYWxOYW1lCiAgICAgZW5kCiAgICAgCiAgICAgQEBtYXBwaW5nID0ge30KICAg ICAKLSAgICBkZWYgc2VsZi5mb3JOYW1lKGNvZGVPcmlnaW4sIG5hbWUpCisgICAgZGVmIHNlbGYu Zm9yTmFtZShjb2RlT3JpZ2luLCBuYW1lLCBvcmlnaW5hbE5hbWUgPSBuaWwpCiAgICAgICAgIHVu bGVzcyBAQG1hcHBpbmdbbmFtZV0KLSAgICAgICAgICAgIEBAbWFwcGluZ1tuYW1lXSA9IFZhcmlh YmxlLm5ldyhjb2RlT3JpZ2luLCBuYW1lKQorICAgICAgICAgICAgQEBtYXBwaW5nW25hbWVdID0g VmFyaWFibGUubmV3KGNvZGVPcmlnaW4sIG5hbWUsIG9yaWdpbmFsTmFtZSkKICAgICAgICAgZW5k CiAgICAgICAgIEBAbWFwcGluZ1tuYW1lXQogICAgIGVuZAorCisgICAgZGVmIG9yaWdpbmFsTmFt ZQorICAgICAgICBAb3JpZ2luYWxOYW1lIHx8IG5hbWUKKyAgICBlbmQKICAgICAKICAgICBkZWYg ZHVtcAotICAgICAgICBuYW1lCisgICAgICAgIG9yaWdpbmFsTmFtZQogICAgIGVuZAogICAgIAog ICAgIGRlZiBpbnNwZWN0Ci0gICAgICAgICI8dmFyaWFibGUgI3tuYW1lfSBhdCAje2NvZGVPcmln aW5TdHJpbmd9PiIKKyAgICAgICAgIjx2YXJpYWJsZSAje29yaWdpbmFsTmFtZX0gYXQgI3tjb2Rl T3JpZ2luU3RyaW5nfT4iCiAgICAgZW5kCiBlbmQKIApAQCAtMTQ1NSwxMyArMTQ2MCwxOCBAQCBl bmQKIGNsYXNzIE1hY3JvQ2FsbCA8IE5vZGUKICAgICBhdHRyX3JlYWRlciA6bmFtZSwgOm9wZXJh bmRzLCA6YW5ub3RhdGlvbgogICAgIAotICAgIGRlZiBpbml0aWFsaXplKGNvZGVPcmlnaW4sIG5h bWUsIG9wZXJhbmRzLCBhbm5vdGF0aW9uKQorICAgIGRlZiBpbml0aWFsaXplKGNvZGVPcmlnaW4s IG5hbWUsIG9wZXJhbmRzLCBhbm5vdGF0aW9uLCBvcmlnaW5hbE5hbWUgPSBuaWwpCiAgICAgICAg IHN1cGVyKGNvZGVPcmlnaW4pCiAgICAgICAgIEBuYW1lID0gbmFtZQogICAgICAgICBAb3BlcmFu ZHMgPSBvcGVyYW5kcwogICAgICAgICByYWlzZSB1bmxlc3MgQG9wZXJhbmRzCiAgICAgICAgIEBv cGVyYW5kcy5lYWNoe3x2fCByYWlzZSB1bmxlc3Mgdn0KICAgICAgICAgQGFubm90YXRpb24gPSBh bm5vdGF0aW9uCisgICAgICAgIEBvcmlnaW5hbE5hbWUgPSBvcmlnaW5hbE5hbWUKKyAgICBlbmQK KworICAgIGRlZiBvcmlnaW5hbE5hbWUKKyAgICAgICAgQG9yaWdpbmFsTmFtZSB8fCBuYW1lCiAg ICAgZW5kCiAgICAgCiAgICAgZGVmIGNoaWxkcmVuCkBAIC0xNDY5LDExICsxNDc5LDExIEBAIGNs YXNzIE1hY3JvQ2FsbCA8IE5vZGUKICAgICBlbmQKICAgICAKICAgICBkZWYgbWFwQ2hpbGRyZW4o JnByb2MpCi0gICAgICAgIE1hY3JvQ2FsbC5uZXcoY29kZU9yaWdpbiwgQG5hbWUsIEBvcGVyYW5k cy5tYXAoJnByb2MpLCBAYW5ub3RhdGlvbikKKyAgICAgICAgTWFjcm9DYWxsLm5ldyhjb2RlT3Jp Z2luLCBAbmFtZSwgQG9wZXJhbmRzLm1hcCgmcHJvYyksIEBhbm5vdGF0aW9uLCBAb3JpZ2luYWxO YW1lKQogICAgIGVuZAogICAgIAogICAgIGRlZiBkdW1wCi0gICAgICAgICJcdCN7bmFtZX0oIiAr IG9wZXJhbmRzLmNvbGxlY3R7fHZ8IHYuZHVtcH0uam9pbigiLCAiKSArICIpIgorICAgICAgICAi XHQje29yaWdpbmFsTmFtZX0oIiArIG9wZXJhbmRzLmNvbGxlY3R7fHZ8IHYuZHVtcH0uam9pbigi LCAiKSArICIpIgogICAgIGVuZAogZW5kCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9vZmZsaW5lYXNtL3RyYW5zZm9ybS5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZs aW5lYXNtL3RyYW5zZm9ybS5yYgppbmRleCAyYTA4MjU1NWI3NGE5ZmMyMWI1NTcwMTE3ZjU1Mzdl YzE1YWZmZWNmLi41ODFjYWIwMzUzMjU4YjYzM2I1Zjk2NmFmNzllZGYwNWE1YzM3OWQ4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS90cmFuc2Zvcm0ucmIKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vdHJhbnNmb3JtLnJiCkBAIC0xMzQs NyArMTM0LDIwIEBAIGNsYXNzIE5vZGUKICAgICBlbmQKIGVuZAogCiskdW5pcXVlVmFySUQgPSAw CiBjbGFzcyBNYWNybworICAgIGRlZiBjYXB0dXJlCisgICAgICAgIG1hcHBpbmcgPSB7fQorICAg ICAgICBuZXdWYXJzID0gW10KKyAgICAgICAgdmFyaWFibGVzLmVhY2ggZG8gfHZhcnwKKyAgICAg ICAgICAgICR1bmlxdWVWYXJJRCArPSAxCisgICAgICAgICAgICBuZXdWYXIgPSBWYXJpYWJsZS5m b3JOYW1lKHZhci5jb2RlT3JpZ2luLCAiX3ZhciN7JHVuaXF1ZVZhcklEfSIsIHZhci5vcmlnaW5h bE5hbWUpCisgICAgICAgICAgICBuZXdWYXJzIDw8IG5ld1ZhcgorICAgICAgICAgICAgbWFwcGlu Z1t2YXJdID0gbmV3VmFyCisgICAgICAgIGVuZAorICAgICAgICBNYWNyby5uZXcoY29kZU9yaWdp biwgbmFtZSwgbmV3VmFycywgYm9keS5zdWJzdGl0dXRlKG1hcHBpbmcpKQorICAgIGVuZAorCiAg ICAgZGVmIHN1YnN0aXR1dGUobWFwcGluZykKICAgICAgICAgbXlNYXBwaW5nID0ge30KICAgICAg ICAgbWFwcGluZy5lYWNoX3BhaXIgewpAQCAtMTUwLDYgKzE2MywxNyBAQCBjbGFzcyBNYWNybwog ICAgIGVuZAogZW5kCiAKK2NsYXNzIE1hY3JvQ2FsbAorICAgIGRlZiBzdWJzdGl0dXRlKG1hcHBp bmcpCisgICAgICAgIG5ld05hbWUgPSBWYXJpYWJsZS5mb3JOYW1lKGNvZGVPcmlnaW4sIG5hbWUp CisgICAgICAgIGlmIG1hcHBpbmdbbmV3TmFtZV0KKyAgICAgICAgICAgIG5ld05hbWUgPSBtYXBw aW5nW25ld05hbWVdCisgICAgICAgIGVuZAorICAgICAgICBuZXdPcGVyYW5kcyA9IG9wZXJhbmRz Lm1hcCB7IHxvcGVyYW5kfCBvcGVyYW5kLnN1YnN0aXR1dGUobWFwcGluZykgfQorICAgICAgICBN YWNyb0NhbGwubmV3KGNvZGVPcmlnaW4sIG5ld05hbWUubmFtZSwgbmV3T3BlcmFuZHMsIGFubm90 YXRpb24sIG9yaWdpbmFsTmFtZSkKKyAgICBlbmQKK2VuZAorCiBjbGFzcyBWYXJpYWJsZQogICAg IGRlZiBzdWJzdGl0dXRlKG1hcHBpbmcpCiAgICAgICAgIGlmIG1hcHBpbmdbc2VsZl0KQEAgLTIw Myw3ICsyMjcsNyBAQCBjbGFzcyBTZXF1ZW5jZQogICAgICAgICBAbGlzdC5lYWNoIHsKICAgICAg ICAgICAgIHwgaXRlbSB8CiAgICAgICAgICAgICBpZiBpdGVtLmlzX2E/IE1hY3JvCi0gICAgICAg ICAgICAgICAgbXlNYWNyb3NbaXRlbS5uYW1lXSA9IGl0ZW0KKyAgICAgICAgICAgICAgICBteU1h Y3Jvc1tpdGVtLm5hbWVdID0gaXRlbS5jYXB0dXJlCiAgICAgICAgICAgICBlbmQKICAgICAgICAg fQogICAgICAgICBuZXdMaXN0ID0gW10KQEAgLTIxNCwxNSArMjM4LDE1IEBAIGNsYXNzIFNlcXVl bmNlCiAgICAgICAgICAgICBlbHNpZiBpdGVtLmlzX2E/IE1hY3JvQ2FsbAogICAgICAgICAgICAg ICAgIG1hcHBpbmcgPSB7fQogICAgICAgICAgICAgICAgIG15TXlNYWNyb3MgPSBteU1hY3Jvcy5k dXAKLSAgICAgICAgICAgICAgICByYWlzZSAiQ291bGQgbm90IGZpbmQgbWFjcm8gI3tpdGVtLm5h bWV9IGF0ICN7aXRlbS5jb2RlT3JpZ2luU3RyaW5nfSIgdW5sZXNzIG15TWFjcm9zW2l0ZW0ubmFt ZV0KLSAgICAgICAgICAgICAgICByYWlzZSAiQXJndW1lbnQgY291bnQgbWlzbWF0Y2ggZm9yIGNh bGwgdG8gI3tpdGVtLm5hbWV9IGF0ICN7aXRlbS5jb2RlT3JpZ2luU3RyaW5nfSIgdW5sZXNzIGl0 ZW0ub3BlcmFuZHMuc2l6ZSA9PSBteU1hY3Jvc1tpdGVtLm5hbWVdLnZhcmlhYmxlcy5zaXplCisg ICAgICAgICAgICAgICAgcmFpc2UgIkNvdWxkIG5vdCBmaW5kIG1hY3JvICN7aXRlbS5vcmlnaW5h bE5hbWV9IGF0ICN7aXRlbS5jb2RlT3JpZ2luU3RyaW5nfSIgdW5sZXNzIG15TWFjcm9zW2l0ZW0u bmFtZV0KKyAgICAgICAgICAgICAgICByYWlzZSAiQXJndW1lbnQgY291bnQgbWlzbWF0Y2ggZm9y IGNhbGwgdG8gI3tpdGVtLm9yaWdpbmFsTmFtZX0gYXQgI3tpdGVtLmNvZGVPcmlnaW5TdHJpbmd9 IiB1bmxlc3MgaXRlbS5vcGVyYW5kcy5zaXplID09IG15TWFjcm9zW2l0ZW0ubmFtZV0udmFyaWFi bGVzLnNpemUKICAgICAgICAgICAgICAgICBpdGVtLm9wZXJhbmRzLnNpemUudGltZXMgewogICAg ICAgICAgICAgICAgICAgICB8IGlkeCB8CiAgICAgICAgICAgICAgICAgICAgIGlmIGl0ZW0ub3Bl cmFuZHNbaWR4XS5pc19hPyBWYXJpYWJsZSBhbmQgbXlNYWNyb3NbaXRlbS5vcGVyYW5kc1tpZHhd Lm5hbWVdCiAgICAgICAgICAgICAgICAgICAgICAgICBteU15TWFjcm9zW215TWFjcm9zW2l0ZW0u bmFtZV0udmFyaWFibGVzW2lkeF0ubmFtZV0gPSBteU1hY3Jvc1tpdGVtLm9wZXJhbmRzW2lkeF0u bmFtZV0KICAgICAgICAgICAgICAgICAgICAgICAgIG1hcHBpbmdbbXlNYWNyb3NbaXRlbS5uYW1l XS52YXJpYWJsZXNbaWR4XS5uYW1lXSA9IG5pbAogICAgICAgICAgICAgICAgICAgICBlbHNpZiBp dGVtLm9wZXJhbmRzW2lkeF0uaXNfYT8gTWFjcm8KLSAgICAgICAgICAgICAgICAgICAgICAgIG15 TXlNYWNyb3NbbXlNYWNyb3NbaXRlbS5uYW1lXS52YXJpYWJsZXNbaWR4XS5uYW1lXSA9IGl0ZW0u b3BlcmFuZHNbaWR4XQorICAgICAgICAgICAgICAgICAgICAgICAgbXlNeU1hY3Jvc1tteU1hY3Jv c1tpdGVtLm5hbWVdLnZhcmlhYmxlc1tpZHhdLm5hbWVdID0gaXRlbS5vcGVyYW5kc1tpZHhdLmNh cHR1cmUKICAgICAgICAgICAgICAgICAgICAgICAgIG1hcHBpbmdbbXlNYWNyb3NbaXRlbS5uYW1l XS52YXJpYWJsZXNbaWR4XS5uYW1lXSA9IG5pbAogICAgICAgICAgICAgICAgICAgICBlbHNlCiAg ICAgICAgICAgICAgICAgICAgICAgICBteU15TWFjcm9zW215TWFjcm9zW2l0ZW0ubmFtZV0udmFy aWFibGVzW2lkeF1dID0gbmlsCg== 350696 2018-09-24 14:53:19 -0700 2018-09-24 15:59:31 -0700 patch for landing bug-189902-20180924145317.patch text/plain 7070 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw OGE1MjQ0YjA0MGRjMTZhYzY4Mzg5NzRhOWJlOTgzNzNmNDdhNDliLi4wYzBlNTc5YTY3YjZjZjM5 YTY1MTE4NzQ4YjI0MTM0MzBmM2ZkYjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxOC0wOS0yMyAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBvZmZsaW5lYXNtOiBmaXggbWFjcm8gc2NvcGluZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5OTAyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTWFyayBMYW0uCisKKyAgICAgICAgSW4gdGhlIGNvZGUgYmVsb3csIHRoZSByZWZl cmVuY2UgdG8gYGZgIGluIGBnYCwgd2hpY2ggc2hvdWxkIHJlZmVyIHRvCisgICAgICAgIHRoZSBv dXRlciBtYWNybyBkZWZpbml0aW9uIHdpbGwgaW5zdGVhZCByZWZlciB0byB0aGUgZiBhcmd1bWVu dCBvZiB0aGUKKyAgICAgICAgYW5vbnltb3VzIG1hY3JvIHBhc3NlZCB0byBgZ2AuIFRoYXQgbGVh ZHMgdG8gdGhpcyBjb2RlIGZhaWxpbmcgdG8KKyAgICAgICAgY29tcGlsZSAoZiBleHBlY3RlZCAw IGFyZ3MgYnV0IGdvdCAxKS4KKyAgICAgICAgCisgICAgICAgIGBgYAorICAgICAgICBtYWNybyBm KHgpCisgICAgICAgICAgICBtb3ZlIHgsIHQwCisgICAgICAgIGVuZAorICAgICAgICAKKyAgICAg ICAgbWFjcm8gZyhmbikKKyAgICAgICAgICAgIGZuKG1hY3JvICgpIGYoNDIpIGVuZCkKKyAgICAg ICAgZW5kCisgICAgICAgIAorICAgICAgICBnKG1hY3JvKGYpIGYoKSBlbmQpCisgICAgICAgIGBg YAorCisgICAgICAgICogb2ZmbGluZWFzbS9hc3QucmI6CisgICAgICAgICogb2ZmbGluZWFzbS90 cmFuc2Zvcm0ucmI6CisKIDIwMTgtMDktMjIgIFNhYW0gYmFyYXRpICA8c2JhcmF0aUBhcHBsZS5j b20+CiAKICAgICAgICAgVGhlIHNhbXBsaW5nIHNob3VsZCBub3QgdXNlIFN0cm9uZzxDb2RlQmxv Y2s+IGluIGl0cyBtYWNoaW5lTG9jYXRpb24gZmllbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FzdC5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZs aW5lYXNtL2FzdC5yYgppbmRleCAwY2NmN2IzMzFiYmIzMGVlMTFjOTc2YzA4ZWI2YjI5NjYwZDhk ZTE1Li5iZmU4NjZiMDJjNGY2MWM0MDJkZDg2ZThhMzBmNmZmZWU5ZDU3YTBhIDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc3QucmIKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXN0LnJiCkBAIC03MjcsMjYgKzcyNywzMSBAQCBlbmQK IGNsYXNzIFZhcmlhYmxlIDwgTm9DaGlsZHJlbgogICAgIGF0dHJfcmVhZGVyIDpuYW1lCiAgICAg Ci0gICAgZGVmIGluaXRpYWxpemUoY29kZU9yaWdpbiwgbmFtZSkKKyAgICBkZWYgaW5pdGlhbGl6 ZShjb2RlT3JpZ2luLCBuYW1lLCBvcmlnaW5hbE5hbWUgPSBuaWwpCiAgICAgICAgIHN1cGVyKGNv ZGVPcmlnaW4pCiAgICAgICAgIEBuYW1lID0gbmFtZQorICAgICAgICBAb3JpZ2luYWxOYW1lID0g b3JpZ2luYWxOYW1lCiAgICAgZW5kCiAgICAgCiAgICAgQEBtYXBwaW5nID0ge30KICAgICAKLSAg ICBkZWYgc2VsZi5mb3JOYW1lKGNvZGVPcmlnaW4sIG5hbWUpCisgICAgZGVmIHNlbGYuZm9yTmFt ZShjb2RlT3JpZ2luLCBuYW1lLCBvcmlnaW5hbE5hbWUgPSBuaWwpCiAgICAgICAgIHVubGVzcyBA QG1hcHBpbmdbbmFtZV0KLSAgICAgICAgICAgIEBAbWFwcGluZ1tuYW1lXSA9IFZhcmlhYmxlLm5l dyhjb2RlT3JpZ2luLCBuYW1lKQorICAgICAgICAgICAgQEBtYXBwaW5nW25hbWVdID0gVmFyaWFi bGUubmV3KGNvZGVPcmlnaW4sIG5hbWUsIG9yaWdpbmFsTmFtZSkKICAgICAgICAgZW5kCiAgICAg ICAgIEBAbWFwcGluZ1tuYW1lXQogICAgIGVuZAorCisgICAgZGVmIG9yaWdpbmFsTmFtZQorICAg ICAgICBAb3JpZ2luYWxOYW1lIHx8IG5hbWUKKyAgICBlbmQKICAgICAKICAgICBkZWYgZHVtcAot ICAgICAgICBuYW1lCisgICAgICAgIG9yaWdpbmFsTmFtZQogICAgIGVuZAogICAgIAogICAgIGRl ZiBpbnNwZWN0Ci0gICAgICAgICI8dmFyaWFibGUgI3tuYW1lfSBhdCAje2NvZGVPcmlnaW5TdHJp bmd9PiIKKyAgICAgICAgIjx2YXJpYWJsZSAje29yaWdpbmFsTmFtZX0gYXQgI3tjb2RlT3JpZ2lu U3RyaW5nfT4iCiAgICAgZW5kCiBlbmQKIApAQCAtMTQ1NSwxMyArMTQ2MCwxOCBAQCBlbmQKIGNs YXNzIE1hY3JvQ2FsbCA8IE5vZGUKICAgICBhdHRyX3JlYWRlciA6bmFtZSwgOm9wZXJhbmRzLCA6 YW5ub3RhdGlvbgogICAgIAotICAgIGRlZiBpbml0aWFsaXplKGNvZGVPcmlnaW4sIG5hbWUsIG9w ZXJhbmRzLCBhbm5vdGF0aW9uKQorICAgIGRlZiBpbml0aWFsaXplKGNvZGVPcmlnaW4sIG5hbWUs IG9wZXJhbmRzLCBhbm5vdGF0aW9uLCBvcmlnaW5hbE5hbWUgPSBuaWwpCiAgICAgICAgIHN1cGVy KGNvZGVPcmlnaW4pCiAgICAgICAgIEBuYW1lID0gbmFtZQogICAgICAgICBAb3BlcmFuZHMgPSBv cGVyYW5kcwogICAgICAgICByYWlzZSB1bmxlc3MgQG9wZXJhbmRzCiAgICAgICAgIEBvcGVyYW5k cy5lYWNoe3x2fCByYWlzZSB1bmxlc3Mgdn0KICAgICAgICAgQGFubm90YXRpb24gPSBhbm5vdGF0 aW9uCisgICAgICAgIEBvcmlnaW5hbE5hbWUgPSBvcmlnaW5hbE5hbWUKKyAgICBlbmQKKworICAg IGRlZiBvcmlnaW5hbE5hbWUKKyAgICAgICAgQG9yaWdpbmFsTmFtZSB8fCBuYW1lCiAgICAgZW5k CiAgICAgCiAgICAgZGVmIGNoaWxkcmVuCkBAIC0xNDY5LDExICsxNDc5LDExIEBAIGNsYXNzIE1h Y3JvQ2FsbCA8IE5vZGUKICAgICBlbmQKICAgICAKICAgICBkZWYgbWFwQ2hpbGRyZW4oJnByb2Mp Ci0gICAgICAgIE1hY3JvQ2FsbC5uZXcoY29kZU9yaWdpbiwgQG5hbWUsIEBvcGVyYW5kcy5tYXAo JnByb2MpLCBAYW5ub3RhdGlvbikKKyAgICAgICAgTWFjcm9DYWxsLm5ldyhjb2RlT3JpZ2luLCBA bmFtZSwgQG9wZXJhbmRzLm1hcCgmcHJvYyksIEBhbm5vdGF0aW9uLCBAb3JpZ2luYWxOYW1lKQog ICAgIGVuZAogICAgIAogICAgIGRlZiBkdW1wCi0gICAgICAgICJcdCN7bmFtZX0oIiArIG9wZXJh bmRzLmNvbGxlY3R7fHZ8IHYuZHVtcH0uam9pbigiLCAiKSArICIpIgorICAgICAgICAiXHQje29y aWdpbmFsTmFtZX0oIiArIG9wZXJhbmRzLmNvbGxlY3R7fHZ8IHYuZHVtcH0uam9pbigiLCAiKSAr ICIpIgogICAgIGVuZAogZW5kCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9v ZmZsaW5lYXNtL3RyYW5zZm9ybS5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNt L3RyYW5zZm9ybS5yYgppbmRleCAyYTA4MjU1NWI3NGE5ZmMyMWI1NTcwMTE3ZjU1MzdlYzE1YWZm ZWNmLi43NWE0YjM0ODg5MGJlOWZjZDQzYjAwZTQ5YmE1M2RiNjQzMTBkNzU4IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS90cmFuc2Zvcm0ucmIKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vdHJhbnNmb3JtLnJiCkBAIC0xMzQsNyArMTM0 LDIwIEBAIGNsYXNzIE5vZGUKICAgICBlbmQKIGVuZAogCiskdW5pcXVlTWFjcm9WYXJJRCA9IDAK IGNsYXNzIE1hY3JvCisgICAgZGVmIGNhcHR1cmUKKyAgICAgICAgbWFwcGluZyA9IHt9CisgICAg ICAgIG5ld1ZhcnMgPSBbXQorICAgICAgICB2YXJpYWJsZXMuZWFjaCBkbyB8dmFyfAorICAgICAg ICAgICAgJHVuaXF1ZU1hY3JvVmFySUQgKz0gMQorICAgICAgICAgICAgbmV3VmFyID0gVmFyaWFi bGUuZm9yTmFtZSh2YXIuY29kZU9yaWdpbiwgIl92YXIjeyR1bmlxdWVNYWNyb1ZhcklEfSIsIHZh ci5vcmlnaW5hbE5hbWUpCisgICAgICAgICAgICBuZXdWYXJzIDw8IG5ld1ZhcgorICAgICAgICAg ICAgbWFwcGluZ1t2YXJdID0gbmV3VmFyCisgICAgICAgIGVuZAorICAgICAgICBNYWNyby5uZXco Y29kZU9yaWdpbiwgbmFtZSwgbmV3VmFycywgYm9keS5zdWJzdGl0dXRlKG1hcHBpbmcpKQorICAg IGVuZAorCiAgICAgZGVmIHN1YnN0aXR1dGUobWFwcGluZykKICAgICAgICAgbXlNYXBwaW5nID0g e30KICAgICAgICAgbWFwcGluZy5lYWNoX3BhaXIgewpAQCAtMTUwLDYgKzE2MywxNyBAQCBjbGFz cyBNYWNybwogICAgIGVuZAogZW5kCiAKK2NsYXNzIE1hY3JvQ2FsbAorICAgIGRlZiBzdWJzdGl0 dXRlKG1hcHBpbmcpCisgICAgICAgIG5ld05hbWUgPSBWYXJpYWJsZS5mb3JOYW1lKGNvZGVPcmln aW4sIG5hbWUpCisgICAgICAgIGlmIG1hcHBpbmdbbmV3TmFtZV0KKyAgICAgICAgICAgIG5ld05h bWUgPSBtYXBwaW5nW25ld05hbWVdCisgICAgICAgIGVuZAorICAgICAgICBuZXdPcGVyYW5kcyA9 IG9wZXJhbmRzLm1hcCB7IHxvcGVyYW5kfCBvcGVyYW5kLnN1YnN0aXR1dGUobWFwcGluZykgfQor ICAgICAgICBNYWNyb0NhbGwubmV3KGNvZGVPcmlnaW4sIG5ld05hbWUubmFtZSwgbmV3T3BlcmFu ZHMsIGFubm90YXRpb24sIG9yaWdpbmFsTmFtZSkKKyAgICBlbmQKK2VuZAorCiBjbGFzcyBWYXJp YWJsZQogICAgIGRlZiBzdWJzdGl0dXRlKG1hcHBpbmcpCiAgICAgICAgIGlmIG1hcHBpbmdbc2Vs Zl0KQEAgLTIwMyw3ICsyMjcsNyBAQCBjbGFzcyBTZXF1ZW5jZQogICAgICAgICBAbGlzdC5lYWNo IHsKICAgICAgICAgICAgIHwgaXRlbSB8CiAgICAgICAgICAgICBpZiBpdGVtLmlzX2E/IE1hY3Jv Ci0gICAgICAgICAgICAgICAgbXlNYWNyb3NbaXRlbS5uYW1lXSA9IGl0ZW0KKyAgICAgICAgICAg ICAgICBteU1hY3Jvc1tpdGVtLm5hbWVdID0gaXRlbS5jYXB0dXJlCiAgICAgICAgICAgICBlbmQK ICAgICAgICAgfQogICAgICAgICBuZXdMaXN0ID0gW10KQEAgLTIxNCwxNSArMjM4LDE1IEBAIGNs YXNzIFNlcXVlbmNlCiAgICAgICAgICAgICBlbHNpZiBpdGVtLmlzX2E/IE1hY3JvQ2FsbAogICAg ICAgICAgICAgICAgIG1hcHBpbmcgPSB7fQogICAgICAgICAgICAgICAgIG15TXlNYWNyb3MgPSBt eU1hY3Jvcy5kdXAKLSAgICAgICAgICAgICAgICByYWlzZSAiQ291bGQgbm90IGZpbmQgbWFjcm8g I3tpdGVtLm5hbWV9IGF0ICN7aXRlbS5jb2RlT3JpZ2luU3RyaW5nfSIgdW5sZXNzIG15TWFjcm9z W2l0ZW0ubmFtZV0KLSAgICAgICAgICAgICAgICByYWlzZSAiQXJndW1lbnQgY291bnQgbWlzbWF0 Y2ggZm9yIGNhbGwgdG8gI3tpdGVtLm5hbWV9IGF0ICN7aXRlbS5jb2RlT3JpZ2luU3RyaW5nfSIg dW5sZXNzIGl0ZW0ub3BlcmFuZHMuc2l6ZSA9PSBteU1hY3Jvc1tpdGVtLm5hbWVdLnZhcmlhYmxl cy5zaXplCisgICAgICAgICAgICAgICAgcmFpc2UgIkNvdWxkIG5vdCBmaW5kIG1hY3JvICN7aXRl bS5vcmlnaW5hbE5hbWV9IGF0ICN7aXRlbS5jb2RlT3JpZ2luU3RyaW5nfSIgdW5sZXNzIG15TWFj cm9zW2l0ZW0ubmFtZV0KKyAgICAgICAgICAgICAgICByYWlzZSAiQXJndW1lbnQgY291bnQgbWlz bWF0Y2ggZm9yIGNhbGwgdG8gI3tpdGVtLm9yaWdpbmFsTmFtZX0gYXQgI3tpdGVtLmNvZGVPcmln aW5TdHJpbmd9IiB1bmxlc3MgaXRlbS5vcGVyYW5kcy5zaXplID09IG15TWFjcm9zW2l0ZW0ubmFt ZV0udmFyaWFibGVzLnNpemUKICAgICAgICAgICAgICAgICBpdGVtLm9wZXJhbmRzLnNpemUudGlt ZXMgewogICAgICAgICAgICAgICAgICAgICB8IGlkeCB8CiAgICAgICAgICAgICAgICAgICAgIGlm IGl0ZW0ub3BlcmFuZHNbaWR4XS5pc19hPyBWYXJpYWJsZSBhbmQgbXlNYWNyb3NbaXRlbS5vcGVy YW5kc1tpZHhdLm5hbWVdCiAgICAgICAgICAgICAgICAgICAgICAgICBteU15TWFjcm9zW215TWFj cm9zW2l0ZW0ubmFtZV0udmFyaWFibGVzW2lkeF0ubmFtZV0gPSBteU1hY3Jvc1tpdGVtLm9wZXJh bmRzW2lkeF0ubmFtZV0KICAgICAgICAgICAgICAgICAgICAgICAgIG1hcHBpbmdbbXlNYWNyb3Nb aXRlbS5uYW1lXS52YXJpYWJsZXNbaWR4XS5uYW1lXSA9IG5pbAogICAgICAgICAgICAgICAgICAg ICBlbHNpZiBpdGVtLm9wZXJhbmRzW2lkeF0uaXNfYT8gTWFjcm8KLSAgICAgICAgICAgICAgICAg ICAgICAgIG15TXlNYWNyb3NbbXlNYWNyb3NbaXRlbS5uYW1lXS52YXJpYWJsZXNbaWR4XS5uYW1l XSA9IGl0ZW0ub3BlcmFuZHNbaWR4XQorICAgICAgICAgICAgICAgICAgICAgICAgbXlNeU1hY3Jv c1tteU1hY3Jvc1tpdGVtLm5hbWVdLnZhcmlhYmxlc1tpZHhdLm5hbWVdID0gaXRlbS5vcGVyYW5k c1tpZHhdLmNhcHR1cmUKICAgICAgICAgICAgICAgICAgICAgICAgIG1hcHBpbmdbbXlNYWNyb3Nb aXRlbS5uYW1lXS52YXJpYWJsZXNbaWR4XS5uYW1lXSA9IG5pbAogICAgICAgICAgICAgICAgICAg ICBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgICBteU15TWFjcm9zW215TWFjcm9zW2l0ZW0u bmFtZV0udmFyaWFibGVzW2lkeF1dID0gbmlsCkBAIC0yMzIsNyArMjU2LDcgQEAgY2xhc3MgU2Vx dWVuY2UKICAgICAgICAgICAgICAgICBpZiBpdGVtLmFubm90YXRpb24KICAgICAgICAgICAgICAg ICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoaXRlbS5jb2RlT3JpZ2luLCAibG9jYWxB bm5vdGF0aW9uIiwgW10sIGl0ZW0uYW5ub3RhdGlvbikKICAgICAgICAgICAgICAgICBlbmQKLSAg ICAgICAgICAgICAgICBuZXdMaXN0ICs9IG15TWFjcm9zW2l0ZW0ubmFtZV0uYm9keS5zdWJzdGl0 dXRlKG1hcHBpbmcpLmRlbWFjcm9pZnkobXlNeU1hY3JvcykucmVuYW1lTGFiZWxzKGl0ZW0ubmFt ZSkubGlzdAorICAgICAgICAgICAgICAgIG5ld0xpc3QgKz0gbXlNYWNyb3NbaXRlbS5uYW1lXS5i b2R5LnN1YnN0aXR1dGUobWFwcGluZykuZGVtYWNyb2lmeShteU15TWFjcm9zKS5yZW5hbWVMYWJl bHMoaXRlbS5vcmlnaW5hbE5hbWUpLmxpc3QKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAg ICAgICBuZXdMaXN0IDw8IGl0ZW0uZGVtYWNyb2lmeShteU1hY3JvcykKICAgICAgICAgICAgIGVu ZAo=