208261 2020-02-26 14:04:36 -0800 Poly proto should work with property delete transitions 2020-02-27 17:34:13 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 208337 1 justin_michaud justin_michaud commit-queue ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1623169 0 justin_michaud 2020-02-26 14:04:36 -0800 Poly proto should work with property delete transitions 1623171 1 391777 justin_michaud 2020-02-26 14:05:11 -0800 Created attachment 391777 Patch 1623172 2 justin_michaud 2020-02-26 14:06:04 -0800 rdar://59302840 1623215 3 391777 saam 2020-02-26 15:26:40 -0800 Comment on attachment 391777 Patch Can you see if we need this for get too? My hunch is yes 1623222 4 391777 saam 2020-02-26 15:29:34 -0800 Comment on attachment 391777 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391777&action=review > JSTests/stress/delete-property-poly-proto.js:1 > +//@ runDefault("--forcePolyProto=1 --jitPolicyScale=0") I think this is wrong, if you see how we do it elsewhere, it's: runDefault("--forcePolyProto=1", "--jitPolicyScale=0") Also, I think the safer test here is to run without LLInt, so we're guaranteed to be inside baseline. 1623225 5 391777 mark.lam 2020-02-26 15:32:08 -0800 Comment on attachment 391777 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391777&action=review >> JSTests/stress/delete-property-poly-proto.js:1 >> +//@ runDefault("--forcePolyProto=1 --jitPolicyScale=0") > > I think this is wrong, if you see how we do it elsewhere, it's: > runDefault("--forcePolyProto=1", "--jitPolicyScale=0") > > Also, I think the safer test here is to run without LLInt, so we're guaranteed to be inside baseline. The better way to do this is: //@ requireOptions("--forcePolyProto=1", "--jitPolicyScale=0") That will run it on all the test configurations instead of just the default one. Unless there's a special reason why you want to limit this to only run the default configuration, just use requireOptions. That way, we'll get maximal test coverage. 1623268 6 391777 saam 2020-02-26 16:37:36 -0800 Comment on attachment 391777 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391777&action=review > Source/JavaScriptCore/ChangeLog:7 > + can you explain what's happening? 1623627 7 391777 saam 2020-02-27 13:26:23 -0800 Comment on attachment 391777 Patch clearing r? for now, Justin has a forthcoming patch 1623637 8 391905 justin_michaud 2020-02-27 13:40:54 -0800 Created attachment 391905 Patch 1623763 9 391905 saam 2020-02-27 16:26:34 -0800 Comment on attachment 391905 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391905&action=review r=me > Source/JavaScriptCore/ChangeLog:9 > + and poly photo cause us to cache a setter call along a prototype chain that photo => proto > Source/JavaScriptCore/ChangeLog:10 > + is no longer the correct setter to call. This is exposed as a result of 206430 nit: I'd link to a revision instead of "206430", since "206430" is slightly ambiguous without a link > Source/JavaScriptCore/ChangeLog:24 > + were before it was called. We see that A's setter still exists, so we cache it > + without ever checking that it is still a setter. This sentence doesn't make sense. I think you also need to say what your fix actually is. All you're doing is describing a problem. Can you also link to bugs for fixing the semantic issues that remain? > JSTests/stress/delete-property-poly-proto.js:1 > +//@ requireOptions("--forcePolyProto=1", "--useLLInt=0") nit: use 4 space indent > JSTests/stress/poly-proto-setter-adds-setter-in-middle.js:32 > +//if (!correct) > +// throw new Error() I think you shouldn't have commented out code here, instead, you should do: FIXME: Assert that correct is true <bug link here> 1623772 10 391943 justin_michaud 2020-02-27 16:48:12 -0800 Created attachment 391943 Patch 1623775 11 mark.lam 2020-02-27 16:57:32 -0800 <rdar://problem/59302840> 1623796 12 391943 commit-queue 2020-02-27 17:34:11 -0800 Comment on attachment 391943 Patch Clearing flags on attachment: 391943 Committed r257605: <https://trac.webkit.org/changeset/257605> 1623797 13 commit-queue 2020-02-27 17:34:13 -0800 All reviewed patches have been landed. Closing bug. 391777 2020-02-26 14:05:11 -0800 2020-02-27 13:40:53 -0800 Patch bug-208261-20200226140510.patch text/plain 2737 justin_michaud U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBl MTZlYjRiMjBhMmJlMjFhMTYwZjRiNjgxYjk4MmNjNTcyZWIwN2M3Li4wZTU0MzJlOTZlZjRlNzY4 YzNhZjJmZjlmMTlkNWI2ZDAwZDI1NjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAyMC0wMi0yNiAgSnVzdGluIE1pY2hhdWQgIDxqdXN0aW5fbWljaGF1ZEBh cHBsZS5jb20+CisKKyAgICAgICAgUG9seSBwcm90byBzaG91bGQgd29yayB3aXRoIHByb3BlcnR5 IGRlbGV0ZSB0cmFuc2l0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA4MjYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBqaXQvUmVwYXRjaC5jcHA6CisgICAgICAgIChKU0M6OnRyeUNhY2hlUHV0 QnlJRCk6CisKIDIwMjAtMDItMjUgIEp1c3RpbiBNaWNoYXVkICA8anVzdGluX21pY2hhdWRAYXBw bGUuY29tPgogCiAgICAgICAgIElubGluZSBDYWNoZSBkZWxldGUgYnkgaWQvdmFsCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcAppbmRleCA3YmYxMTNlZTgxMTdiZGZiODg5NjFlMmEx ZmQ5NDExMjdhM2E0YTg5Li40M2I4MmRjZmExYjBjYjAxZDlmZDEyNDY5MDEwZWQ2YTk2YjI5N2Zh IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5jcHAKQEAgLTY4OSw2ICs2ODksOCBA QCBzdGF0aWMgSW5saW5lQ2FjaGVBY3Rpb24gdHJ5Q2FjaGVQdXRCeUlEKEpTR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QsIENvZGVCbG9jawogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCFw cm90b3R5cGVBY2Nlc3NDaGFpbikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4g R2l2ZVVwT25DYWNoZTsKICAgICAgICAgICAgICAgICAgICAgICAgIG9mZnNldCA9IHByb3RvdHlw ZUFjY2Vzc0NoYWluLT5zbG90QmFzZVN0cnVjdHVyZSh2bSwgYmFzZUNlbGwtPnN0cnVjdHVyZSh2 bSkpLT5nZXQodm0sIGlkZW50LmltcGwoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAo IWlzVmFsaWRPZmZzZXQob2Zmc2V0KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1 cm4gR2l2ZVVwT25DYWNoZTsKICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAg ICAgICAgICAgICAgICAgIHByb3RvdHlwZUFjY2Vzc0NoYWluID0gbnVsbHB0cjsKICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbmRpdGlvblNldCA9IGdlbmVyYXRlQ29uZGl0aW9uc0ZvclByb3Rv dHlwZVByb3BlcnR5SGl0KApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3Rz L0NoYW5nZUxvZwppbmRleCAxZjIxZTdjYjEzNDRiNDczN2JkMjY4NDZhNDQzZTUxNGM4MTc5ZmYy Li4zMTIxMzdjYjg1MTI0YThiMmQ0OGU1NzIyYWRhMDdjNjViMmZlMTUzIDEwMDY0NAotLS0gYS9K U1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA CisyMDIwLTAyLTI2ICBKdXN0aW4gTWljaGF1ZCAgPGp1c3Rpbl9taWNoYXVkQGFwcGxlLmNvbT4K KworICAgICAgICBQb2x5IHByb3RvIHNob3VsZCB3b3JrIHdpdGggcHJvcGVydHkgZGVsZXRlIHRy YW5zaXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDgyNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHN0cmVzcy9kZWxldGUtcHJvcGVydHktcG9seS1wcm90by5qczogQWRkZWQuCisgICAgICAg IChBLnByb3RvdHlwZS5zZXQgeCk6CisgICAgICAgIChBKToKKyAgICAgICAgKEIpOgorCiAyMDIw LTAyLTI1ICBKdXN0aW4gTWljaGF1ZCAgPGp1c3Rpbl9taWNoYXVkQGFwcGxlLmNvbT4KIAogICAg ICAgICBJbmxpbmUgQ2FjaGUgZGVsZXRlIGJ5IGlkL3ZhbApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9z dHJlc3MvZGVsZXRlLXByb3BlcnR5LXBvbHktcHJvdG8uanMgYi9KU1Rlc3RzL3N0cmVzcy9kZWxl dGUtcHJvcGVydHktcG9seS1wcm90by5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hMTM5MDdiMTk4NDFkMTFlYzI5 NTI5NmIyNDZlY2ViODc1YTRkZTA5Ci0tLSAvZGV2L251bGwKKysrIGIvSlNUZXN0cy9zdHJlc3Mv ZGVsZXRlLXByb3BlcnR5LXBvbHktcHJvdG8uanMKQEAgLTAsMCArMSwxNiBAQAorLy9AIHJ1bkRl ZmF1bHQoIi0tZm9yY2VQb2x5UHJvdG89MSAtLWppdFBvbGljeVNjYWxlPTAiKQorCitjbGFzcyBB IHsKKyAgc2V0IHgodikgeworICAgIGlmICh2ID09PSAxKSB7CisgICAgICBkZWxldGUgQS5wcm90 b3R5cGUueDsKKyAgICB9CisgIH0KK30KKworY2xhc3MgQiBleHRlbmRzIEEge30KKworbGV0IGEg PSBuZXcgQigpOworZm9yIChsZXQgaSA9IDA7IGkgPCAxMDsgaSsrKSB7CisgIGEueCA9IGk7Cit9 Cg== 391905 2020-02-27 13:40:54 -0800 2020-02-27 16:48:10 -0800 Patch bug-208261-20200227134053.patch text/plain 7166 justin_michaud U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj ODA0ODAxNDJkYTA2NGYxZWVjNWI4ZmU0OTFiMzIxMjIyNzJiZTU2Li5lYmY4NzBkZmUzMTYyOWNj NmRmMjFmOWYwMzU4NDFlZTI0OTA5NGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNSBAQAorMjAyMC0wMi0yNiAgSnVzdGluIE1pY2hhdWQgIDxqdXN0aW5fbWljaGF1ZEBh cHBsZS5jb20+CisKKyAgICAgICAgUG9seSBwcm90byBzaG91bGQgd29yayB3aXRoIHByb3BlcnR5 IGRlbGV0ZSB0cmFuc2l0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA4MjYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyBhIGJ1ZyB3aGVyZSB0aGUgY29tYmluYXRpb24g b2YgaW5saW5lIGNhY2hpbmcKKyAgICAgICAgYW5kIHBvbHkgcGhvdG8gY2F1c2UgdXMgdG8gY2Fj aGUgYSBzZXR0ZXIgY2FsbCBhbG9uZyBhIHByb3RvdHlwZSBjaGFpbiB0aGF0IAorICAgICAgICBp cyBubyBsb25nZXIgdGhlIGNvcnJlY3Qgc2V0dGVyIHRvIGNhbGwuIFRoaXMgaXMgZXhwb3NlZCBh cyBhIHJlc3VsdCBvZiAyMDY0MzAKKyAgICAgICAgc2luY2UgRGVmaW5lT3duUHJvcGVydHkgdXNl ZCB0byB0cmFuc2l0aW9uIHRvIHVuY2FjaGVhYmxlIGRpY3Rpb25hcnkuCisKKyAgICAgICAgVGhl IGNhc2UgbG9va3MgbGlrZSB0aGlzOgorICAgICAgICBBIC0gc2V0dGVyIGZvciB4IHJlZGVmaW5l cyB4CisgICAgICAgIHwKKyAgICAgICAgQgorICAgICAgICB8CisgICAgICAgIEMKKworICAgICAg ICBXZSBzZXQgKG5ldyBDKS54CisKKyAgICAgICAgV2UgZmlyc3QgY2FsbCB0aGUgc2V0dGVyLCB0 aGVuIHRyeSB0byBmaWd1cmUgb3V0IHdoYXQgdGhlIHN0YXRlIG9mIHRoaW5ncworICAgICAgICB3 ZXJlIGJlZm9yZSBpdCB3YXMgY2FsbGVkLiBXZSBzZWUgdGhhdCBBJ3Mgc2V0dGVyIHN0aWxsIGV4 aXN0cywgc28gd2UgY2FjaGUgaXQKKyAgICAgICAgd2l0aG91dCBldmVyIGNoZWNraW5nIHRoYXQg aXQgaXMgc3RpbGwgYSBzZXR0ZXIuCisKKyAgICAgICAgSW4gdGhlIGNvZGUsIEEgPSB0YXJnZXQs IEMgPSBiYXNlLgorCisgICAgICAgIEdldCBpcyBjb3JyZWN0IGJlY2F1c2UgaXQgY29sbGVjdHMg Y2FjaGluZyBpbmZvcm1hdGlvbiBiZWZvcmUgYW55IGNhbGxzLgorCisgICAgICAgICogaml0L1Jl cGF0Y2guY3BwOgorICAgICAgICAoSlNDOjp0cnlDYWNoZVB1dEJ5SUQpOgorCiAyMDIwLTAyLTI2 ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmhhbmNlIEpTT2Jq ZWN0R2V0UHJvcGVydHkoKSB0byBtaXRpZ2F0ZSBhZ2FpbnN0IG51bGwgb2JqZWN0IHBvaW50ZXJz LgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5jcHAKaW5kZXggN2JmMTEzZWU4MTE3YmRm Yjg4OTYxZTJhMWZkOTQxMTI3YTNhNGE4OS4uODNhZDUxNjc3ZTMxMDBjZjgyN2ZkMWVjMzM0N2U4 MjhkYmJhZTRlMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNo LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCkBAIC02ODgs NyArNjg4LDEwIEBAIHN0YXRpYyBJbmxpbmVDYWNoZUFjdGlvbiB0cnlDYWNoZVB1dEJ5SUQoSlNH bG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgQ29kZUJsb2NrCiAgICAgICAgICAgICAgICAgICAg ICAgICBwcm90b3R5cGVBY2Nlc3NDaGFpbiA9IFBvbHlQcm90b0FjY2Vzc0NoYWluOjpjcmVhdGUo Z2xvYmFsT2JqZWN0LCBiYXNlQ2VsbCwgc2xvdC5iYXNlKCkpOwogICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKCFwcm90b3R5cGVBY2Nlc3NDaGFpbikKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICByZXR1cm4gR2l2ZVVwT25DYWNoZTsKLSAgICAgICAgICAgICAgICAgICAgICAgIG9mZnNl dCA9IHByb3RvdHlwZUFjY2Vzc0NoYWluLT5zbG90QmFzZVN0cnVjdHVyZSh2bSwgYmFzZUNlbGwt PnN0cnVjdHVyZSh2bSkpLT5nZXQodm0sIGlkZW50LmltcGwoKSk7CisgICAgICAgICAgICAgICAg ICAgICAgICB1bnNpZ25lZCBhdHRyaWJ1dGVzOworICAgICAgICAgICAgICAgICAgICAgICAgb2Zm c2V0ID0gcHJvdG90eXBlQWNjZXNzQ2hhaW4tPnNsb3RCYXNlU3RydWN0dXJlKHZtLCBiYXNlQ2Vs bC0+c3RydWN0dXJlKHZtKSktPmdldCh2bSwgaWRlbnQuaW1wbCgpLCBhdHRyaWJ1dGVzKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGlmICghaXNWYWxpZE9mZnNldChvZmZzZXQpIHx8ICEoYXR0 cmlidXRlcyAmIFByb3BlcnR5QXR0cmlidXRlOjpBY2Nlc3NvcikpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIFJldHJ5Q2FjaGVMYXRlcjsKICAgICAgICAgICAgICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHByb3RvdHlwZUFjY2Vzc0NoYWluID0g bnVsbHB0cjsKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbmRpdGlvblNldCA9IGdlbmVyYXRl Q29uZGl0aW9uc0ZvclByb3RvdHlwZVByb3BlcnR5SGl0KApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9D aGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCBmYWJhNGU1OTkwMzEwZGM5MzcxNzIy OTQ1MGM3ZTIxZTZjYWIyMDg4Li5kZTdlZmU4MDg2OTE4MGYxNTNhZDU5NTBlMzlkMjczZmFlZWNj MmRlIDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTAyLTI2ICBKdXN0aW4gTWljaGF1ZCAgPGp1c3Rpbl9t aWNoYXVkQGFwcGxlLmNvbT4KKworICAgICAgICBQb2x5IHByb3RvIHNob3VsZCB3b3JrIHdpdGgg cHJvcGVydHkgZGVsZXRlIHRyYW5zaXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDgyNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9kZWxldGUtcHJvcGVydHktcG9seS1wcm90by5q czogQWRkZWQuCisgICAgICAgIChBLnByb3RvdHlwZS5zZXQgeCk6CisgICAgICAgIChBKToKKyAg ICAgICAgKEIpOgorCiAyMDIwLTAyLTI2ICBDYWlvIExpbWEgIDx0aWNhaW9saW1hQGdtYWlsLmNv bT4KIAogICAgICAgICBbSlNDXVtNSVBTXSBBZGRpbmcgc3VwcG9ydCB0byBDaGVja3BvaW50cwpk aWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3MvZGVsZXRlLXByb3BlcnR5LXBvbHktcHJvdG8uanMg Yi9KU1Rlc3RzL3N0cmVzcy9kZWxldGUtcHJvcGVydHktcG9seS1wcm90by5qcwpuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li43MjI4ZjQyOWY4N2UyYjNiNTg3OWZmNjNiMTEzNzQ4MzM5MTA2Yjg3Ci0tLSAvZGV2L251bGwK KysrIGIvSlNUZXN0cy9zdHJlc3MvZGVsZXRlLXByb3BlcnR5LXBvbHktcHJvdG8uanMKQEAgLTAs MCArMSw0MSBAQAorLy9AIHJlcXVpcmVPcHRpb25zKCItLWZvcmNlUG9seVByb3RvPTEiLCAiLS11 c2VMTEludD0wIikKKworY2xhc3MgQSB7CisgIHNldCB4KHYpIHsKKyAgICBpZiAodiA9PT0gMSkg eworICAgICAgZGVsZXRlIEEucHJvdG90eXBlLng7CisgICAgfQorICB9CisKKyAgZ2V0IHkoKSB7 CisgICAgaWYgKHRoaXMuX3kgPT09IDEpIHsKKyAgICAgIGRlbGV0ZSBBLnByb3RvdHlwZS55Owor ICAgIH0KKyAgICB0aGlzLl95Kys7CisgIH0KKworICBzZXQgeih2KSB7CisgICAgaWYgKHYgPT09 IDEpIHsKKyAgICAgIGRlbGV0ZSBBLnByb3RvdHlwZS56OworICAgIH0KKyAgfQorfQorCitjbGFz cyBCIGV4dGVuZHMgQSB7fQorCitsZXQgYSA9IG5ldyBCKCk7Citmb3IgKGxldCBpID0gMDsgaSA8 IDEwOyBpKyspIHsKKyAgYS54ID0gaTsKK30KKworZm9yIChsZXQgaSA9IDA7IGkgPCAxMDsgaSsr KSB7CisgIGFbInoiXSA9IGk7Cit9CisKK2EuX3kgPSAwOworZm9yIChsZXQgaSA9IDA7IGkgPCAx NTsgaSsrKSB7CisgIGEueTsKK30KKworaWYgKGEuX3kgIT0gMikKKyAgICB0aHJvdyBuZXcgRXJy b3IoKQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3MvcG9seS1wcm90by1zZXR0ZXItYWRkcy1z ZXR0ZXItaW4tbWlkZGxlLmpzIGIvSlNUZXN0cy9zdHJlc3MvcG9seS1wcm90by1zZXR0ZXItYWRk cy1zZXR0ZXItaW4tbWlkZGxlLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFkY2JhNTVjNDMwZTE2OGYxYWI3ODNi OTk0NmQ1NDY2ZjFjOGRjZTUKLS0tIC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL3N0cmVzcy9wb2x5 LXByb3RvLXNldHRlci1hZGRzLXNldHRlci1pbi1taWRkbGUuanMKQEAgLTAsMCArMSwzMiBAQAor Ly9AIHJlcXVpcmVPcHRpb25zKCItLWZvcmNlUG9seVByb3RvPTEiLCAiLS11c2VMTEludD0wIiwg Ii0tcmVwYXRjaEJ1ZmZlcmluZ0NvdW50ZG93bj0wIikKK2xldCBjb3JyZWN0ID0gZmFsc2UKKwor Y2xhc3MgQSB7CisgICAgc2V0IHgodikgeworICAgICAgICBpZiAodiA9PSAxKSB7CisgICAgICAg ICAgICBPYmplY3QuZGVmaW5lUHJvcGVydHkoQi5wcm90b3R5cGUsICJ4IiwgeworICAgICAgICAg ICAgICAgIHNldDogZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgICAgIGNvcnJlY3QgPSB0 cnVlCisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9 Cit9CisKK2NsYXNzIEIgZXh0ZW5kcyBBIHsKKyAgICBzZXQgeSh2KSB7fQorICAgIHNldCB5MSh2 KSB7fQorICAgIHNldCB5Mih2KSB7fQorfQorCitjbGFzcyBDIGV4dGVuZHMgQiB7CisKK30KKwor bGV0IGEgPSBuZXcgQygpOworZm9yIChsZXQgaSA9IDA7IGkgPCAzMDsgaSsrKSB7CisgIGEueCA9 IGk7Cit9CisKKy8vaWYgKCFjb3JyZWN0KQorLy8gICAgdGhyb3cgbmV3IEVycm9yKCkKZGlmZiAt LWdpdCBhL0pTVGVzdHMvc3RyZXNzL3BvbHktcHJvdG8tc2V0dGVyLWNoYW5nZXMtc2V0dGVyLTIu anMgYi9KU1Rlc3RzL3N0cmVzcy9wb2x5LXByb3RvLXNldHRlci1jaGFuZ2VzLXNldHRlci0yLmpz Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmY4N2VhZmFiYzNmY2E2OTVmYWFhMzY0MjEyNGMwYTU1YzFmZmQ3ZDIKLS0t IC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL3N0cmVzcy9wb2x5LXByb3RvLXNldHRlci1jaGFuZ2Vz LXNldHRlci0yLmpzCkBAIC0wLDAgKzEsMzggQEAKKy8vQCByZXF1aXJlT3B0aW9ucygiLS1mb3Jj ZVBvbHlQcm90bz0xIiwgIi0tdXNlTExJbnQ9MCIsICItLXJlcGF0Y2hCdWZmZXJpbmdDb3VudGRv d249MCIpCitmdW5jdGlvbiBhc3NlcnRfZXEoYSwgYikgeworICAgIAorfQorbm9JbmxpbmUoYXNz ZXJ0X2VxKQorCitjbGFzcyBBIHsKKyAgICBzZXQgeCh2KSB7CisgICAgICAgIGlmICh2ID09IDEp IHsKKyAgICAgICAgICAgIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShBLnByb3RvdHlwZSwgIngiLCB7 CisgICAgICAgICAgICAgICAgZ2V0OiBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuIDQyCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICBzZXQ6IHVuZGVm aW5lZAorICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHYgPiAxKQorICAg ICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCkKKyAgICB9Cit9CisKK2NsYXNzIEIgZXh0ZW5kcyBB IHsKKyAgICBzZXQgeSh2KSB7fQorICAgIHNldCB5MSh2KSB7fQorICAgIHNldCB5Mih2KSB7fQor fQorCitjbGFzcyBDIGV4dGVuZHMgQiB7CisKK30KKworbGV0IGEgPSBuZXcgQygpOworZm9yIChs ZXQgaSA9IDA7IGkgPCAzMDsgaSsrKSB7CisgIGEueCA9IGk7CisgIGFzc2VydF9lcShhLngsIGkg PT0gMCA/IHVuZGVmaW5lZCA6IDQyKQorfQorCisKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNz L3BvbHktcHJvdG8tc2V0dGVyLWNoYW5nZXMtc2V0dGVyLmpzIGIvSlNUZXN0cy9zdHJlc3MvcG9s eS1wcm90by1zZXR0ZXItY2hhbmdlcy1zZXR0ZXIuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNThjNTYzMWI4ZWUz ZDYyNzEyMzU2NDUxNGVjNDI3OGQ3MzdlMmQ2ZAotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMv c3RyZXNzL3BvbHktcHJvdG8tc2V0dGVyLWNoYW5nZXMtc2V0dGVyLmpzCkBAIC0wLDAgKzEsMzQg QEAKKy8vQCByZXF1aXJlT3B0aW9ucygiLS1mb3JjZVBvbHlQcm90bz0xIiwgIi0tdXNlTExJbnQ9 MCIsICItLXJlcGF0Y2hCdWZmZXJpbmdDb3VudGRvd249MCIpCitmdW5jdGlvbiBhc3NlcnRfZXEo YSwgYikgeworICAgIGlmIChhICE9PSBiKQorICAgICAgICB0aHJvdyBuZXcgRXJyb3IoImFzc2Vy dGlvbiBmYWlsZWQ6ICIgKyBhICsgIiA9PT0gIiArIGIpOworfQorbm9JbmxpbmUoYXNzZXJ0X2Vx KQorCitjbGFzcyBBIHsKKyAgICBzZXQgeCh2KSB7CisgICAgICAgIGlmICh2ID09IDEpIHsKKyAg ICAgICAgICAgIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShBLnByb3RvdHlwZSwgIngiLCB7CisgICAg ICAgICAgICAgICAgdmFsdWU6IDQyLAorICAgICAgICAgICAgICAgIHdyaXRhYmxlOiB0cnVlCisg ICAgICAgICAgICB9KTsKKyAgICAgICAgfQorICAgIH0KK30KKworY2xhc3MgQiBleHRlbmRzIEEg eworICAgIHNldCB5KHYpIHt9CisgICAgc2V0IHkxKHYpIHt9CisgICAgc2V0IHkyKHYpIHt9Cit9 CisKK2NsYXNzIEMgZXh0ZW5kcyBCIHsKKworfQorCitsZXQgYSA9IG5ldyBDKCk7Citmb3IgKGxl dCBpID0gMDsgaSA8IDMwOyBpKyspIHsKKyAgYS54ID0gaTsKKyAgYXNzZXJ0X2VxKGEueCwgaSA9 PSAwID8gdW5kZWZpbmVkIDogaSA9PSAxID8gNDIgOiBpKTsKK30KKwo= 391943 2020-02-27 16:48:12 -0800 2020-02-27 17:34:11 -0800 Patch bug-208261-20200227164811.patch text/plain 7545 justin_michaud U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 ZmRhZGU3MWQ4NDE3MzI4YjUwZDZlMWUwMzhlZjQzYzM0NGE2NWU0Li5iMTBiMTMzOTAzMTFlNzBm ZTc3OGI2ZmFmYzM5Mjk3NWNiNTkxODkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAyMC0wMi0yNyAgSnVzdGluIE1pY2hhdWQgIDxqdXN0aW5fbWljaGF1ZEBh cHBsZS5jb20+CisKKyAgICAgICAgUG9seSBwcm90byBzaG91bGQgd29yayB3aXRoIHByb3BlcnR5 IGRlbGV0ZSB0cmFuc2l0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA4MjYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FhbSBCYXJhdGkuCisK KyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyBhIGJ1ZyB3aGVyZSB0aGUgY29tYmluYXRpb24gb2Yg aW5saW5lIGNhY2hpbmcKKyAgICAgICAgYW5kIHBvbHkgcHJvdG8gY2F1c2UgdXMgdG8gY2FjaGUg YSBzZXR0ZXIgY2FsbCBhbG9uZyBhIHByb3RvdHlwZSBjaGFpbiB0aGF0IAorICAgICAgICBpcyBu byBsb25nZXIgdGhlIGNvcnJlY3Qgc2V0dGVyIHRvIGNhbGwuIFRoaXMgaXMgZXhwb3NlZCBhcyBh IHJlc3VsdCBvZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjA2NDMwIHNpbmNlIERlZmluZU93blByb3BlcnR5IHVzZWQgCisgICAgICAgIHRvIHRyYW5z aXRpb24gdG8gdW5jYWNoZWFibGUgZGljdGlvbmFyeS4KKworICAgICAgICBUaGUgY2FzZSBsb29r cyBsaWtlIHRoaXM6CisgICAgICAgIEEgLSBzZXR0ZXIgZm9yIHggcmVkZWZpbmVzIHgKKyAgICAg ICAgfAorICAgICAgICBCCisgICAgICAgIHwKKyAgICAgICAgQworCisgICAgICAgIFdlIHNldCAo bmV3IEMpLngKKworICAgICAgICBSaWdodCBub3csIHdlIGZpcnN0IGNhbGwgQSdzIHNldHRlciwg dGhlbiB3ZSB0cnkgdG8gZmlndXJlIG91dCB3aGF0IHRoZSBzdGF0ZSBvZiB0aGluZ3MKKyAgICAg ICAgd2VyZSBiZWZvcmUgaXQgd2FzIGNhbGxlZCBpbiBvcmRlciB0byBjYWNoZSBpdC4gV2UganVz dCBhc3N1bWUgdGhhdCBBJ3Mgc2V0dGVyIHN0aWxsIGV4aXN0cywgYW5kIHdlIGNhY2hlIGl0Cisg ICAgICAgIHdpdGhvdXQgZXZlciBjaGVja2luZywgSW4gdGhpcyBwYXRjaCwgd2UgZW5zdXJlIHRo YXQgdGhlIHByb3BlcnR5IGV4aXN0cyBhbmQgdGhlIGF0dHJpYnV0ZXMgbWF0Y2ggaW4gb3JkZXIg dG8gcHJldmVudCBjcmFzaGluZy4gCisKKyAgICAgICAgSW4gdGhlIGNvZGUsIEEgPSB0YXJnZXQs IEMgPSBiYXNlLgorCisgICAgICAgIEdldCBpcyBjb3JyZWN0IGJlY2F1c2UgaXQgY29sbGVjdHMg Y2FjaGluZyBpbmZvcm1hdGlvbiBiZWZvcmUgYW55IGNhbGxzLgorCisgICAgICAgIFRoZSBidWcg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODMzNyB0cmFja3MgdGhl IHJlbWFpbmluZyBzZW1hbnRpYyBidWdzIGFyb3VuZCB0aGlzIGNvZGUuCisKKyAgICAgICAgKiBq aXQvUmVwYXRjaC5jcHA6CisgICAgICAgIChKU0M6OnRyeUNhY2hlUHV0QnlJRCk6CisKIDIwMjAt MDItMjcgIEJhc3VrZSBTdXp1a2kgIDxiYXN1a2Uuc3V6dWtpQHNvbnkuY29tPgogCiAgICAgICAg IFtXaW5DYWlyb10gRml4IFJlbW90ZUluc3BlY3RvciByZWNvbm5lY3QgaXNzdWUKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5jcHAgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCmluZGV4IDdiZjExM2VlODExN2JkZmI4ODk2MWUyYTFm ZDk0MTEyN2EzYTRhODkuLjgzYWQ1MTY3N2UzMTAwY2Y4MjdmZDFlYzMzNDdlODI4ZGJiYWU0ZTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcApAQCAtNjg4LDcgKzY4OCwxMCBA QCBzdGF0aWMgSW5saW5lQ2FjaGVBY3Rpb24gdHJ5Q2FjaGVQdXRCeUlEKEpTR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QsIENvZGVCbG9jawogICAgICAgICAgICAgICAgICAgICAgICAgcHJvdG90 eXBlQWNjZXNzQ2hhaW4gPSBQb2x5UHJvdG9BY2Nlc3NDaGFpbjo6Y3JlYXRlKGdsb2JhbE9iamVj dCwgYmFzZUNlbGwsIHNsb3QuYmFzZSgpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmICgh cHJvdG90eXBlQWNjZXNzQ2hhaW4pCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IEdpdmVVcE9uQ2FjaGU7Ci0gICAgICAgICAgICAgICAgICAgICAgICBvZmZzZXQgPSBwcm90b3R5 cGVBY2Nlc3NDaGFpbi0+c2xvdEJhc2VTdHJ1Y3R1cmUodm0sIGJhc2VDZWxsLT5zdHJ1Y3R1cmUo dm0pKS0+Z2V0KHZtLCBpZGVudC5pbXBsKCkpOworICAgICAgICAgICAgICAgICAgICAgICAgdW5z aWduZWQgYXR0cmlidXRlczsKKyAgICAgICAgICAgICAgICAgICAgICAgIG9mZnNldCA9IHByb3Rv dHlwZUFjY2Vzc0NoYWluLT5zbG90QmFzZVN0cnVjdHVyZSh2bSwgYmFzZUNlbGwtPnN0cnVjdHVy ZSh2bSkpLT5nZXQodm0sIGlkZW50LmltcGwoKSwgYXR0cmlidXRlcyk7CisgICAgICAgICAgICAg ICAgICAgICAgICBpZiAoIWlzVmFsaWRPZmZzZXQob2Zmc2V0KSB8fCAhKGF0dHJpYnV0ZXMgJiBQ cm9wZXJ0eUF0dHJpYnV0ZTo6QWNjZXNzb3IpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJldHVybiBSZXRyeUNhY2hlTGF0ZXI7CiAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAg ICAgICAgICAgICAgICAgICAgICAgICBwcm90b3R5cGVBY2Nlc3NDaGFpbiA9IG51bGxwdHI7CiAg ICAgICAgICAgICAgICAgICAgICAgICBjb25kaXRpb25TZXQgPSBnZW5lcmF0ZUNvbmRpdGlvbnNG b3JQcm90b3R5cGVQcm9wZXJ0eUhpdCgKZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIv SlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDJkYjM1Zjc4NDIwZDM4YTA5YTI4ZTg2ZWFlMzE4NDQx OWRkMWUyNC4uMTc5ZDIxMjkxYTBkZmViMzI3MWIxM2M2NjgzNzQyZjFkNWM2MTMzNiAxMDA2NDQK LS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNSBAQAorMjAyMC0wMi0yNyAgSnVzdGluIE1pY2hhdWQgIDxqdXN0aW5fbWljaGF1ZEBhcHBs ZS5jb20+CisKKyAgICAgICAgUG9seSBwcm90byBzaG91bGQgd29yayB3aXRoIHByb3BlcnR5IGRl bGV0ZSB0cmFuc2l0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjA4MjYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FhbSBCYXJhdGkuCisKKyAg ICAgICAgKiBzdHJlc3MvZGVsZXRlLXByb3BlcnR5LXBvbHktcHJvdG8uanM6IEFkZGVkLgorICAg ICAgICAoQS5wcm90b3R5cGUuc2V0IHgpOgorICAgICAgICAoQSk6CisgICAgICAgIChCKToKKwog MjAyMC0wMi0yNyAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29ueS5jb20+CiAKICAg ICAgICAgVXBkYXRlIHRlc3QyNjIgKDIwMjAuMDIuMjYpCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0 cmVzcy9kZWxldGUtcHJvcGVydHktcG9seS1wcm90by5qcyBiL0pTVGVzdHMvc3RyZXNzL2RlbGV0 ZS1wcm9wZXJ0eS1wb2x5LXByb3RvLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc4YWZiMTU4OTU0MGYzMmY1Y2Jh ZDlkNjc0ZjIwZDJkMDE3YjhiZmIKLS0tIC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL3N0cmVzcy9k ZWxldGUtcHJvcGVydHktcG9seS1wcm90by5qcwpAQCAtMCwwICsxLDQxIEBACisvL0AgcmVxdWly ZU9wdGlvbnMoIi0tZm9yY2VQb2x5UHJvdG89MSIsICItLXVzZUxMSW50PTAiKQorCitjbGFzcyBB IHsKKyAgICBzZXQgeCh2KSB7CisgICAgICAgIGlmICh2ID09PSAxKSB7CisgICAgICAgICAgICBk ZWxldGUgQS5wcm90b3R5cGUueDsKKyAgICAgICAgfQorICAgIH0KKworICAgIGdldCB5KCkgewor ICAgICAgICBpZiAodGhpcy5feSA9PT0gMSkgeworICAgICAgICAgICAgZGVsZXRlIEEucHJvdG90 eXBlLnk7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5feSsrOworICAgIH0KKworICAgIHNldCB6 KHYpIHsKKyAgICAgICAgaWYgKHYgPT09IDEpIHsKKyAgICAgICAgICAgIGRlbGV0ZSBBLnByb3Rv dHlwZS56OworICAgICAgICB9CisgICAgfQorfQorCitjbGFzcyBCIGV4dGVuZHMgQSB7fQorCits ZXQgYSA9IG5ldyBCKCk7Citmb3IgKGxldCBpID0gMDsgaSA8IDEwOyBpKyspIHsKKyAgICBhLngg PSBpOworfQorCitmb3IgKGxldCBpID0gMDsgaSA8IDEwOyBpKyspIHsKKyAgICBhWyJ6Il0gPSBp OworfQorCithLl95ID0gMDsKK2ZvciAobGV0IGkgPSAwOyBpIDwgMTU7IGkrKykgeworICAgIGEu eTsKK30KKworaWYgKGEuX3kgIT0gMikKKyAgICB0aHJvdyBuZXcgRXJyb3IoKQpkaWZmIC0tZ2l0 IGEvSlNUZXN0cy9zdHJlc3MvcG9seS1wcm90by1zZXR0ZXItYWRkcy1zZXR0ZXItaW4tbWlkZGxl LmpzIGIvSlNUZXN0cy9zdHJlc3MvcG9seS1wcm90by1zZXR0ZXItYWRkcy1zZXR0ZXItaW4tbWlk ZGxlLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjQwMWNjZjY4YTljY2NiYTMwMGMyNTdiZDk4ZmJmNWZiNWY0YWNl NjQKLS0tIC9kZXYvbnVsbAorKysgYi9KU1Rlc3RzL3N0cmVzcy9wb2x5LXByb3RvLXNldHRlci1h ZGRzLXNldHRlci1pbi1taWRkbGUuanMKQEAgLTAsMCArMSwzMSBAQAorLy9AIHJlcXVpcmVPcHRp b25zKCItLWZvcmNlUG9seVByb3RvPTEiLCAiLS11c2VMTEludD0wIiwgIi0tcmVwYXRjaEJ1ZmZl cmluZ0NvdW50ZG93bj0wIikKK2xldCBjb3JyZWN0ID0gZmFsc2UKKworY2xhc3MgQSB7CisgICAg c2V0IHgodikgeworICAgICAgICBpZiAodiA9PSAxKSB7CisgICAgICAgICAgICBPYmplY3QuZGVm aW5lUHJvcGVydHkoQi5wcm90b3R5cGUsICJ4IiwgeworICAgICAgICAgICAgICAgIHNldDogZnVu Y3Rpb24oKSB7CisgICAgICAgICAgICAgICAgICAgIGNvcnJlY3QgPSB0cnVlCisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9Cit9CisKK2NsYXNzIEIg ZXh0ZW5kcyBBIHsKKyAgICBzZXQgeSh2KSB7fQorICAgIHNldCB5MSh2KSB7fQorICAgIHNldCB5 Mih2KSB7fQorfQorCitjbGFzcyBDIGV4dGVuZHMgQiB7CisKK30KKworbGV0IGEgPSBuZXcgQygp OworZm9yIChsZXQgaSA9IDA7IGkgPCAzMDsgaSsrKSB7CisgIGEueCA9IGk7Cit9CisKKy8vIEZJ WE1FOiBDaGVjayB0aGF0IGNvcnJlY3QgaXMgdHJ1ZTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwODMzNwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3MvcG9seS1w cm90by1zZXR0ZXItY2hhbmdlcy1zZXR0ZXItMi5qcyBiL0pTVGVzdHMvc3RyZXNzL3BvbHktcHJv dG8tc2V0dGVyLWNoYW5nZXMtc2V0dGVyLTIuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDMxYjA2NjM4OGM0ZjU0 ZDA0ZTQ3ZTk3NDc2MGNmM2UyYjNkMWUxNwotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3Ry ZXNzL3BvbHktcHJvdG8tc2V0dGVyLWNoYW5nZXMtc2V0dGVyLTIuanMKQEAgLTAsMCArMSwzOCBA QAorLy9AIHJlcXVpcmVPcHRpb25zKCItLWZvcmNlUG9seVByb3RvPTEiLCAiLS11c2VMTEludD0w IiwgIi0tcmVwYXRjaEJ1ZmZlcmluZ0NvdW50ZG93bj0wIikKK2Z1bmN0aW9uIGFzc2VydF9lcShh LCBiKSB7CisgICAgCit9Citub0lubGluZShhc3NlcnRfZXEpCisKK2NsYXNzIEEgeworICAgIHNl dCB4KHYpIHsKKyAgICAgICAgaWYgKHYgPT0gMSkgeworICAgICAgICAgICAgT2JqZWN0LmRlZmlu ZVByb3BlcnR5KEEucHJvdG90eXBlLCAieCIsIHsKKyAgICAgICAgICAgICAgICBnZXQ6IGZ1bmN0 aW9uKCkgeworICAgICAgICAgICAgICAgICAgICByZXR1cm4gNDIKKyAgICAgICAgICAgICAgICB9 LAorICAgICAgICAgICAgICAgIHNldDogdW5kZWZpbmVkCisgICAgICAgICAgICB9KTsKKyAgICAg ICAgfQorICAgICAgICBpZiAodiA+IDEpCisgICAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoKQor ICAgIH0KK30KKworY2xhc3MgQiBleHRlbmRzIEEgeworICAgIHNldCB5KHYpIHt9CisgICAgc2V0 IHkxKHYpIHt9CisgICAgc2V0IHkyKHYpIHt9Cit9CisKK2NsYXNzIEMgZXh0ZW5kcyBCIHsKKwor fQorCitsZXQgYSA9IG5ldyBDKCk7Citmb3IgKGxldCBpID0gMDsgaSA8IDMwOyBpKyspIHsKKyAg ICBhLnggPSBpOworICAgIGFzc2VydF9lcShhLngsIGkgPT0gMCA/IHVuZGVmaW5lZCA6IDQyKQor fQorCisKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL3BvbHktcHJvdG8tc2V0dGVyLWNoYW5n ZXMtc2V0dGVyLmpzIGIvSlNUZXN0cy9zdHJlc3MvcG9seS1wcm90by1zZXR0ZXItY2hhbmdlcy1z ZXR0ZXIuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uZjkxYWQ3YzIxMzMzZWE0MjBjY2JiODQxNDBjYTE0NGM3NjRh MzI5NQotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL3BvbHktcHJvdG8tc2V0dGVy LWNoYW5nZXMtc2V0dGVyLmpzCkBAIC0wLDAgKzEsMzQgQEAKKy8vQCByZXF1aXJlT3B0aW9ucygi LS1mb3JjZVBvbHlQcm90bz0xIiwgIi0tdXNlTExJbnQ9MCIsICItLXJlcGF0Y2hCdWZmZXJpbmdD b3VudGRvd249MCIpCitmdW5jdGlvbiBhc3NlcnRfZXEoYSwgYikgeworICAgIGlmIChhICE9PSBi KQorICAgICAgICB0aHJvdyBuZXcgRXJyb3IoImFzc2VydGlvbiBmYWlsZWQ6ICIgKyBhICsgIiA9 PT0gIiArIGIpOworfQorbm9JbmxpbmUoYXNzZXJ0X2VxKQorCitjbGFzcyBBIHsKKyAgICBzZXQg eCh2KSB7CisgICAgICAgIGlmICh2ID09IDEpIHsKKyAgICAgICAgICAgIE9iamVjdC5kZWZpbmVQ cm9wZXJ0eShBLnByb3RvdHlwZSwgIngiLCB7CisgICAgICAgICAgICAgICAgdmFsdWU6IDQyLAor ICAgICAgICAgICAgICAgIHdyaXRhYmxlOiB0cnVlCisgICAgICAgICAgICB9KTsKKyAgICAgICAg fQorICAgIH0KK30KKworY2xhc3MgQiBleHRlbmRzIEEgeworICAgIHNldCB5KHYpIHt9CisgICAg c2V0IHkxKHYpIHt9CisgICAgc2V0IHkyKHYpIHt9Cit9CisKK2NsYXNzIEMgZXh0ZW5kcyBCIHsK KworfQorCitsZXQgYSA9IG5ldyBDKCk7Citmb3IgKGxldCBpID0gMDsgaSA8IDMwOyBpKyspIHsK KyAgICBhLnggPSBpOworICAgIGFzc2VydF9lcShhLngsIGkgPT0gMCA/IHVuZGVmaW5lZCA6IGkg PT0gMSA/IDQyIDogaSk7Cit9CisK