165820 2016-12-13 13:52:13 -0800 BytecodeBasicBlock::computeImpl() should not keep iterating blocks if all jump targets have already been found. 2016-12-14 12:00:02 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam fpizlo ggaren jfbastien keith_miller msaboff saam oldest_to_newest 1259524 0 mark.lam 2016-12-13 13:52:13 -0800 Currently, if an opcode is a branch type opcode. BytecodeBasicBlock::computeImpl() will iterate over all basic blocks looking for the block containing the jump target, and it will continue to do this even when all the jump targets have been found. This is wasted work, and all the more so given that most branch type opcodes only have a single jump target. 1259526 1 297039 mark.lam 2016-12-13 13:55:35 -0800 Created attachment 297039 proposed patch. 1259529 2 297039 mark.lam 2016-12-13 13:58:52 -0800 Comment on attachment 297039 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=297039&action=review > Source/JavaScriptCore/bytecode/BytecodeBasicBlock.cpp:163 > + ASSERT(!numberOfJumpTargets); This assertion is firing. I will need to check why. 1259547 3 297042 mark.lam 2016-12-13 14:52:01 -0800 Created attachment 297042 proposed patch. 1259829 4 297042 saam 2016-12-14 11:45:30 -0800 Comment on attachment 297042 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=297042&action=review > Source/JavaScriptCore/bytecode/BytecodeBasicBlock.cpp:160 > + --numberOfJumpTargets; Style suggestion: Instead of having the numberOfJumpTarget inside the "if" statement's conditional, you could instead check "if (!numberOfJumpTargets) break" right here. 1259830 5 297042 mark.lam 2016-12-14 11:47:25 -0800 Comment on attachment 297042 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=297042&action=review >> Source/JavaScriptCore/bytecode/BytecodeBasicBlock.cpp:160 >> + --numberOfJumpTargets; > > Style suggestion: Instead of having the numberOfJumpTarget inside the "if" statement's conditional, you could instead check "if (!numberOfJumpTargets) break" right here. I agree. That also makes it such that we only test numberOfJumpTarget if we've found a jump target instead of on every iteration. I'll change the code to do this before landing. 1259833 6 297108 mark.lam 2016-12-14 11:57:05 -0800 Created attachment 297108 patch for landing. 1259835 7 mark.lam 2016-12-14 12:00:02 -0800 Thanks for the review. Landed in r209820: <http://trac.webkit.org/r209820>. 297039 2016-12-13 13:55:35 -0800 2016-12-13 14:52:01 -0800 proposed patch. bug-165820.patch text/plain 2438 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA5NzczKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDE2LTEyLTEzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBC eXRlY29kZUJhc2ljQmxvY2s6OmNvbXB1dGVJbXBsKCkgc2hvdWxkIG5vdCBrZWVwIGl0ZXJhdGlu ZyBibG9ja3MgaWYgYWxsIGp1bXAgdGFyZ2V0cyBoYXZlIGFscmVhZHkgYmVlbiBmb3VuZC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTgyMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwg aWYgYW4gb3Bjb2RlIGlzIGEgYnJhbmNoIHR5cGUgb3Bjb2RlLCBCeXRlY29kZUJhc2ljQmxvY2s6 OmNvbXB1dGVJbXBsKCkKKyAgICAgICAgd2lsbCBpdGVyYXRlIG92ZXIgYWxsIGJhc2ljIGJsb2Nr cyBsb29raW5nIGZvciB0aGUgYmxvY2sgY29udGFpbmluZyB0aGUganVtcAorICAgICAgICB0YXJn ZXQsIGFuZCBpdCB3aWxsIGNvbnRpbnVlIHRvIGRvIHRoaXMgZXZlbiB3aGVuIGFsbCB0aGUganVt cCB0YXJnZXRzIGhhdmUgYmVlbgorICAgICAgICBmb3VuZC4gIFRoaXMgaXMgd2FzdGVkIHdvcmss IGFuZCBhbGwgdGhlIG1vcmUgc28gZ2l2ZW4gdGhhdCBtb3N0IGJyYW5jaCB0eXBlCisgICAgICAg IG9wY29kZXMgb25seSBoYXZlIGEgc2luZ2xlIGp1bXAgdGFyZ2V0LgorCisgICAgICAgICogYnl0 ZWNvZGUvQnl0ZWNvZGVCYXNpY0Jsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVCYXNp Y0Jsb2NrOjpjb21wdXRlSW1wbCk6CisKIDIwMTYtMTItMTMgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjA5NTQ0LgpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlQmFzaWNCbG9jay5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2Rl QmFzaWNCbG9jay5jcHAJKHJldmlzaW9uIDIwOTcyNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9CeXRlY29kZUJhc2ljQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTEs MTEgKzE1MSwxNiBAQCB2b2lkIEJ5dGVjb2RlQmFzaWNCbG9jazo6Y29tcHV0ZUltcGwoQmxvCiAg ICAgICAgICAgICAgICAgVmVjdG9yPHVuc2lnbmVkLCAxPiBieXRlY29kZU9mZnNldHNKdW1wZWRU bzsKICAgICAgICAgICAgICAgICBmaW5kSnVtcFRhcmdldHNGb3JCeXRlY29kZU9mZnNldChjb2Rl QmxvY2ssIGluc3RydWN0aW9uc0JlZ2luLCBieXRlY29kZU9mZnNldCwgYnl0ZWNvZGVPZmZzZXRz SnVtcGVkVG8pOwogCi0gICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGJh c2ljQmxvY2tzLnNpemUoKTsgaSsrKSB7CisgICAgICAgICAgICAgICAgc2l6ZV90IG51bWJlck9m SnVtcFRhcmdldHMgPSBieXRlY29kZU9mZnNldHNKdW1wZWRUby5zaXplKCk7CisgICAgICAgICAg ICAgICAgQVNTRVJUKG51bWJlck9mSnVtcFRhcmdldHMpOworICAgICAgICAgICAgICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IG51bWJlck9mSnVtcFRhcmdldHMgJiYgaSA8IGJhc2ljQmxvY2tzLnNp emUoKTsgaSsrKSB7CiAgICAgICAgICAgICAgICAgICAgIEJ5dGVjb2RlQmFzaWNCbG9jayogb3Ro ZXJCbG9jayA9IGJhc2ljQmxvY2tzW2ldLmdldCgpOwotICAgICAgICAgICAgICAgICAgICBpZiAo Ynl0ZWNvZGVPZmZzZXRzSnVtcGVkVG8uY29udGFpbnMob3RoZXJCbG9jay0+bGVhZGVyT2Zmc2V0 KCkpKQorICAgICAgICAgICAgICAgICAgICBpZiAoYnl0ZWNvZGVPZmZzZXRzSnVtcGVkVG8uY29u dGFpbnMob3RoZXJCbG9jay0+bGVhZGVyT2Zmc2V0KCkpKSB7CiAgICAgICAgICAgICAgICAgICAg ICAgICBsaW5rQmxvY2tzKGJsb2NrLCBvdGhlckJsb2NrKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgIC0tbnVtYmVyT2ZKdW1wVGFyZ2V0czsKKyAgICAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBBU1NFUlQoIW51bWJlck9mSnVtcFRhcmdldHMp OwogCiAgICAgICAgICAgICAgICAgaWYgKGlzVW5jb25kaXRpb25hbEJyYW5jaChvcGNvZGVJRCkp CiAgICAgICAgICAgICAgICAgICAgIGZhbGxzVGhyb3VnaCA9IGZhbHNlOwo= 297042 2016-12-13 14:52:01 -0800 2016-12-14 11:57:05 -0800 proposed patch. bug-165820.patch text/plain 2876 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA5NzczKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDE2LTEyLTEzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBC eXRlY29kZUJhc2ljQmxvY2s6OmNvbXB1dGVJbXBsKCkgc2hvdWxkIG5vdCBrZWVwIGl0ZXJhdGlu ZyBibG9ja3MgaWYgYWxsIGp1bXAgdGFyZ2V0cyBoYXZlIGFscmVhZHkgYmVlbiBmb3VuZC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTgyMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwg aWYgYW4gb3Bjb2RlIGlzIGEgYnJhbmNoIHR5cGUgb3Bjb2RlLCBCeXRlY29kZUJhc2ljQmxvY2s6 OmNvbXB1dGVJbXBsKCkKKyAgICAgICAgd2lsbCBpdGVyYXRlIG92ZXIgYWxsIGJhc2ljIGJsb2Nr cyBsb29raW5nIGZvciB0aGUgYmxvY2sgY29udGFpbmluZyB0aGUganVtcAorICAgICAgICB0YXJn ZXQsIGFuZCBpdCB3aWxsIGNvbnRpbnVlIHRvIGRvIHRoaXMgZXZlbiB3aGVuIGFsbCB0aGUganVt cCB0YXJnZXRzIGhhdmUgYmVlbgorICAgICAgICBmb3VuZC4gIFRoaXMgaXMgd2FzdGVkIHdvcmss IGFuZCBhbGwgdGhlIG1vcmUgc28gZ2l2ZW4gdGhhdCBtb3N0IGJyYW5jaCB0eXBlCisgICAgICAg IG9wY29kZXMgb25seSBoYXZlIGEgc2luZ2xlIGp1bXAgdGFyZ2V0LgorCisgICAgICAgICogYnl0 ZWNvZGUvQnl0ZWNvZGVCYXNpY0Jsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVCYXNp Y0Jsb2NrOjpjb21wdXRlSW1wbCk6CisKIDIwMTYtMTItMTMgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjA5NTQ0LgpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlQmFzaWNCbG9jay5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2Rl QmFzaWNCbG9jay5jcHAJKHJldmlzaW9uIDIwOTcyNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9CeXRlY29kZUJhc2ljQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTEs MTEgKzE1MSwyMCBAQCB2b2lkIEJ5dGVjb2RlQmFzaWNCbG9jazo6Y29tcHV0ZUltcGwoQmxvCiAg ICAgICAgICAgICAgICAgVmVjdG9yPHVuc2lnbmVkLCAxPiBieXRlY29kZU9mZnNldHNKdW1wZWRU bzsKICAgICAgICAgICAgICAgICBmaW5kSnVtcFRhcmdldHNGb3JCeXRlY29kZU9mZnNldChjb2Rl QmxvY2ssIGluc3RydWN0aW9uc0JlZ2luLCBieXRlY29kZU9mZnNldCwgYnl0ZWNvZGVPZmZzZXRz SnVtcGVkVG8pOwogCi0gICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGJh c2ljQmxvY2tzLnNpemUoKTsgaSsrKSB7CisgICAgICAgICAgICAgICAgc2l6ZV90IG51bWJlck9m SnVtcFRhcmdldHMgPSBieXRlY29kZU9mZnNldHNKdW1wZWRUby5zaXplKCk7CisgICAgICAgICAg ICAgICAgQVNTRVJUKG51bWJlck9mSnVtcFRhcmdldHMpOworICAgICAgICAgICAgICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IG51bWJlck9mSnVtcFRhcmdldHMgJiYgaSA8IGJhc2ljQmxvY2tzLnNp emUoKTsgaSsrKSB7CiAgICAgICAgICAgICAgICAgICAgIEJ5dGVjb2RlQmFzaWNCbG9jayogb3Ro ZXJCbG9jayA9IGJhc2ljQmxvY2tzW2ldLmdldCgpOwotICAgICAgICAgICAgICAgICAgICBpZiAo Ynl0ZWNvZGVPZmZzZXRzSnVtcGVkVG8uY29udGFpbnMob3RoZXJCbG9jay0+bGVhZGVyT2Zmc2V0 KCkpKQorICAgICAgICAgICAgICAgICAgICBpZiAoYnl0ZWNvZGVPZmZzZXRzSnVtcGVkVG8uY29u dGFpbnMob3RoZXJCbG9jay0+bGVhZGVyT2Zmc2V0KCkpKSB7CiAgICAgICAgICAgICAgICAgICAg ICAgICBsaW5rQmxvY2tzKGJsb2NrLCBvdGhlckJsb2NrKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgIC0tbnVtYmVyT2ZKdW1wVGFyZ2V0czsKKyAgICAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAvLyBudW1iZXJPZkp1bXBUYXJnZXRzIG1heSBu b3QgYmUgMCBoZXJlIGlmIHRoZXJlIGFyZSBtdWx0aXBsZSBqdW1wcyB0YXJnZXRpbmcgdGhlIHNh bWUKKyAgICAgICAgICAgICAgICAvLyBiYXNpYyBibG9ja3MgKGUuZy4gaW4gYSBzd2l0Y2ggdHlw ZSBvcGNvZGUpLiBTaW5jZSB3ZSBvbmx5IGRlY3JlbWVudCBudW1iZXJPZkp1bXBUYXJnZXRzCisg ICAgICAgICAgICAgICAgLy8gb25jZSBwZXIgYmFzaWMgYmxvY2ssIHRoZSBkdXBsaWNhdGVzIGFy ZSBub3QgYWNjb3VudGVkIGZvci4gRm9yIG91ciBwdXJwb3NlIGhlcmUsCisgICAgICAgICAgICAg ICAgLy8gdGhhdCBkb2Vzbid0IG1hdHRlciBiZWNhdXNlIHdlIG9ubHkgbmVlZCB0byBsaW5rIHRv IHRoZSB0YXJnZXQgYmxvY2sgb25jZSByZWdhcmRsZXNzCisgICAgICAgICAgICAgICAgLy8gb2Yg aG93IG1hbnkgd2F5cyB0aGlzIGJsb2NrIGNhbiBqdW1wIHRoZXJlLgogCiAgICAgICAgICAgICAg ICAgaWYgKGlzVW5jb25kaXRpb25hbEJyYW5jaChvcGNvZGVJRCkpCiAgICAgICAgICAgICAgICAg ICAgIGZhbGxzVGhyb3VnaCA9IGZhbHNlOwo= 297108 2016-12-14 11:57:05 -0800 2016-12-14 11:57:05 -0800 patch for landing. bug-165820.patch text/plain 2934 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA5ODE4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDE2LTEyLTE0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBC eXRlY29kZUJhc2ljQmxvY2s6OmNvbXB1dGVJbXBsKCkgc2hvdWxkIG5vdCBrZWVwIGl0ZXJhdGlu ZyBibG9ja3MgaWYgYWxsIGp1bXAgdGFyZ2V0cyBoYXZlIGFscmVhZHkgYmVlbiBmb3VuZC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTgyMAorCisg ICAgICAgIFJldmlld2VkIGJ5IFNhYW0gQmFyYXRpLgorCisgICAgICAgIEN1cnJlbnRseSwgaWYg YW4gb3Bjb2RlIGlzIGEgYnJhbmNoIHR5cGUgb3Bjb2RlLCBCeXRlY29kZUJhc2ljQmxvY2s6OmNv bXB1dGVJbXBsKCkKKyAgICAgICAgd2lsbCBpdGVyYXRlIG92ZXIgYWxsIGJhc2ljIGJsb2NrcyBs b29raW5nIGZvciB0aGUgYmxvY2sgY29udGFpbmluZyB0aGUganVtcAorICAgICAgICB0YXJnZXQs IGFuZCBpdCB3aWxsIGNvbnRpbnVlIHRvIGRvIHRoaXMgZXZlbiB3aGVuIGFsbCB0aGUganVtcCB0 YXJnZXRzIGhhdmUgYmVlbgorICAgICAgICBmb3VuZC4gIFRoaXMgaXMgd2FzdGVkIHdvcmssIGFu ZCBhbGwgdGhlIG1vcmUgc28gZ2l2ZW4gdGhhdCBtb3N0IGJyYW5jaCB0eXBlCisgICAgICAgIG9w Y29kZXMgb25seSBoYXZlIGEgc2luZ2xlIGp1bXAgdGFyZ2V0LgorCisgICAgICAgICogYnl0ZWNv ZGUvQnl0ZWNvZGVCYXNpY0Jsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVCYXNpY0Js b2NrOjpjb21wdXRlSW1wbCk6CisKIDIwMTYtMTItMTQgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFy cmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIE1hcmtlZEJsb2NrOjptYXJrc0NvbnZleUxp dmVuZXNzRHVyaW5nTWFya2luZyBzaG91bGQgdGFrZSBpbnRvIGFjY291bnQgY29sbGVjdGlvbiBz Y29wZQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlQmFzaWNC bG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5 dGVjb2RlQmFzaWNCbG9jay5jcHAJKHJldmlzaW9uIDIwOTgxOCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9CeXRlY29kZUJhc2ljQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNTEsMTEgKzE1MSwyMiBAQCB2b2lkIEJ5dGVjb2RlQmFzaWNCbG9jazo6Y29tcHV0ZUltcGwo QmxvCiAgICAgICAgICAgICAgICAgVmVjdG9yPHVuc2lnbmVkLCAxPiBieXRlY29kZU9mZnNldHNK dW1wZWRUbzsKICAgICAgICAgICAgICAgICBmaW5kSnVtcFRhcmdldHNGb3JCeXRlY29kZU9mZnNl dChjb2RlQmxvY2ssIGluc3RydWN0aW9uc0JlZ2luLCBieXRlY29kZU9mZnNldCwgYnl0ZWNvZGVP ZmZzZXRzSnVtcGVkVG8pOwogCisgICAgICAgICAgICAgICAgc2l6ZV90IG51bWJlck9mSnVtcFRh cmdldHMgPSBieXRlY29kZU9mZnNldHNKdW1wZWRUby5zaXplKCk7CisgICAgICAgICAgICAgICAg QVNTRVJUKG51bWJlck9mSnVtcFRhcmdldHMpOwogICAgICAgICAgICAgICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBiYXNpY0Jsb2Nrcy5zaXplKCk7IGkrKykgewogICAgICAgICAgICAgICAg ICAgICBCeXRlY29kZUJhc2ljQmxvY2sqIG90aGVyQmxvY2sgPSBiYXNpY0Jsb2Nrc1tpXS5nZXQo KTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGJ5dGVjb2RlT2Zmc2V0c0p1bXBlZFRvLmNvbnRh aW5zKG90aGVyQmxvY2stPmxlYWRlck9mZnNldCgpKSkKKyAgICAgICAgICAgICAgICAgICAgaWYg KGJ5dGVjb2RlT2Zmc2V0c0p1bXBlZFRvLmNvbnRhaW5zKG90aGVyQmxvY2stPmxlYWRlck9mZnNl dCgpKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgbGlua0Jsb2NrcyhibG9jaywgb3RoZXJC bG9jayk7CisgICAgICAgICAgICAgICAgICAgICAgICAtLW51bWJlck9mSnVtcFRhcmdldHM7Cisg ICAgICAgICAgICAgICAgICAgICAgICBpZiAoIW51bWJlck9mSnVtcFRhcmdldHMpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgLy8gbnVtYmVyT2ZKdW1wVGFyZ2V0cyBtYXkg bm90IGJlIDAgaGVyZSBpZiB0aGVyZSBhcmUgbXVsdGlwbGUganVtcHMgdGFyZ2V0aW5nIHRoZSBz YW1lCisgICAgICAgICAgICAgICAgLy8gYmFzaWMgYmxvY2tzIChlLmcuIGluIGEgc3dpdGNoIHR5 cGUgb3Bjb2RlKS4gU2luY2Ugd2Ugb25seSBkZWNyZW1lbnQgbnVtYmVyT2ZKdW1wVGFyZ2V0cwor ICAgICAgICAgICAgICAgIC8vIG9uY2UgcGVyIGJhc2ljIGJsb2NrLCB0aGUgZHVwbGljYXRlcyBh cmUgbm90IGFjY291bnRlZCBmb3IuIEZvciBvdXIgcHVycG9zZSBoZXJlLAorICAgICAgICAgICAg ICAgIC8vIHRoYXQgZG9lc24ndCBtYXR0ZXIgYmVjYXVzZSB3ZSBvbmx5IG5lZWQgdG8gbGluayB0 byB0aGUgdGFyZ2V0IGJsb2NrIG9uY2UgcmVnYXJkbGVzcworICAgICAgICAgICAgICAgIC8vIG9m IGhvdyBtYW55IHdheXMgdGhpcyBibG9jayBjYW4ganVtcCB0aGVyZS4KIAogICAgICAgICAgICAg ICAgIGlmIChpc1VuY29uZGl0aW9uYWxCcmFuY2gob3Bjb2RlSUQpKQogICAgICAgICAgICAgICAg ICAgICBmYWxsc1Rocm91Z2ggPSBmYWxzZTsK