152017 2015-12-08 15:11:53 -0800 DFG and FTL should be resilient against cases where both snippet operands are constant. 2015-12-08 16:14:11 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam benjamin fpizlo ggaren keith_miller msaboff saam webkit-bug-importer oldest_to_newest 1147490 0 mark.lam 2015-12-08 15:11:53 -0800 Patch coming. 1147491 1 webkit-bug-importer 2015-12-08 15:13:11 -0800 <rdar://problem/23811053> 1147497 2 266946 mark.lam 2015-12-08 15:29:28 -0800 Created attachment 266946 proposed patch. 1147516 3 266946 msaboff 2015-12-08 16:07:05 -0800 Comment on attachment 266946 proposed patch. r=me 1147518 4 mark.lam 2015-12-08 16:14:11 -0800 Thanks for the review. Landed in r193793: <http://trac.webkit.org/r193793>. 266946 2015-12-08 15:29:28 -0800 2015-12-08 16:07:05 -0800 proposed patch. bug-152017.patch text/plain 9993 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTkzNzg4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDE1LTEyLTA4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBE RkcgYW5kIEZUTCBzaG91bGQgYmUgcmVzaWxpZW50IGFnYWluc3QgY2FzZXMgd2hlcmUgYm90aCBz bmlwcGV0IG9wZXJhbmRzIGFyZSBjb25zdGFudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjAxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoZSBERkcgZnJvbnQgZW5kIG1heSBub3QgYWx3YXlzIGNv bnN0YW50IGZvbGQgY2FzZXMgd2hlcmUgYm90aCBvcGVyYW5kcyBhcmUKKyAgICAgICAgY29uc3Rh bnQuICBBcyBhIHJlc3VsdCwgdGhlIERGRyBhbmQgRlRMIGJhY2sgZW5kcyBuZWVkcyB0byBiZSBy ZXNpbGllbnQgYWdhaW5zdAorICAgICAgICB0aGlzIHdoZW4gdXNpbmcgc25pcHBldCBnZW5lcmF0 b3JzIHNpbmNlIHRoZSBnZW5lcmF0b3JzIGRvIG5vdCBzdXBwb3J0IHRoZSBjYXNlCisgICAgICAg IHdoZXJlIGJvdGggb3BlcmFuZHMgYXJlIGNvbnN0YW50LiAgVGhlIHN0cmF0ZWd5IGZvciBoYW5k bGluZyB0aGlzIDIgY29uc3Qgb3BlcmFuZHMKKyAgICAgICAgY2FzZSBpcyB0byB0cmVhdCBhdCBs ZWFzdCBvbmUgb2YgdGhlbSBhcyBhIHZhcmlhYmxlIGlmIGJvdGggYXJlIGNvbnN0YW50LiAKKwor ICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6 U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVWYWx1ZUFkZCk6CisgICAgICAgIC0gQWxzbyByZW1vdmUg dGhlIGNhc2UgZm9yIGZvbGRpbmcgMiBjb25zdGFudCBvcGVyYW5kcy4gIEl0IGlzIHRoZSBmcm9u dCBlbmQncworICAgICAgICAgIGpvYiB0byBkbyBzbywgbm90IHRoZSBiYWNrIGVuZCBoZXJlLgor CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVBcml0aFN1Yik6Cisg ICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVBcml0aE11bCk6CisgICAg ICAgICogZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpERkc6 Okxvd2VyREZHVG9MTFZNOjpjb21waWxlVmFsdWVBZGQpOgorICAgICAgICAoSlNDOjpGVEw6OkRG Rzo6TG93ZXJERkdUb0xMVk06OmNvbXBpbGVBcml0aE11bCk6CisKIDIwMTUtMTItMDggIE1hcmsg TGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFNuaXBwZWZ5IHNoaWZ0IG9wZXJh dG9ycyBmb3IgdGhlIGJhc2VsaW5lIEpJVC4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCShyZXZpc2lvbiAxOTM3ODgpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjc4OCw5ICsyNzg4LDEyIEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVJbnN0 YW5jZU9mKE4KIAogdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZVZhbHVlQWRkKE5vZGUqIG5v ZGUpCiB7Ci0gICAgaWYgKGlzS25vd25Ob3ROdW1iZXIobm9kZS0+Y2hpbGQxKCkubm9kZSgpKSB8 fCBpc0tub3duTm90TnVtYmVyKG5vZGUtPmNoaWxkMigpLm5vZGUoKSkpIHsKLSAgICAgICAgSlNW YWx1ZU9wZXJhbmQgbGVmdCh0aGlzLCBub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgIEpTVmFsdWVP cGVyYW5kIHJpZ2h0KHRoaXMsIG5vZGUtPmNoaWxkMigpKTsKKyAgICBFZGdlJiBsZWZ0Q2hpbGQg PSBub2RlLT5jaGlsZDEoKTsKKyAgICBFZGdlJiByaWdodENoaWxkID0gbm9kZS0+Y2hpbGQyKCk7 CisKKyAgICBpZiAoaXNLbm93bk5vdE51bWJlcihsZWZ0Q2hpbGQubm9kZSgpKSB8fCBpc0tub3du Tm90TnVtYmVyKHJpZ2h0Q2hpbGQubm9kZSgpKSkgeworICAgICAgICBKU1ZhbHVlT3BlcmFuZCBs ZWZ0KHRoaXMsIGxlZnRDaGlsZCk7CisgICAgICAgIEpTVmFsdWVPcGVyYW5kIHJpZ2h0KHRoaXMs IHJpZ2h0Q2hpbGQpOwogICAgICAgICBKU1ZhbHVlUmVncyBsZWZ0UmVncyA9IGxlZnQuanNWYWx1 ZVJlZ3MoKTsKICAgICAgICAgSlNWYWx1ZVJlZ3MgcmlnaHRSZWdzID0gcmlnaHQuanNWYWx1ZVJl Z3MoKTsKICNpZiBVU0UoSlNWQUxVRTY0KQpAQCAtMjgwOSwyNyArMjgxMiw2IEBAIHZvaWQgU3Bl Y3VsYXRpdmVKSVQ6OmNvbXBpbGVWYWx1ZUFkZChOb2QKICAgICAgICAgcmV0dXJuOwogICAgIH0K IAotICAgIGJvb2wgbGVmdElzQ29uc3RJbnQzMiA9IG5vZGUtPmNoaWxkMSgpLT5pc0ludDMyQ29u c3RhbnQoKTsKLSAgICBib29sIHJpZ2h0SXNDb25zdEludDMyID0gbm9kZS0+Y2hpbGQyKCktPmlz SW50MzJDb25zdGFudCgpOwotCi0gICAgLy8gVGhlIERGRyBkb2VzIG5vdCBhbHdheXMgZm9sZCB0 aGUgc3VtIG9mIDIgY29uc3RhbnQgaW50IG9wZXJhbmRzIHRvZ2V0aGVyLgotICAgIGlmIChsZWZ0 SXNDb25zdEludDMyICYmIHJpZ2h0SXNDb25zdEludDMyKSB7Ci0jaWYgVVNFKEpTVkFMVUU2NCkK LSAgICAgICAgR1BSVGVtcG9yYXJ5IHJlc3VsdCh0aGlzKTsKLSAgICAgICAgSlNWYWx1ZVJlZ3Mg cmVzdWx0UmVncyA9IEpTVmFsdWVSZWdzKHJlc3VsdC5ncHIoKSk7Ci0jZWxzZQotICAgICAgICBH UFJUZW1wb3JhcnkgcmVzdWx0VGFnKHRoaXMpOwotICAgICAgICBHUFJUZW1wb3JhcnkgcmVzdWx0 UGF5bG9hZCh0aGlzKTsKLSAgICAgICAgSlNWYWx1ZVJlZ3MgcmVzdWx0UmVncyA9IEpTVmFsdWVS ZWdzKHJlc3VsdFBheWxvYWQuZ3ByKCksIHJlc3VsdFRhZy5ncHIoKSk7Ci0jZW5kaWYKLSAgICAg ICAgaW50NjRfdCBsZWZ0Q29uc3QgPSBub2RlLT5jaGlsZDEoKS0+YXNJbnQzMigpOwotICAgICAg ICBpbnQ2NF90IHJpZ2h0Q29uc3QgPSBub2RlLT5jaGlsZDIoKS0+YXNJbnQzMigpOwotICAgICAg ICBpbnQ2NF90IHJlc3VsdENvbnN0ID0gbGVmdENvbnN0ICsgcmlnaHRDb25zdDsKLSAgICAgICAg bV9qaXQubW92ZVZhbHVlKEpTVmFsdWUocmVzdWx0Q29uc3QpLCByZXN1bHRSZWdzKTsKLSAgICAg ICAganNWYWx1ZVJlc3VsdChyZXN1bHRSZWdzLCBub2RlKTsKLSAgICAgICAgcmV0dXJuOwotICAg IH0KLQogICAgIE9wdGlvbmFsPEpTVmFsdWVPcGVyYW5kPiBsZWZ0OwogICAgIE9wdGlvbmFsPEpT VmFsdWVPcGVyYW5kPiByaWdodDsKIApAQCAtMjg1NiwyMiArMjgzOCwyNCBAQCB2b2lkIFNwZWN1 bGF0aXZlSklUOjpjb21waWxlVmFsdWVBZGQoTm9kCiAgICAgRlBSUmVnIHNjcmF0Y2hGUFIgPSBm cHJTY3JhdGNoLmZwcigpOwogI2VuZGlmCiAKLSAgICBTbmlwcGV0T3BlcmFuZCBsZWZ0T3BlcmFu ZChtX3N0YXRlLmZvck5vZGUobm9kZS0+Y2hpbGQxKCkpLnJlc3VsdFR5cGUoKSk7Ci0gICAgU25p cHBldE9wZXJhbmQgcmlnaHRPcGVyYW5kKG1fc3RhdGUuZm9yTm9kZShub2RlLT5jaGlsZDIoKSku cmVzdWx0VHlwZSgpKTsKKyAgICBTbmlwcGV0T3BlcmFuZCBsZWZ0T3BlcmFuZChtX3N0YXRlLmZv ck5vZGUobGVmdENoaWxkKS5yZXN1bHRUeXBlKCkpOworICAgIFNuaXBwZXRPcGVyYW5kIHJpZ2h0 T3BlcmFuZChtX3N0YXRlLmZvck5vZGUocmlnaHRDaGlsZCkucmVzdWx0VHlwZSgpKTsKIAotICAg IGlmIChsZWZ0SXNDb25zdEludDMyKQotICAgICAgICBsZWZ0T3BlcmFuZC5zZXRDb25zdEludDMy KG5vZGUtPmNoaWxkMSgpLT5hc0ludDMyKCkpOwotICAgIGlmIChyaWdodElzQ29uc3RJbnQzMikK LSAgICAgICAgcmlnaHRPcGVyYW5kLnNldENvbnN0SW50MzIobm9kZS0+Y2hpbGQyKCktPmFzSW50 MzIoKSk7CisgICAgLy8gVGhlIHNuaXBwZXQgZ2VuZXJhdG9yIGRvZXMgbm90IHN1cHBvcnQgYm90 aCBvcGVyYW5kcyBiZWluZyBjb25zdGFudC4gSWYgdGhlIGxlZnQKKyAgICAvLyBvcGVyYW5kIGlz IGFscmVhZHkgY29uc3QsIHdlJ2xsIGlnbm9yZSB0aGUgcmlnaHQgb3BlcmFuZCdzIGNvbnN0bmVz cy4KKyAgICBpZiAobGVmdENoaWxkLT5pc0ludDMyQ29uc3RhbnQoKSkKKyAgICAgICAgbGVmdE9w ZXJhbmQuc2V0Q29uc3RJbnQzMihsZWZ0Q2hpbGQtPmFzSW50MzIoKSk7CisgICAgZWxzZSBpZiAo cmlnaHRDaGlsZC0+aXNJbnQzMkNvbnN0YW50KCkpCisgICAgICAgIHJpZ2h0T3BlcmFuZC5zZXRD b25zdEludDMyKHJpZ2h0Q2hpbGQtPmFzSW50MzIoKSk7CiAKICAgICBBU1NFUlQoIWxlZnRPcGVy YW5kLmlzQ29uc3QoKSB8fCAhcmlnaHRPcGVyYW5kLmlzQ29uc3QoKSk7CiAKICAgICBpZiAoIWxl ZnRPcGVyYW5kLmlzQ29uc3QoKSkgewotICAgICAgICBsZWZ0ID0gSlNWYWx1ZU9wZXJhbmQodGhp cywgbm9kZS0+Y2hpbGQxKCkpOworICAgICAgICBsZWZ0ID0gSlNWYWx1ZU9wZXJhbmQodGhpcywg bGVmdENoaWxkKTsKICAgICAgICAgbGVmdFJlZ3MgPSBsZWZ0LT5qc1ZhbHVlUmVncygpOwogICAg IH0KICAgICBpZiAoIXJpZ2h0T3BlcmFuZC5pc0NvbnN0KCkpIHsKLSAgICAgICAgcmlnaHQgPSBK U1ZhbHVlT3BlcmFuZCh0aGlzLCBub2RlLT5jaGlsZDIoKSk7CisgICAgICAgIHJpZ2h0ID0gSlNW YWx1ZU9wZXJhbmQodGhpcywgcmlnaHRDaGlsZCk7CiAgICAgICAgIHJpZ2h0UmVncyA9IHJpZ2h0 LT5qc1ZhbHVlUmVncygpOwogICAgIH0KIApAQCAtMjg4NiwxNCArMjg3MCwxMiBAQCB2b2lkIFNw ZWN1bGF0aXZlSklUOjpjb21waWxlVmFsdWVBZGQoTm9kCiAKICAgICBzaWxlbnRTcGlsbEFsbFJl Z2lzdGVycyhyZXN1bHRSZWdzKTsKIAotICAgIGlmIChsZWZ0SXNDb25zdEludDMyKSB7CisgICAg aWYgKGxlZnRPcGVyYW5kLmlzQ29uc3QoKSkgewogICAgICAgICBsZWZ0UmVncyA9IHJlc3VsdFJl Z3M7Ci0gICAgICAgIGludDY0X3QgbGVmdENvbnN0ID0gbm9kZS0+Y2hpbGQxKCktPmFzSW50MzIo KTsKLSAgICAgICAgbV9qaXQubW92ZVZhbHVlKEpTVmFsdWUobGVmdENvbnN0KSwgbGVmdFJlZ3Mp OwotICAgIH0gZWxzZSBpZiAocmlnaHRJc0NvbnN0SW50MzIpIHsKKyAgICAgICAgbV9qaXQubW92 ZVZhbHVlKGxlZnRDaGlsZC0+YXNKU1ZhbHVlKCksIGxlZnRSZWdzKTsKKyAgICB9IGVsc2UgaWYg KHJpZ2h0T3BlcmFuZC5pc0NvbnN0KCkpIHsKICAgICAgICAgcmlnaHRSZWdzID0gcmVzdWx0UmVn czsKLSAgICAgICAgaW50NjRfdCByaWdodENvbnN0ID0gbm9kZS0+Y2hpbGQyKCktPmFzSW50MzIo KTsKLSAgICAgICAgbV9qaXQubW92ZVZhbHVlKEpTVmFsdWUocmlnaHRDb25zdCksIHJpZ2h0UmVn cyk7CisgICAgICAgIG1faml0Lm1vdmVWYWx1ZShyaWdodENoaWxkLT5hc0pTVmFsdWUoKSwgcmln aHRSZWdzKTsKICAgICB9CiAKICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvblZhbHVlQWRkLCBy ZXN1bHRSZWdzLCBsZWZ0UmVncywgcmlnaHRSZWdzKTsKQEAgLTMyMDksOCArMzE5MSwxMSBAQCB2 b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlQXJpdGhTdWIoTm9kCiAgICAgfQogCiAgICAgY2Fz ZSBVbnR5cGVkVXNlOiB7Ci0gICAgICAgIEpTVmFsdWVPcGVyYW5kIGxlZnQodGhpcywgbm9kZS0+ Y2hpbGQxKCkpOwotICAgICAgICBKU1ZhbHVlT3BlcmFuZCByaWdodCh0aGlzLCBub2RlLT5jaGls ZDIoKSk7CisgICAgICAgIEVkZ2UmIGxlZnRDaGlsZCA9IG5vZGUtPmNoaWxkMSgpOworICAgICAg ICBFZGdlJiByaWdodENoaWxkID0gbm9kZS0+Y2hpbGQyKCk7CisKKyAgICAgICAgSlNWYWx1ZU9w ZXJhbmQgbGVmdCh0aGlzLCBsZWZ0Q2hpbGQpOworICAgICAgICBKU1ZhbHVlT3BlcmFuZCByaWdo dCh0aGlzLCByaWdodENoaWxkKTsKIAogICAgICAgICBKU1ZhbHVlUmVncyBsZWZ0UmVncyA9IGxl ZnQuanNWYWx1ZVJlZ3MoKTsKICAgICAgICAgSlNWYWx1ZVJlZ3MgcmlnaHRSZWdzID0gcmlnaHQu anNWYWx1ZVJlZ3MoKTsKQEAgLTMyMzUsOCArMzIyMCw4IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6 OmNvbXBpbGVBcml0aFN1YihOb2QKICAgICAgICAgRlBSUmVnIHNjcmF0Y2hGUFIgPSBmcHJTY3Jh dGNoLmZwcigpOwogI2VuZGlmCiAKLSAgICAgICAgU25pcHBldE9wZXJhbmQgbGVmdE9wZXJhbmQo bV9zdGF0ZS5mb3JOb2RlKG5vZGUtPmNoaWxkMSgpKS5yZXN1bHRUeXBlKCkpOwotICAgICAgICBT bmlwcGV0T3BlcmFuZCByaWdodE9wZXJhbmQobV9zdGF0ZS5mb3JOb2RlKG5vZGUtPmNoaWxkMigp KS5yZXN1bHRUeXBlKCkpOworICAgICAgICBTbmlwcGV0T3BlcmFuZCBsZWZ0T3BlcmFuZChtX3N0 YXRlLmZvck5vZGUobGVmdENoaWxkKS5yZXN1bHRUeXBlKCkpOworICAgICAgICBTbmlwcGV0T3Bl cmFuZCByaWdodE9wZXJhbmQobV9zdGF0ZS5mb3JOb2RlKHJpZ2h0Q2hpbGQpLnJlc3VsdFR5cGUo KSk7CiAKICAgICAgICAgSklUU3ViR2VuZXJhdG9yIGdlbihsZWZ0T3BlcmFuZCwgcmlnaHRPcGVy YW5kLCByZXN1bHRSZWdzLCBsZWZ0UmVncywgcmlnaHRSZWdzLAogICAgICAgICAgICAgbGVmdEZQ UiwgcmlnaHRGUFIsIHNjcmF0Y2hHUFIsIHNjcmF0Y2hGUFIpOwpAQCAtMzUwMSwxMiArMzQ4Niwx NCBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlQXJpdGhNdWwoTm9kCiAgICAgICAgIFNu aXBwZXRPcGVyYW5kIGxlZnRPcGVyYW5kKG1fc3RhdGUuZm9yTm9kZShsZWZ0Q2hpbGQpLnJlc3Vs dFR5cGUoKSk7CiAgICAgICAgIFNuaXBwZXRPcGVyYW5kIHJpZ2h0T3BlcmFuZChtX3N0YXRlLmZv ck5vZGUocmlnaHRDaGlsZCkucmVzdWx0VHlwZSgpKTsKIAorICAgICAgICAvLyBUaGUgc25pcHBl dCBnZW5lcmF0b3IgZG9lcyBub3Qgc3VwcG9ydCBib3RoIG9wZXJhbmRzIGJlaW5nIGNvbnN0YW50 LiBJZiB0aGUgbGVmdAorICAgICAgICAvLyBvcGVyYW5kIGlzIGFscmVhZHkgY29uc3QsIHdlJ2xs IGlnbm9yZSB0aGUgcmlnaHQgb3BlcmFuZCdzIGNvbnN0bmVzcy4KICAgICAgICAgaWYgKGxlZnRD aGlsZC0+aXNJbnQzMkNvbnN0YW50KCkpCiAgICAgICAgICAgICBsZWZ0T3BlcmFuZC5zZXRDb25z dEludDMyKGxlZnRDaGlsZC0+YXNJbnQzMigpKTsKLSAgICAgICAgaWYgKHJpZ2h0Q2hpbGQtPmlz SW50MzJDb25zdGFudCgpKQorICAgICAgICBlbHNlIGlmIChyaWdodENoaWxkLT5pc0ludDMyQ29u c3RhbnQoKSkKICAgICAgICAgICAgIHJpZ2h0T3BlcmFuZC5zZXRDb25zdEludDMyKHJpZ2h0Q2hp bGQtPmFzSW50MzIoKSk7CiAKLSAgICAgICAgUkVMRUFTRV9BU1NFUlQoIWxlZnRPcGVyYW5kLmlz Q29uc3QoKSB8fCAhcmlnaHRPcGVyYW5kLmlzQ29uc3QoKSk7CisgICAgICAgIEFTU0VSVCghbGVm dE9wZXJhbmQuaXNDb25zdCgpIHx8ICFyaWdodE9wZXJhbmQuaXNDb25zdCgpKTsKIAogICAgICAg ICBpZiAoIWxlZnRPcGVyYW5kLmlzUG9zaXRpdmVDb25zdEludDMyKCkpIHsKICAgICAgICAgICAg IGxlZnQgPSBKU1ZhbHVlT3BlcmFuZCh0aGlzLCBsZWZ0Q2hpbGQpOwpAQCAtMzUzMSw4ICszNTE4 LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZUFyaXRoTXVsKE5vZAogICAgICAgICAg ICAgbGVmdFJlZ3MgPSByZXN1bHRSZWdzOwogICAgICAgICAgICAgaW50NjRfdCBsZWZ0Q29uc3Qg PSBsZWZ0T3BlcmFuZC5hc0NvbnN0SW50MzIoKTsKICAgICAgICAgICAgIG1faml0Lm1vdmVWYWx1 ZShKU1ZhbHVlKGxlZnRDb25zdCksIGxlZnRSZWdzKTsKLSAgICAgICAgfQotICAgICAgICBpZiAo cmlnaHRPcGVyYW5kLmlzUG9zaXRpdmVDb25zdEludDMyKCkpIHsKKyAgICAgICAgfSBlbHNlIGlm IChyaWdodE9wZXJhbmQuaXNQb3NpdGl2ZUNvbnN0SW50MzIoKSkgewogICAgICAgICAgICAgcmln aHRSZWdzID0gcmVzdWx0UmVnczsKICAgICAgICAgICAgIGludDY0X3QgcmlnaHRDb25zdCA9IHJp Z2h0T3BlcmFuZC5hc0NvbnN0SW50MzIoKTsKICAgICAgICAgICAgIG1faml0Lm1vdmVWYWx1ZShK U1ZhbHVlKHJpZ2h0Q29uc3QpLCByaWdodFJlZ3MpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAJKHJldmlzaW9uIDE5Mzc4OCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNTI3LDEyICsxNTI3LDExIEBAIHByaXZhdGU6CiAgICAgICAgIFNuaXBwZXRP cGVyYW5kIGxlZnRPcGVyYW5kKGFic3RyYWN0VmFsdWUobGVmdENoaWxkKS5yZXN1bHRUeXBlKCkp OwogICAgICAgICBTbmlwcGV0T3BlcmFuZCByaWdodE9wZXJhbmQoYWJzdHJhY3RWYWx1ZShyaWdo dENoaWxkKS5yZXN1bHRUeXBlKCkpOwogCi0gICAgICAgIC8vIFRoZSBERkcgZG9lcyBub3QgYWx3 YXlzIGZvbGQgdGhlIHN1bSBvZiAyIGNvbnN0YW50IGludCBvcGVyYW5kcyB0b2dldGhlci4KICAg ICAgICAgLy8gQmVjYXVzZSB0aGUgc25pcHBldCBkb2VzIG5vdCBzdXBwb3J0IGJvdGggb3BlcmFu ZHMgYmVpbmcgY29uc3RhbnQsIGlmIHRoZSBsZWZ0CiAgICAgICAgIC8vIG9wZXJhbmQgaXMgYWxy ZWFkeSBhIGNvbnN0YW50LCB3ZSdsbCBqdXN0IHByZXRlbmQgdGhlIHJpZ2h0IG9wZXJhbmQgaXMg bm90LgogICAgICAgICBpZiAobGVmdENoaWxkLT5pc0ludDMyQ29uc3RhbnQoKSkKICAgICAgICAg ICAgIGxlZnRPcGVyYW5kLnNldENvbnN0SW50MzIobGVmdENoaWxkLT5hc0ludDMyKCkpOwotICAg ICAgICBpZiAoIWxlZnRPcGVyYW5kLmlzQ29uc3QoKSAmJiByaWdodENoaWxkLT5pc0ludDMyQ29u c3RhbnQoKSkKKyAgICAgICAgZWxzZSBpZiAocmlnaHRDaGlsZC0+aXNJbnQzMkNvbnN0YW50KCkp CiAgICAgICAgICAgICByaWdodE9wZXJhbmQuc2V0Q29uc3RJbnQzMihyaWdodENoaWxkLT5hc0lu dDMyKCkpOwogCiAgICAgICAgIC8vIEFyZ3VtZW50czogaWQsIGJ5dGVzLCB0YXJnZXQsIG51bUFy Z3MsIGFyZ3MuLi4KQEAgLTE4NTIsOSArMTg1MSwxMSBAQCBwcml2YXRlOgogICAgICAgICAgICAg U25pcHBldE9wZXJhbmQgbGVmdE9wZXJhbmQoYWJzdHJhY3RWYWx1ZShsZWZ0Q2hpbGQpLnJlc3Vs dFR5cGUoKSk7CiAgICAgICAgICAgICBTbmlwcGV0T3BlcmFuZCByaWdodE9wZXJhbmQoYWJzdHJh Y3RWYWx1ZShyaWdodENoaWxkKS5yZXN1bHRUeXBlKCkpOwogCisgICAgICAgICAgICAvLyBCZWNh dXNlIHRoZSBzbmlwcGV0IGRvZXMgbm90IHN1cHBvcnQgYm90aCBvcGVyYW5kcyBiZWluZyBjb25z dGFudCwgaWYgdGhlIGxlZnQKKyAgICAgICAgICAgIC8vIG9wZXJhbmQgaXMgYWxyZWFkeSBhIGNv bnN0YW50LCB3ZSdsbCBqdXN0IHByZXRlbmQgdGhlIHJpZ2h0IG9wZXJhbmQgaXMgbm90LgogICAg ICAgICAgICAgaWYgKGxlZnRDaGlsZC0+aXNJbnQzMkNvbnN0YW50KCkpCiAgICAgICAgICAgICAg ICAgbGVmdE9wZXJhbmQuc2V0Q29uc3RJbnQzMihsZWZ0Q2hpbGQtPmFzSW50MzIoKSk7Ci0gICAg ICAgICAgICBpZiAocmlnaHRDaGlsZC0+aXNJbnQzMkNvbnN0YW50KCkpCisgICAgICAgICAgICBl bHNlIGlmIChyaWdodENoaWxkLT5pc0ludDMyQ29uc3RhbnQoKSkKICAgICAgICAgICAgICAgICBy aWdodE9wZXJhbmQuc2V0Q29uc3RJbnQzMihyaWdodENoaWxkLT5hc0ludDMyKCkpOwogCiAgICAg ICAgICAgICBSRUxFQVNFX0FTU0VSVCghbGVmdE9wZXJhbmQuaXNDb25zdCgpIHx8ICFyaWdodE9w ZXJhbmQuaXNDb25zdCgpKTsK