175738 2017-08-18 15:50:33 -0700 Make GetDynamicVar propagate heap predictions instead of saying HeapTop 2017-08-23 10:42:29 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Enhancement --- 1 rmorisset webkit-unassigned buildbot commit-queue keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1340276 0 rmorisset 2017-08-18 15:50:33 -0700 In DFGPredictionPropagationPhase.cpp 1340278 1 318553 rmorisset 2017-08-18 16:02:25 -0700 Created attachment 318553 Patch, not yet benchmarked 1340308 2 318553 saam 2017-08-18 16:33:18 -0700 Comment on attachment 318553 Patch, not yet benchmarked View in context: https://bugs.webkit.org/attachment.cgi?id=318553&action=review > Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:4071 > + ASSERT(sizeof(identifierNumber) == 4); let's use static assert > Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:4072 > + return identifierNumber | ((uint64_t) getPutInfo << 32); style nit: we use static_cast in webkit instead of c-style casts 1340313 3 318557 rmorisset 2017-08-18 16:43:47 -0700 Created attachment 318557 Patch, not yet benchmarked, nits fixed 1340536 4 318557 saam 2017-08-21 00:34:09 -0700 Comment on attachment 318557 Patch, not yet benchmarked, nits fixed View in context: https://bugs.webkit.org/attachment.cgi?id=318557&action=review The patch LGTM but I’ll hold off r+ing until it builds. The one thing word adding is a micro benchmark just so you can verify it’s indeed faster. > Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:4067 > +// Both GetDynamicVar and PutDynamicVar need to cram two 32-bit numbers into their Style nit: This comment is unnecessary IMO. It’s not adding anything that’s not obvious from reading the code. > Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:4071 > + static_assert(sizeof(identifierNumber) == 4, FWIW, this is probably a hard assumption when compiling WK. I’d bet many thing would break if this didn’t hold. > Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:4073 > + return identifierNumber | (static_cast<uint64_t>(getPutInfo) << 32); That’s tricky! I guess Node::identifierNumber() just works? > Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:5373 > + uint64_t opInfo1 = makeDynamicVarOpInfo(identifierNumber, currentInstruction[4].u.operand); Style nit: not sure either of these really need to be local variables 1340553 5 318621 rmorisset 2017-08-21 02:44:58 -0700 Created attachment 318621 new Patch 1340554 6 rmorisset 2017-08-21 02:48:18 -0700 On the micro-benchmark I added, there is an improvement, but it is small: time to execute in release mode goes from 245ms to 235ms on my machine. Should I try to make a larger benchmark that makes the difference more visible, or was this level of improvement what was expected? Node::identifierNumber() just works, since it reads the OpInfoWrapper union as an int32, so it should only load the low bits. The bug on compilation on the build bots seemed to be caused by the function makeDynamicVarOpInfo not having its prototype declared separately. I don't see why that is a problem, so I just added the prototype next to the declaration. 1340625 7 318621 saam 2017-08-21 09:44:50 -0700 Comment on attachment 318621 new Patch View in context: https://bugs.webkit.org/attachment.cgi?id=318621&action=review > Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:4068 > +uint64_t makeDynamicVarOpInfo(unsigned, unsigned); I believe if you mark the function static this declaration isn’t needed. Or, you can always declare a lambda inside the function that switches on opcode 1341576 8 318879 rmorisset 2017-08-23 09:54:44 -0700 Created attachment 318879 Patch with static 1341610 9 318879 commit-queue 2017-08-23 10:41:56 -0700 Comment on attachment 318879 Patch with static Clearing flags on attachment: 318879 Committed r221084: <http://trac.webkit.org/changeset/221084> 1341611 10 commit-queue 2017-08-23 10:41:58 -0700 All reviewed patches have been landed. Closing bug. 1341613 11 webkit-bug-importer 2017-08-23 10:42:29 -0700 <rdar://problem/34038306> 318553 2017-08-18 16:02:25 -0700 2017-08-18 16:43:45 -0700 Patch, not yet benchmarked bug-175738-20170818160225.patch text/plain 5033 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwODgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YzFhYTBkOWM1NjU0ZjA1MTJhN2E2OTA2YzFmYjkwZWI5ZTljNGY4Li4wZjU3NDQwMjlkMjMzNjNk ZGI5ZjMyN2ExMmZlMzMxNTUxNDRkOTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNy0wOC0xOCAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIE1ha2UgR2V0RHluYW1pY1ZhciBwcm9wYWdhdGUgaGVhcCBwcmVkaWN0 aW9ucyBpbnN0ZWFkIG9mIHNheWluZyBIZWFwVG9wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzU3MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgaGVhcCBwcmVkaWN0aW9uIGFsd2F5cyBlbmQgdXAg aW4gbV9vcEluZm8yLiBCdXQgR2V0RHluYW1pY1ZhciB3YXMgYWxyZWFkeSBzdG9yaW5nIGdldFB1 dEluZm8gaW4gdGhlcmUuCisgICAgICAgIFNvIHdlIG1vdmUgdGhhdCBvbmUgaW50byBtX29wSW5m by4gV2UgY2FuIGRvIHRoaXMgYmVjYXVzZSBpdCBpcyAzMi1iaXQsIGFuZCB0aGUgYWxyZWFkeSBw cmVzZW50IGlkZW50aWZpZXJOdW1iZXIKKyAgICAgICAgaXMgYWxzbyAzMi1iaXQsIHNvIHdlIGNh biBwYWNrIGJvdGggaW4gbV9vcEluZm8gKHdoaWNoIGlzIDY0IGJpdHMpLgorCisgICAgICAgICog ZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjptYWtlRHluYW1p Y1Zhck9wSW5mbyk6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxv Y2spOgorICAgICAgICAqIGRmZy9ERkdOb2RlLmg6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6 Z2V0UHV0SW5mbyk6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6aGFzSGVhcFByZWRpY3Rpb24p OgorICAgICAgICAqIGRmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHA6CisKIDIw MTctMDgtMTcgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IHJlbW92ZSB1bnVzZWQgcHJpdmF0ZSBzdHJ1Y3QgZnJvbSBJbnNwZWN0b3JT Y3JpcHRQcm9maWxlckFnZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR0J5dGVDb2RlUGFyc2VyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0 ZUNvZGVQYXJzZXIuY3BwCmluZGV4IDVkZTdmM2EzY2NjMWJkN2UxNWI5Y2E0ZjJhYWYzMWJmZWQ3 ZTBiOWUuLmQzY2FlNzdjZjczZGQ0YTU1YWE1OWY0YTRlNjUwNjk3ZGMxZTIwMTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCkBAIC00MDY0 LDYgKzQwNjQsMTQgQEAgdm9pZCBCeXRlQ29kZVBhcnNlcjo6Y2xlYXJDYWNoZXMoKQogICAgIG1f Y29uc3RhbnRzLnNocmluaygwKTsKIH0KIAorLy8gQm90aCBHZXREeW5hbWljVmFyIGFuZCBQdXRE eW5hbWljVmFyIG5lZWQgdG8gY3JhbSB0d28gMzItYml0IG51bWJlcnMgaW50byB0aGVpcgorLy8g Zmlyc3Qgb3BJbmZvLgordWludDY0X3QgbWFrZUR5bmFtaWNWYXJPcEluZm8odW5zaWduZWQgaWRl bnRpZmllck51bWJlciwgdW5zaWduZWQgZ2V0UHV0SW5mbykKK3sKKyAgICBBU1NFUlQoc2l6ZW9m KGlkZW50aWZpZXJOdW1iZXIpID09IDQpOworICAgIHJldHVybiBpZGVudGlmaWVyTnVtYmVyIHwg KCh1aW50NjRfdCkgZ2V0UHV0SW5mbyA8PCAzMik7Cit9CisKIGJvb2wgQnl0ZUNvZGVQYXJzZXI6 OnBhcnNlQmxvY2sodW5zaWduZWQgbGltaXQpCiB7CiAgICAgYm9vbCBzaG91bGRDb250aW51ZVBh cnNpbmcgPSB0cnVlOwpAQCAtNTM2MSw4ICs1MzY5LDEwIEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6 OnBhcnNlQmxvY2sodW5zaWduZWQgbGltaXQpCiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAg IGlmIChuZWVkc0R5bmFtaWNMb29rdXAocmVzb2x2ZVR5cGUsIG9wX2dldF9mcm9tX3Njb3BlKSkg eworICAgICAgICAgICAgICAgIHVpbnQ2NF90IG9wSW5mbzEgPSBtYWtlRHluYW1pY1Zhck9wSW5m byhpZGVudGlmaWVyTnVtYmVyLCBjdXJyZW50SW5zdHJ1Y3Rpb25bNF0udS5vcGVyYW5kKTsKKyAg ICAgICAgICAgICAgICBTcGVjdWxhdGVkVHlwZSBwcmVkaWN0aW9uID0gZ2V0UHJlZGljdGlvbigp OwogICAgICAgICAgICAgICAgIHNldChWaXJ0dWFsUmVnaXN0ZXIoZHN0KSwKLSAgICAgICAgICAg ICAgICAgICAgYWRkVG9HcmFwaChHZXREeW5hbWljVmFyLCBPcEluZm8oaWRlbnRpZmllck51bWJl ciksIE9wSW5mbyhjdXJyZW50SW5zdHJ1Y3Rpb25bNF0udS5vcGVyYW5kKSwgZ2V0KFZpcnR1YWxS ZWdpc3RlcihzY29wZSkpKSk7CisgICAgICAgICAgICAgICAgICAgIGFkZFRvR3JhcGgoR2V0RHlu YW1pY1ZhciwgT3BJbmZvKG9wSW5mbzEpLCBPcEluZm8ocHJlZGljdGlvbiksIGdldChWaXJ0dWFs UmVnaXN0ZXIoc2NvcGUpKSkpOwogICAgICAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX2dldF9m cm9tX3Njb3BlKTsKICAgICAgICAgICAgIH0KIApAQCAtNTUzMyw3ICs1NTQzLDggQEAgYm9vbCBC eXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayh1bnNpZ25lZCBsaW1pdCkKIAogICAgICAgICAgICAg aWYgKG5lZWRzRHluYW1pY0xvb2t1cChyZXNvbHZlVHlwZSwgb3BfcHV0X3RvX3Njb3BlKSkgewog ICAgICAgICAgICAgICAgIEFTU0VSVChpZGVudGlmaWVyTnVtYmVyICE9IFVJTlRfTUFYKTsKLSAg ICAgICAgICAgICAgICBhZGRUb0dyYXBoKFB1dER5bmFtaWNWYXIsIE9wSW5mbyhpZGVudGlmaWVy TnVtYmVyKSwgT3BJbmZvKGN1cnJlbnRJbnN0cnVjdGlvbls0XS51Lm9wZXJhbmQpLCBnZXQoVmly dHVhbFJlZ2lzdGVyKHNjb3BlKSksIGdldChWaXJ0dWFsUmVnaXN0ZXIodmFsdWUpKSk7CisgICAg ICAgICAgICAgICAgdWludDY0X3Qgb3BJbmZvMSA9IG1ha2VEeW5hbWljVmFyT3BJbmZvKGlkZW50 aWZpZXJOdW1iZXIsIGN1cnJlbnRJbnN0cnVjdGlvbls0XS51Lm9wZXJhbmQpOworICAgICAgICAg ICAgICAgIGFkZFRvR3JhcGgoUHV0RHluYW1pY1ZhciwgT3BJbmZvKG9wSW5mbzEpLCBPcEluZm8o KSwgZ2V0KFZpcnR1YWxSZWdpc3RlcihzY29wZSkpLCBnZXQoVmlydHVhbFJlZ2lzdGVyKHZhbHVl KSkpOwogICAgICAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX3B1dF90b19zY29wZSk7CiAgICAg ICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9k ZS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgKaW5kZXggMGYxOTFhMGI1 ZWZmMTIyNDExMTE4NzBjMGM4MWM0YzNmMWFjOWMwOC4uMzY5YjQ3YTljYWNmZTA1MzViNWY2NTlj MDEzMWE3MDk3OTU4NzRkNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdOb2RlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgKQEAgLTk3 OCw3ICs5NzgsNyBAQCBwdWJsaWM6CiAgICAgdW5zaWduZWQgZ2V0UHV0SW5mbygpCiAgICAgewog ICAgICAgICBBU1NFUlQoaGFzR2V0UHV0SW5mbygpKTsKLSAgICAgICAgcmV0dXJuIG1fb3BJbmZv Mi5hczx1bnNpZ25lZD4oKTsKKyAgICAgICAgcmV0dXJuICh1bnNpZ25lZCkgKG1fb3BJbmZvLmFz PHVpbnQ2NF90PigpID4+IDMyKTsKICAgICB9CiAKICAgICBib29sIGhhc0FjY2Vzc29yQXR0cmli dXRlcygpCkBAIC0xNTE4LDYgKzE1MTgsNyBAQCBwdWJsaWM6CiAgICAgICAgIGNhc2UgQXRvbWlj c1N0b3JlOgogICAgICAgICBjYXNlIEF0b21pY3NTdWI6CiAgICAgICAgIGNhc2UgQXRvbWljc1hv cjoKKyAgICAgICAgY2FzZSBHZXREeW5hbWljVmFyOgogICAgICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNl LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUHJlZGljdGlvblByb3BhZ2F0aW9u UGhhc2UuY3BwCmluZGV4IDI1MTRlOTUyOTVjMzYwYTQ2N2JlNTAwZDNmMmM4MmM3MjVmOTEwYWIu LjZjYWNiOTA0M2MyNDUxYmEyMTUwODllZTM2MmE2ZTU3MDY4YjQwMmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUHJlZGljdGlvblByb3BhZ2F0aW9uUGhhc2UuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUHJlZGljdGlvblByb3BhZ2F0aW9u UGhhc2UuY3BwCkBAIC03MjAsMTMgKzcyMCwxMyBAQCBwcml2YXRlOgogICAgICAgICBjYXNlIExv YWRGcm9tSlNNYXBCdWNrZXQ6CiAgICAgICAgIGNhc2UgVG9OdW1iZXI6CiAgICAgICAgIGNhc2Ug R2V0QXJndW1lbnQ6Ci0gICAgICAgIGNhc2UgQ2FsbERPTUdldHRlcjogeworICAgICAgICBjYXNl IENhbGxET01HZXR0ZXI6CisgICAgICAgIGNhc2UgR2V0RHluYW1pY1ZhcjogewogICAgICAgICAg ICAgc2V0UHJlZGljdGlvbihtX2N1cnJlbnROb2RlLT5nZXRIZWFwUHJlZGljdGlvbigpKTsKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKLSAgICAgICAgY2FzZSBSZXNvbHZlU2NvcGVG b3JIb2lzdGluZ0Z1bmNEZWNsSW5FdmFsOgotICAgICAgICBjYXNlIEdldER5bmFtaWNWYXI6IHsK KyAgICAgICAgY2FzZSBSZXNvbHZlU2NvcGVGb3JIb2lzdGluZ0Z1bmNEZWNsSW5FdmFsOiB7CiAg ICAgICAgICAgICBzZXRQcmVkaWN0aW9uKFNwZWNCeXRlY29kZVRvcCk7CiAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgfQo= 318557 2017-08-18 16:43:47 -0700 2017-08-21 02:44:53 -0700 Patch, not yet benchmarked, nits fixed bug-175738-20170818164346.patch text/plain 5136 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwODgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YzFhYTBkOWM1NjU0ZjA1MTJhN2E2OTA2YzFmYjkwZWI5ZTljNGY4Li4wZjU3NDQwMjlkMjMzNjNk ZGI5ZjMyN2ExMmZlMzMxNTUxNDRkOTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNy0wOC0xOCAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIE1ha2UgR2V0RHluYW1pY1ZhciBwcm9wYWdhdGUgaGVhcCBwcmVkaWN0 aW9ucyBpbnN0ZWFkIG9mIHNheWluZyBIZWFwVG9wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzU3MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgaGVhcCBwcmVkaWN0aW9uIGFsd2F5cyBlbmQgdXAg aW4gbV9vcEluZm8yLiBCdXQgR2V0RHluYW1pY1ZhciB3YXMgYWxyZWFkeSBzdG9yaW5nIGdldFB1 dEluZm8gaW4gdGhlcmUuCisgICAgICAgIFNvIHdlIG1vdmUgdGhhdCBvbmUgaW50byBtX29wSW5m by4gV2UgY2FuIGRvIHRoaXMgYmVjYXVzZSBpdCBpcyAzMi1iaXQsIGFuZCB0aGUgYWxyZWFkeSBw cmVzZW50IGlkZW50aWZpZXJOdW1iZXIKKyAgICAgICAgaXMgYWxzbyAzMi1iaXQsIHNvIHdlIGNh biBwYWNrIGJvdGggaW4gbV9vcEluZm8gKHdoaWNoIGlzIDY0IGJpdHMpLgorCisgICAgICAgICog ZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjptYWtlRHluYW1p Y1Zhck9wSW5mbyk6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxv Y2spOgorICAgICAgICAqIGRmZy9ERkdOb2RlLmg6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6 Z2V0UHV0SW5mbyk6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6aGFzSGVhcFByZWRpY3Rpb24p OgorICAgICAgICAqIGRmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHA6CisKIDIw MTctMDgtMTcgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IHJlbW92ZSB1bnVzZWQgcHJpdmF0ZSBzdHJ1Y3QgZnJvbSBJbnNwZWN0b3JT Y3JpcHRQcm9maWxlckFnZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR0J5dGVDb2RlUGFyc2VyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0 ZUNvZGVQYXJzZXIuY3BwCmluZGV4IDVkZTdmM2EzY2NjMWJkN2UxNWI5Y2E0ZjJhYWYzMWJmZWQ3 ZTBiOWUuLjFiYjgxZTE2YTJmNWQ3NmQ2ODgwYjhjMjQyNTFhNjg1YjY4ZDcxYzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCkBAIC00MDY0 LDYgKzQwNjQsMTUgQEAgdm9pZCBCeXRlQ29kZVBhcnNlcjo6Y2xlYXJDYWNoZXMoKQogICAgIG1f Y29uc3RhbnRzLnNocmluaygwKTsKIH0KIAorLy8gQm90aCBHZXREeW5hbWljVmFyIGFuZCBQdXRE eW5hbWljVmFyIG5lZWQgdG8gY3JhbSB0d28gMzItYml0IG51bWJlcnMgaW50byB0aGVpcgorLy8g Zmlyc3Qgb3BJbmZvLgordWludDY0X3QgbWFrZUR5bmFtaWNWYXJPcEluZm8odW5zaWduZWQgaWRl bnRpZmllck51bWJlciwgdW5zaWduZWQgZ2V0UHV0SW5mbykKK3sKKyAgICBzdGF0aWNfYXNzZXJ0 KHNpemVvZihpZGVudGlmaWVyTnVtYmVyKSA9PSA0LAorICAgICAgICAiV2UgY2Fubm90IGZpdCBp ZGVudGlmaWVyTnVtYmVyIGludG8gdGhlIGhpZ2ggYml0cyBvZiBtX29wSW5mbyIpOworICAgIHJl dHVybiBpZGVudGlmaWVyTnVtYmVyIHwgKHN0YXRpY19jYXN0PHVpbnQ2NF90PihnZXRQdXRJbmZv KSA8PCAzMik7Cit9CisKIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQg bGltaXQpCiB7CiAgICAgYm9vbCBzaG91bGRDb250aW51ZVBhcnNpbmcgPSB0cnVlOwpAQCAtNTM2 MSw4ICs1MzcwLDEwIEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQg bGltaXQpCiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChuZWVkc0R5bmFtaWNMb29r dXAocmVzb2x2ZVR5cGUsIG9wX2dldF9mcm9tX3Njb3BlKSkgeworICAgICAgICAgICAgICAgIHVp bnQ2NF90IG9wSW5mbzEgPSBtYWtlRHluYW1pY1Zhck9wSW5mbyhpZGVudGlmaWVyTnVtYmVyLCBj dXJyZW50SW5zdHJ1Y3Rpb25bNF0udS5vcGVyYW5kKTsKKyAgICAgICAgICAgICAgICBTcGVjdWxh dGVkVHlwZSBwcmVkaWN0aW9uID0gZ2V0UHJlZGljdGlvbigpOwogICAgICAgICAgICAgICAgIHNl dChWaXJ0dWFsUmVnaXN0ZXIoZHN0KSwKLSAgICAgICAgICAgICAgICAgICAgYWRkVG9HcmFwaChH ZXREeW5hbWljVmFyLCBPcEluZm8oaWRlbnRpZmllck51bWJlciksIE9wSW5mbyhjdXJyZW50SW5z dHJ1Y3Rpb25bNF0udS5vcGVyYW5kKSwgZ2V0KFZpcnR1YWxSZWdpc3RlcihzY29wZSkpKSk7Cisg ICAgICAgICAgICAgICAgICAgIGFkZFRvR3JhcGgoR2V0RHluYW1pY1ZhciwgT3BJbmZvKG9wSW5m bzEpLCBPcEluZm8ocHJlZGljdGlvbiksIGdldChWaXJ0dWFsUmVnaXN0ZXIoc2NvcGUpKSkpOwog ICAgICAgICAgICAgICAgIE5FWFRfT1BDT0RFKG9wX2dldF9mcm9tX3Njb3BlKTsKICAgICAgICAg ICAgIH0KIApAQCAtNTUzMyw3ICs1NTQ0LDggQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VC bG9jayh1bnNpZ25lZCBsaW1pdCkKIAogICAgICAgICAgICAgaWYgKG5lZWRzRHluYW1pY0xvb2t1 cChyZXNvbHZlVHlwZSwgb3BfcHV0X3RvX3Njb3BlKSkgewogICAgICAgICAgICAgICAgIEFTU0VS VChpZGVudGlmaWVyTnVtYmVyICE9IFVJTlRfTUFYKTsKLSAgICAgICAgICAgICAgICBhZGRUb0dy YXBoKFB1dER5bmFtaWNWYXIsIE9wSW5mbyhpZGVudGlmaWVyTnVtYmVyKSwgT3BJbmZvKGN1cnJl bnRJbnN0cnVjdGlvbls0XS51Lm9wZXJhbmQpLCBnZXQoVmlydHVhbFJlZ2lzdGVyKHNjb3BlKSks IGdldChWaXJ0dWFsUmVnaXN0ZXIodmFsdWUpKSk7CisgICAgICAgICAgICAgICAgdWludDY0X3Qg b3BJbmZvMSA9IG1ha2VEeW5hbWljVmFyT3BJbmZvKGlkZW50aWZpZXJOdW1iZXIsIGN1cnJlbnRJ bnN0cnVjdGlvbls0XS51Lm9wZXJhbmQpOworICAgICAgICAgICAgICAgIGFkZFRvR3JhcGgoUHV0 RHluYW1pY1ZhciwgT3BJbmZvKG9wSW5mbzEpLCBPcEluZm8oKSwgZ2V0KFZpcnR1YWxSZWdpc3Rl cihzY29wZSkpLCBnZXQoVmlydHVhbFJlZ2lzdGVyKHZhbHVlKSkpOwogICAgICAgICAgICAgICAg IE5FWFRfT1BDT0RFKG9wX3B1dF90b19zY29wZSk7CiAgICAgICAgICAgICB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdOb2RlLmgKaW5kZXggMGYxOTFhMGI1ZWZmMTIyNDExMTE4NzBjMGM4MWM0 YzNmMWFjOWMwOC4uNjdkNTI0ZWRkMDIzMGFlMDA0ZjU5MDQ1ZThmNDlmNzRhOGExODUxOSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgKQEAgLTk3OCw3ICs5NzgsNyBAQCBwdWJsaWM6 CiAgICAgdW5zaWduZWQgZ2V0UHV0SW5mbygpCiAgICAgewogICAgICAgICBBU1NFUlQoaGFzR2V0 UHV0SW5mbygpKTsKLSAgICAgICAgcmV0dXJuIG1fb3BJbmZvMi5hczx1bnNpZ25lZD4oKTsKKyAg ICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PHVuc2lnbmVkPihtX29wSW5mby5hczx1aW50NjRfdD4o KSA+PiAzMik7CiAgICAgfQogCiAgICAgYm9vbCBoYXNBY2Nlc3NvckF0dHJpYnV0ZXMoKQpAQCAt MTUxOCw2ICsxNTE4LDcgQEAgcHVibGljOgogICAgICAgICBjYXNlIEF0b21pY3NTdG9yZToKICAg ICAgICAgY2FzZSBBdG9taWNzU3ViOgogICAgICAgICBjYXNlIEF0b21pY3NYb3I6CisgICAgICAg IGNhc2UgR2V0RHluYW1pY1ZhcjoKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICBk ZWZhdWx0OgogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHAgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlLmNwcApp bmRleCAyNTE0ZTk1Mjk1YzM2MGE0NjdiZTUwMGQzZjJjODJjNzI1ZjkxMGFiLi42Y2FjYjkwNDNj MjQ1MWJhMjE1MDg5ZWUzNjJhNmU1NzA2OGI0MDJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlLmNwcApA QCAtNzIwLDEzICs3MjAsMTMgQEAgcHJpdmF0ZToKICAgICAgICAgY2FzZSBMb2FkRnJvbUpTTWFw QnVja2V0OgogICAgICAgICBjYXNlIFRvTnVtYmVyOgogICAgICAgICBjYXNlIEdldEFyZ3VtZW50 OgotICAgICAgICBjYXNlIENhbGxET01HZXR0ZXI6IHsKKyAgICAgICAgY2FzZSBDYWxsRE9NR2V0 dGVyOgorICAgICAgICBjYXNlIEdldER5bmFtaWNWYXI6IHsKICAgICAgICAgICAgIHNldFByZWRp Y3Rpb24obV9jdXJyZW50Tm9kZS0+Z2V0SGVhcFByZWRpY3Rpb24oKSk7CiAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgfQogCi0gICAgICAgIGNhc2UgUmVzb2x2ZVNjb3BlRm9ySG9pc3RpbmdG dW5jRGVjbEluRXZhbDoKLSAgICAgICAgY2FzZSBHZXREeW5hbWljVmFyOiB7CisgICAgICAgIGNh c2UgUmVzb2x2ZVNjb3BlRm9ySG9pc3RpbmdGdW5jRGVjbEluRXZhbDogewogICAgICAgICAgICAg c2V0UHJlZGljdGlvbihTcGVjQnl0ZWNvZGVUb3ApOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0K 318621 2017-08-21 02:44:58 -0700 2017-08-23 09:54:36 -0700 new Patch bug-175738-20170821114456.patch text/plain 6197 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwOTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YTI1NzM5MmFhMjY1ZjEzZTA2NzhmNDQ3MGJkOTE0ZTk0ZDUzMTdjLi4xZGE4YmU2NDA4NzdlMTFj MDQyY2RmODA2OTQyZWUyMDAzNWU1OGMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNy0wOC0xOCAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIE1ha2UgR2V0RHluYW1pY1ZhciBwcm9wYWdhdGUgaGVhcCBwcmVkaWN0 aW9ucyBpbnN0ZWFkIG9mIHNheWluZyBIZWFwVG9wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzU3MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgaGVhcCBwcmVkaWN0aW9uIGFsd2F5cyBlbmQgdXAg aW4gbV9vcEluZm8yLiBCdXQgR2V0RHluYW1pY1ZhciB3YXMgYWxyZWFkeSBzdG9yaW5nIGdldFB1 dEluZm8gaW4gdGhlcmUuCisgICAgICAgIFNvIHdlIG1vdmUgdGhhdCBvbmUgaW50byBtX29wSW5m by4gV2UgY2FuIGRvIHRoaXMgYmVjYXVzZSBpdCBpcyAzMi1iaXQsIGFuZCB0aGUgYWxyZWFkeSBw cmVzZW50IGlkZW50aWZpZXJOdW1iZXIKKyAgICAgICAgaXMgYWxzbyAzMi1iaXQsIHNvIHdlIGNh biBwYWNrIGJvdGggaW4gbV9vcEluZm8gKHdoaWNoIGlzIDY0IGJpdHMpLgorCisgICAgICAgICog ZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjptYWtlRHluYW1p Y1Zhck9wSW5mbyk6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxv Y2spOgorICAgICAgICAqIGRmZy9ERkdOb2RlLmg6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6 Z2V0UHV0SW5mbyk6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6aGFzSGVhcFByZWRpY3Rpb24p OgorICAgICAgICAqIGRmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHA6CisKIDIw MTctMDgtMjAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEdhcmRl bmluZzogZml4IENMb29wIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R0J5dGVDb2RlUGFyc2VyLmNwcAppbmRleCA1ZGU3ZjNhM2NjYzFiZDdlMTViOWNhNGYyYWFmMzFi ZmVkN2UwYjllLi43M2E1ZjhhZDRiZWU1ZGI0OTkzN2JlNTQyMjBkNTZmNjdiNThmNjU2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcApAQCAt NDA2NCw2ICs0MDY0LDE1IEBAIHZvaWQgQnl0ZUNvZGVQYXJzZXI6OmNsZWFyQ2FjaGVzKCkKICAg ICBtX2NvbnN0YW50cy5zaHJpbmsoMCk7CiB9CiAKKy8vIFdlIGhhdmUgdGhlIHByb3RvdHlwZSBm aXJzdCB0byBhdm9pZCBhIHdhcm5pbmcgdGhhdCBvdGhlcndpc2UgbWFrZXMgdGhlIGJ1aWxkIGZh aWwuCit1aW50NjRfdCBtYWtlRHluYW1pY1Zhck9wSW5mbyh1bnNpZ25lZCwgdW5zaWduZWQpOwor dWludDY0X3QgbWFrZUR5bmFtaWNWYXJPcEluZm8odW5zaWduZWQgaWRlbnRpZmllck51bWJlciwg dW5zaWduZWQgZ2V0UHV0SW5mbykKK3sKKyAgICBzdGF0aWNfYXNzZXJ0KHNpemVvZihpZGVudGlm aWVyTnVtYmVyKSA9PSA0LAorICAgICAgICAiV2UgY2Fubm90IGZpdCBpZGVudGlmaWVyTnVtYmVy IGludG8gdGhlIGhpZ2ggYml0cyBvZiBtX29wSW5mbyIpOworICAgIHJldHVybiBzdGF0aWNfY2Fz dDx1aW50NjRfdD4oaWRlbnRpZmllck51bWJlcikgfCAoc3RhdGljX2Nhc3Q8dWludDY0X3Q+KGdl dFB1dEluZm8pIDw8IDMyKTsKK30KKwogYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayh1 bnNpZ25lZCBsaW1pdCkKIHsKICAgICBib29sIHNob3VsZENvbnRpbnVlUGFyc2luZyA9IHRydWU7 CkBAIC01MzYxLDggKzUzNzAsMTAgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayh1 bnNpZ25lZCBsaW1pdCkKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKG5lZWRzRHlu YW1pY0xvb2t1cChyZXNvbHZlVHlwZSwgb3BfZ2V0X2Zyb21fc2NvcGUpKSB7CisgICAgICAgICAg ICAgICAgdWludDY0X3Qgb3BJbmZvMSA9IG1ha2VEeW5hbWljVmFyT3BJbmZvKGlkZW50aWZpZXJO dW1iZXIsIGN1cnJlbnRJbnN0cnVjdGlvbls0XS51Lm9wZXJhbmQpOworICAgICAgICAgICAgICAg IFNwZWN1bGF0ZWRUeXBlIHByZWRpY3Rpb24gPSBnZXRQcmVkaWN0aW9uKCk7CiAgICAgICAgICAg ICAgICAgc2V0KFZpcnR1YWxSZWdpc3Rlcihkc3QpLAotICAgICAgICAgICAgICAgICAgICBhZGRU b0dyYXBoKEdldER5bmFtaWNWYXIsIE9wSW5mbyhpZGVudGlmaWVyTnVtYmVyKSwgT3BJbmZvKGN1 cnJlbnRJbnN0cnVjdGlvbls0XS51Lm9wZXJhbmQpLCBnZXQoVmlydHVhbFJlZ2lzdGVyKHNjb3Bl KSkpKTsKKyAgICAgICAgICAgICAgICAgICAgYWRkVG9HcmFwaChHZXREeW5hbWljVmFyLCBPcElu Zm8ob3BJbmZvMSksIE9wSW5mbyhwcmVkaWN0aW9uKSwgZ2V0KFZpcnR1YWxSZWdpc3RlcihzY29w ZSkpKSk7CiAgICAgICAgICAgICAgICAgTkVYVF9PUENPREUob3BfZ2V0X2Zyb21fc2NvcGUpOwog ICAgICAgICAgICAgfQogCkBAIC01NTMzLDcgKzU1NDQsOCBAQCBib29sIEJ5dGVDb2RlUGFyc2Vy OjpwYXJzZUJsb2NrKHVuc2lnbmVkIGxpbWl0KQogCiAgICAgICAgICAgICBpZiAobmVlZHNEeW5h bWljTG9va3VwKHJlc29sdmVUeXBlLCBvcF9wdXRfdG9fc2NvcGUpKSB7CiAgICAgICAgICAgICAg ICAgQVNTRVJUKGlkZW50aWZpZXJOdW1iZXIgIT0gVUlOVF9NQVgpOwotICAgICAgICAgICAgICAg IGFkZFRvR3JhcGgoUHV0RHluYW1pY1ZhciwgT3BJbmZvKGlkZW50aWZpZXJOdW1iZXIpLCBPcElu Zm8oY3VycmVudEluc3RydWN0aW9uWzRdLnUub3BlcmFuZCksIGdldChWaXJ0dWFsUmVnaXN0ZXIo c2NvcGUpKSwgZ2V0KFZpcnR1YWxSZWdpc3Rlcih2YWx1ZSkpKTsKKyAgICAgICAgICAgICAgICB1 aW50NjRfdCBvcEluZm8xID0gbWFrZUR5bmFtaWNWYXJPcEluZm8oaWRlbnRpZmllck51bWJlciwg Y3VycmVudEluc3RydWN0aW9uWzRdLnUub3BlcmFuZCk7CisgICAgICAgICAgICAgICAgYWRkVG9H cmFwaChQdXREeW5hbWljVmFyLCBPcEluZm8ob3BJbmZvMSksIE9wSW5mbygpLCBnZXQoVmlydHVh bFJlZ2lzdGVyKHNjb3BlKSksIGdldChWaXJ0dWFsUmVnaXN0ZXIodmFsdWUpKSk7CiAgICAgICAg ICAgICAgICAgTkVYVF9PUENPREUob3BfcHV0X3RvX3Njb3BlKTsKICAgICAgICAgICAgIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmggYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaAppbmRleCAwZjE5MWEwYjVlZmYxMjI0MTExMTg3 MGMwYzgxYzRjM2YxYWM5YzA4Li42N2Q1MjRlZGQwMjMwYWUwMDRmNTkwNDVlOGY0OWY3NGE4YTE4 NTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaApAQCAtOTc4LDcgKzk3OCw3IEBA IHB1YmxpYzoKICAgICB1bnNpZ25lZCBnZXRQdXRJbmZvKCkKICAgICB7CiAgICAgICAgIEFTU0VS VChoYXNHZXRQdXRJbmZvKCkpOwotICAgICAgICByZXR1cm4gbV9vcEluZm8yLmFzPHVuc2lnbmVk PigpOworICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG1fb3BJbmZvLmFzPHVp bnQ2NF90PigpID4+IDMyKTsKICAgICB9CiAKICAgICBib29sIGhhc0FjY2Vzc29yQXR0cmlidXRl cygpCkBAIC0xNTE4LDYgKzE1MTgsNyBAQCBwdWJsaWM6CiAgICAgICAgIGNhc2UgQXRvbWljc1N0 b3JlOgogICAgICAgICBjYXNlIEF0b21pY3NTdWI6CiAgICAgICAgIGNhc2UgQXRvbWljc1hvcjoK KyAgICAgICAgY2FzZSBHZXREeW5hbWljVmFyOgogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlLmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUHJlZGljdGlvblByb3BhZ2F0aW9uUGhh c2UuY3BwCmluZGV4IDI1MTRlOTUyOTVjMzYwYTQ2N2JlNTAwZDNmMmM4MmM3MjVmOTEwYWIuLjZj YWNiOTA0M2MyNDUxYmEyMTUwODllZTM2MmE2ZTU3MDY4YjQwMmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUHJlZGljdGlvblByb3BhZ2F0aW9uUGhhc2UuY3BwCisr KyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUHJlZGljdGlvblByb3BhZ2F0aW9uUGhh c2UuY3BwCkBAIC03MjAsMTMgKzcyMCwxMyBAQCBwcml2YXRlOgogICAgICAgICBjYXNlIExvYWRG cm9tSlNNYXBCdWNrZXQ6CiAgICAgICAgIGNhc2UgVG9OdW1iZXI6CiAgICAgICAgIGNhc2UgR2V0 QXJndW1lbnQ6Ci0gICAgICAgIGNhc2UgQ2FsbERPTUdldHRlcjogeworICAgICAgICBjYXNlIENh bGxET01HZXR0ZXI6CisgICAgICAgIGNhc2UgR2V0RHluYW1pY1ZhcjogewogICAgICAgICAgICAg c2V0UHJlZGljdGlvbihtX2N1cnJlbnROb2RlLT5nZXRIZWFwUHJlZGljdGlvbigpKTsKICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKLSAgICAgICAgY2FzZSBSZXNvbHZlU2NvcGVGb3JI b2lzdGluZ0Z1bmNEZWNsSW5FdmFsOgotICAgICAgICBjYXNlIEdldER5bmFtaWNWYXI6IHsKKyAg ICAgICAgY2FzZSBSZXNvbHZlU2NvcGVGb3JIb2lzdGluZ0Z1bmNEZWNsSW5FdmFsOiB7CiAgICAg ICAgICAgICBzZXRQcmVkaWN0aW9uKFNwZWNCeXRlY29kZVRvcCk7CiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0No YW5nZUxvZwppbmRleCBiYTlkMGYzNzk1MzQzZTkxOTYwOTc5Y2E5ODBiZTNkNDU5ZDM2ZTRjLi4x ODA3N2E4M2MyNTZmNTE3NGZkYzc3ZWUxMTg3ZTUyNWUyNjZlZjRiIDEwMDY0NAotLS0gYS9KU1Rl c3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy MDE3LTA4LTIxICBSb2JpbiBNb3Jpc3NldCAgPHJtb3Jpc3NldEBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIGEgbWljcm8tYmVuY2htYXJrIGZvciBjaGVja2luZyB0aGF0IGFjY2Vzc2luZyBhIHZh cmlhYmxlIHdpdGhpbiBhICd3aXRoJworICAgICAgICBibG9jayBkb2VzIG5vdCBhdXRvbWF0aWNh bGx5IHByZXZlbnQgdHlwZSBwcmVkaWN0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1NzM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3Mvd2l0aF9hbmRfYXJpdGguanM6IEFkZGVkLgor ICAgICAgICAod2l0aCk6CisKIDIwMTctMDgtMTggIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBh cHBsZS5jb20+CiAKICAgICAgICAgU2tpcCBmbGFreSBKU0MgdGVzdCBtaWNyb2JlbmNobWFya3Mv Z2VuZXJhdG9yLXdpdGgtc2V2ZXJhbC10eXBlcy5qcy4KZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3Ry ZXNzL3dpdGhfYW5kX2FyaXRoLmpzIGIvSlNUZXN0cy9zdHJlc3Mvd2l0aF9hbmRfYXJpdGguanMK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uODVjYmY5M2YyOWEzZjI4MDc3ZTcwMDNlMTdiN2RhMDc5ZmY0NjIyMgotLS0g L2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL3dpdGhfYW5kX2FyaXRoLmpzCkBAIC0wLDAg KzEsNiBAQAorZm9yICh2YXIgaSA9IDA7IGkgPCAxMDAwMDspIHsKKyAgICB2YXIgeCA9IDE7Cisg ICAgd2l0aCh7fSkgeworICAgICAgICBpICs9IHg7CisgICAgfQorfQo= 318879 2017-08-23 09:54:44 -0700 2017-08-23 10:41:56 -0700 Patch with static bug-175738-20170823185442.patch text/plain 6064 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwOTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YTI1NzM5MmFhMjY1ZjEzZTA2NzhmNDQ3MGJkOTE0ZTk0ZDUzMTdjLi4xZGE4YmU2NDA4NzdlMTFj MDQyY2RmODA2OTQyZWUyMDAzNWU1OGMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNy0wOC0xOCAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIE1ha2UgR2V0RHluYW1pY1ZhciBwcm9wYWdhdGUgaGVhcCBwcmVkaWN0 aW9ucyBpbnN0ZWFkIG9mIHNheWluZyBIZWFwVG9wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzU3MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgaGVhcCBwcmVkaWN0aW9uIGFsd2F5cyBlbmQgdXAg aW4gbV9vcEluZm8yLiBCdXQgR2V0RHluYW1pY1ZhciB3YXMgYWxyZWFkeSBzdG9yaW5nIGdldFB1 dEluZm8gaW4gdGhlcmUuCisgICAgICAgIFNvIHdlIG1vdmUgdGhhdCBvbmUgaW50byBtX29wSW5m by4gV2UgY2FuIGRvIHRoaXMgYmVjYXVzZSBpdCBpcyAzMi1iaXQsIGFuZCB0aGUgYWxyZWFkeSBw cmVzZW50IGlkZW50aWZpZXJOdW1iZXIKKyAgICAgICAgaXMgYWxzbyAzMi1iaXQsIHNvIHdlIGNh biBwYWNrIGJvdGggaW4gbV9vcEluZm8gKHdoaWNoIGlzIDY0IGJpdHMpLgorCisgICAgICAgICog ZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjptYWtlRHluYW1p Y1Zhck9wSW5mbyk6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxv Y2spOgorICAgICAgICAqIGRmZy9ERkdOb2RlLmg6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6 Z2V0UHV0SW5mbyk6CisgICAgICAgIChKU0M6OkRGRzo6Tm9kZTo6aGFzSGVhcFByZWRpY3Rpb24p OgorICAgICAgICAqIGRmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHA6CisKIDIw MTctMDgtMjAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEdhcmRl bmluZzogZml4IENMb29wIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R0J5dGVDb2RlUGFyc2VyLmNwcAppbmRleCA1ZGU3ZjNhM2NjYzFiZDdlMTViOWNhNGYyYWFmMzFi ZmVkN2UwYjllLi5iNGQ2ZWQxZGJiZTQwOTkyYTQ0NTNlZDg1MDY3MDAzOTg0MWYzZTUxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcApAQCAt NDA2NCw2ICs0MDY0LDEzIEBAIHZvaWQgQnl0ZUNvZGVQYXJzZXI6OmNsZWFyQ2FjaGVzKCkKICAg ICBtX2NvbnN0YW50cy5zaHJpbmsoMCk7CiB9CiAKK3N0YXRpYyB1aW50NjRfdCBtYWtlRHluYW1p Y1Zhck9wSW5mbyh1bnNpZ25lZCBpZGVudGlmaWVyTnVtYmVyLCB1bnNpZ25lZCBnZXRQdXRJbmZv KQoreworICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKGlkZW50aWZpZXJOdW1iZXIpID09IDQsCisg ICAgICAgICJXZSBjYW5ub3QgZml0IGlkZW50aWZpZXJOdW1iZXIgaW50byB0aGUgaGlnaCBiaXRz IG9mIG1fb3BJbmZvIik7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PHVpbnQ2NF90PihpZGVudGlm aWVyTnVtYmVyKSB8IChzdGF0aWNfY2FzdDx1aW50NjRfdD4oZ2V0UHV0SW5mbykgPDwgMzIpOwor fQorCiBib29sIEJ5dGVDb2RlUGFyc2VyOjpwYXJzZUJsb2NrKHVuc2lnbmVkIGxpbWl0KQogewog ICAgIGJvb2wgc2hvdWxkQ29udGludWVQYXJzaW5nID0gdHJ1ZTsKQEAgLTUzNjEsOCArNTM2OCwx MCBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpwYXJzZUJsb2NrKHVuc2lnbmVkIGxpbWl0KQogICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAobmVlZHNEeW5hbWljTG9va3VwKHJlc29sdmVU eXBlLCBvcF9nZXRfZnJvbV9zY29wZSkpIHsKKyAgICAgICAgICAgICAgICB1aW50NjRfdCBvcElu Zm8xID0gbWFrZUR5bmFtaWNWYXJPcEluZm8oaWRlbnRpZmllck51bWJlciwgY3VycmVudEluc3Ry dWN0aW9uWzRdLnUub3BlcmFuZCk7CisgICAgICAgICAgICAgICAgU3BlY3VsYXRlZFR5cGUgcHJl ZGljdGlvbiA9IGdldFByZWRpY3Rpb24oKTsKICAgICAgICAgICAgICAgICBzZXQoVmlydHVhbFJl Z2lzdGVyKGRzdCksCi0gICAgICAgICAgICAgICAgICAgIGFkZFRvR3JhcGgoR2V0RHluYW1pY1Zh ciwgT3BJbmZvKGlkZW50aWZpZXJOdW1iZXIpLCBPcEluZm8oY3VycmVudEluc3RydWN0aW9uWzRd LnUub3BlcmFuZCksIGdldChWaXJ0dWFsUmVnaXN0ZXIoc2NvcGUpKSkpOworICAgICAgICAgICAg ICAgICAgICBhZGRUb0dyYXBoKEdldER5bmFtaWNWYXIsIE9wSW5mbyhvcEluZm8xKSwgT3BJbmZv KHByZWRpY3Rpb24pLCBnZXQoVmlydHVhbFJlZ2lzdGVyKHNjb3BlKSkpKTsKICAgICAgICAgICAg ICAgICBORVhUX09QQ09ERShvcF9nZXRfZnJvbV9zY29wZSk7CiAgICAgICAgICAgICB9CiAKQEAg LTU1MzMsNyArNTU0Miw4IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWdu ZWQgbGltaXQpCiAKICAgICAgICAgICAgIGlmIChuZWVkc0R5bmFtaWNMb29rdXAocmVzb2x2ZVR5 cGUsIG9wX3B1dF90b19zY29wZSkpIHsKICAgICAgICAgICAgICAgICBBU1NFUlQoaWRlbnRpZmll ck51bWJlciAhPSBVSU5UX01BWCk7Ci0gICAgICAgICAgICAgICAgYWRkVG9HcmFwaChQdXREeW5h bWljVmFyLCBPcEluZm8oaWRlbnRpZmllck51bWJlciksIE9wSW5mbyhjdXJyZW50SW5zdHJ1Y3Rp b25bNF0udS5vcGVyYW5kKSwgZ2V0KFZpcnR1YWxSZWdpc3RlcihzY29wZSkpLCBnZXQoVmlydHVh bFJlZ2lzdGVyKHZhbHVlKSkpOworICAgICAgICAgICAgICAgIHVpbnQ2NF90IG9wSW5mbzEgPSBt YWtlRHluYW1pY1Zhck9wSW5mbyhpZGVudGlmaWVyTnVtYmVyLCBjdXJyZW50SW5zdHJ1Y3Rpb25b NF0udS5vcGVyYW5kKTsKKyAgICAgICAgICAgICAgICBhZGRUb0dyYXBoKFB1dER5bmFtaWNWYXIs IE9wSW5mbyhvcEluZm8xKSwgT3BJbmZvKCksIGdldChWaXJ0dWFsUmVnaXN0ZXIoc2NvcGUpKSwg Z2V0KFZpcnR1YWxSZWdpc3Rlcih2YWx1ZSkpKTsKICAgICAgICAgICAgICAgICBORVhUX09QQ09E RShvcF9wdXRfdG9fc2NvcGUpOwogICAgICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHTm9kZS5oCmluZGV4IDBmMTkxYTBiNWVmZjEyMjQxMTExODcwYzBjODFjNGMzZjFhYzljMDgu LjY3ZDUyNGVkZDAyMzBhZTAwNGY1OTA0NWU4ZjQ5Zjc0YThhMTg1MTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHTm9kZS5oCkBAIC05NzgsNyArOTc4LDcgQEAgcHVibGljOgogICAgIHVuc2ln bmVkIGdldFB1dEluZm8oKQogICAgIHsKICAgICAgICAgQVNTRVJUKGhhc0dldFB1dEluZm8oKSk7 Ci0gICAgICAgIHJldHVybiBtX29wSW5mbzIuYXM8dW5zaWduZWQ+KCk7CisgICAgICAgIHJldHVy biBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obV9vcEluZm8uYXM8dWludDY0X3Q+KCkgPj4gMzIpOwog ICAgIH0KIAogICAgIGJvb2wgaGFzQWNjZXNzb3JBdHRyaWJ1dGVzKCkKQEAgLTE1MTgsNiArMTUx OCw3IEBAIHB1YmxpYzoKICAgICAgICAgY2FzZSBBdG9taWNzU3RvcmU6CiAgICAgICAgIGNhc2Ug QXRvbWljc1N1YjoKICAgICAgICAgY2FzZSBBdG9taWNzWG9yOgorICAgICAgICBjYXNlIEdldER5 bmFtaWNWYXI6CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgZGVmYXVsdDoKICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHUHJlZGljdGlvblByb3BhZ2F0aW9uUGhhc2UuY3BwIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHAKaW5kZXggMjUxNGU5 NTI5NWMzNjBhNDY3YmU1MDBkM2YyYzgyYzcyNWY5MTBhYi4uNmNhY2I5MDQzYzI0NTFiYTIxNTA4 OWVlMzYyYTZlNTcwNjhiNDAyYiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHAKQEAgLTcyMCwxMyAr NzIwLDEzIEBAIHByaXZhdGU6CiAgICAgICAgIGNhc2UgTG9hZEZyb21KU01hcEJ1Y2tldDoKICAg ICAgICAgY2FzZSBUb051bWJlcjoKICAgICAgICAgY2FzZSBHZXRBcmd1bWVudDoKLSAgICAgICAg Y2FzZSBDYWxsRE9NR2V0dGVyOiB7CisgICAgICAgIGNhc2UgQ2FsbERPTUdldHRlcjoKKyAgICAg ICAgY2FzZSBHZXREeW5hbWljVmFyOiB7CiAgICAgICAgICAgICBzZXRQcmVkaWN0aW9uKG1fY3Vy cmVudE5vZGUtPmdldEhlYXBQcmVkaWN0aW9uKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KIAotICAgICAgICBjYXNlIFJlc29sdmVTY29wZUZvckhvaXN0aW5nRnVuY0RlY2xJbkV2 YWw6Ci0gICAgICAgIGNhc2UgR2V0RHluYW1pY1ZhcjogeworICAgICAgICBjYXNlIFJlc29sdmVT Y29wZUZvckhvaXN0aW5nRnVuY0RlY2xJbkV2YWw6IHsKICAgICAgICAgICAgIHNldFByZWRpY3Rp b24oU3BlY0J5dGVjb2RlVG9wKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CmRpZmYg LS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGJhOWQw ZjM3OTUzNDNlOTE5NjA5NzljYTk4MGJlM2Q0NTlkMzZlNGMuLjE4MDc3YTgzYzI1NmY1MTc0ZmRj NzdlZTExODdlNTI1ZTI2NmVmNGIgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBi L0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTctMDgtMjEgIFJvYmluIE1v cmlzc2V0ICA8cm1vcmlzc2V0QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBtaWNyby1iZW5j aG1hcmsgZm9yIGNoZWNraW5nIHRoYXQgYWNjZXNzaW5nIGEgdmFyaWFibGUgd2l0aGluIGEgJ3dp dGgnCisgICAgICAgIGJsb2NrIGRvZXMgbm90IGF1dG9tYXRpY2FsbHkgcHJldmVudCB0eXBlIHBy ZWRpY3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzU3MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHN0cmVzcy93aXRoX2FuZF9hcml0aC5qczogQWRkZWQuCisgICAgICAgICh3aXRoKToKKwog MjAxNy0wOC0xOCAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAg ICBTa2lwIGZsYWt5IEpTQyB0ZXN0IG1pY3JvYmVuY2htYXJrcy9nZW5lcmF0b3Itd2l0aC1zZXZl cmFsLXR5cGVzLmpzLgpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3Mvd2l0aF9hbmRfYXJpdGgu anMgYi9KU1Rlc3RzL3N0cmVzcy93aXRoX2FuZF9hcml0aC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44NWNiZjkz ZjI5YTNmMjgwNzdlNzAwM2UxN2I3ZGEwNzlmZjQ2MjIyCi0tLSAvZGV2L251bGwKKysrIGIvSlNU ZXN0cy9zdHJlc3Mvd2l0aF9hbmRfYXJpdGguanMKQEAgLTAsMCArMSw2IEBACitmb3IgKHZhciBp ID0gMDsgaSA8IDEwMDAwOykgeworICAgIHZhciB4ID0gMTsKKyAgICB3aXRoKHt9KSB7CisgICAg ICAgIGkgKz0geDsKKyAgICB9Cit9Cg==