183987 2018-03-24 14:46:42 -0700 [JSC] Remove repeated iteration of ElementNode 2018-03-27 01:50:25 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1409143 0 ysuzuki 2018-03-24 14:46:42 -0700 [JSC] Remove repeated iteration of ElementNode 1409145 1 336486 ysuzuki 2018-03-24 14:52:59 -0700 Created attachment 336486 Patch 1409437 2 336486 keith_miller 2018-03-26 16:19:14 -0700 Comment on attachment 336486 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=336486&action=review r=me with some nits. > Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp:398 > + auto newArray = [&generator] (RegisterID* dst, ElementNode* elements, unsigned length, bool hadVariableExpression) { Nit: Why not just capture the args you're using? > Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp:418 > + if (!!node->elision()) { Nit: You don't need the !!. 1409495 3 336486 ysuzuki 2018-03-27 01:46:29 -0700 Comment on attachment 336486 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=336486&action=review Thank you! >> Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp:398 >> + auto newArray = [&generator] (RegisterID* dst, ElementNode* elements, unsigned length, bool hadVariableExpression) { > > Nit: Why not just capture the args you're using? I want to separate the responsibility of ArrayNode::emitBytecode and this newArray function. This newArray does not recognize how `hadVariableExpression` and `length` is computed. Passing it as an argument explicitly makes this separation clear. >> Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp:418 >> + if (!!node->elision()) { > > Nit: You don't need the !!. Dropped. 1409496 4 ysuzuki 2018-03-27 01:49:46 -0700 Committed r229993: <https://trac.webkit.org/changeset/229993> 1409497 5 webkit-bug-importer 2018-03-27 01:50:25 -0700 <rdar://problem/38903107> 336486 2018-03-24 14:52:59 -0700 2018-03-26 16:19:14 -0700 Patch bug-183987-20180325065258.patch text/plain 8752 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5OTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw OTBkMWJjMTdiOTcwZGI2MWJkMGUzNTI4NzZjOWI5NTUxMjI4MGIxLi40ZjM0ZmQ1MGMwNDZhMDYy ZTQ2OTE4NjZhM2E4NzM4N2VjNTM2Nzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAxOC0wMy0yNCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBSZW1vdmUgcmVwZWF0ZWQgaXRlcmF0aW9uIG9mIEVsZW1l bnROb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODM5ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBC eXRlY29kZUdlbmVyYXRvciByZXBlYXRlZGx5IGl0ZXJhdGVzIEVsZW1lbnROb2RlIHRvIGVtaXQg dGhlIGVmZmljaWVudCBjb2RlLgorICAgICAgICBXaGlsZSBpdCBpcyBPSyBmb3Igc21hbGwgYXJy YXlzLCB0aGlzIHJlcGVhdGVkIGl0ZXJhdGlvbiB0YWtlcyBtdWNoIHRpbWUKKyAgICAgICAgaWYg dGhlIGFycmF5IGlzIHZlcnkgbGFyZ2UuIEZvciBleGFtcGxlLCBLcmFrZW4ncyBpbml0aWFsaXph dGlvbiBjb2RlIGluY2x1ZGVzCisgICAgICAgIHZlcnkgbGFyZ2UgYXJyYXkgd2l0aCBudW1lcmlj IGxpdGVyYWxzLiBUaGlzIG1ha2VzIGJ5dGVjb2RlIGNvbXBpbGluZyBzbyBsb25nLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggY2FyZWZ1bGx5IHJlbW92ZXMgdW5uZWNlc3NhcnkgaXRlcmF0aW9uIHdo ZW4gZW1pdHRpbmcgYXJyYXlzLgorICAgICAgICBUaGlzIHJlZHVjZXMgb25lIG9mIEtyYWtlbi9p bWFnaW5nLWRhcmtyb29tJ3MgYnl0ZWNvZGUgY29tcGlsaW5nIGZyb20gMTMuMTY5ODU2IG1zCisg ICAgICAgIHRvIDkuOTg4MDUwIG1zLgorCisgICAgICAgICogYnl0ZWNvbXBpbGVyL0J5dGVjb2Rl R2VuZXJhdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXROZXdB cnJheUJ1ZmZlcik6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0TmV3QXJy YXkpOgorICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oOgorICAgICAg ICAqIGJ5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwOgorICAgICAgICAoSlNDOjpBcnJheU5v ZGU6OmVtaXRCeXRlY29kZSk6CisgICAgICAgIChKU0M6OkFycmF5UGF0dGVybk5vZGU6OmJpbmRW YWx1ZSBjb25zdCk6CisgICAgICAgIChKU0M6OkFycmF5UGF0dGVybk5vZGU6OmVtaXREaXJlY3RC aW5kaW5nKToKKwogMjAxOC0wMy0yMiAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAogICAgICAgICBbREZHXSBJbnRyb2R1Y2VzIGZ1c2VkIGNvbXBhcmUgYW5kIGp1bXAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVH ZW5lcmF0b3IuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29k ZUdlbmVyYXRvci5jcHAKaW5kZXggOTdlYjNiYjIyYWZlZjRlMTAwZDFkN2I4NWM3YzE0YzIyYjc1 OWY4Yy4uMGY2MGQ3ODg2ZjU2YjY3NDhhYWExMzhmNDRmOGNkZGFiN2IwOGJkMiAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5j cHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVy YXRvci5jcHAKQEAgLTMxNjEsNDAgKzMxNjEsMTcgQEAgUmVnaXN0ZXJJRCogQnl0ZWNvZGVHZW5l cmF0b3I6OmFkZFRlbXBsYXRlT2JqZWN0Q29uc3RhbnQoUmVmPFRlbXBsYXRlT2JqZWN0RGVzY3IK ICAgICByZXR1cm4gJm1fY29uc3RhbnRQb29sUmVnaXN0ZXJzW2luZGV4XTsKIH0KIAotUmVnaXN0 ZXJJRCogQnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXROZXdBcnJheShSZWdpc3RlcklEKiBkc3QsIEVs ZW1lbnROb2RlKiBlbGVtZW50cywgdW5zaWduZWQgbGVuZ3RoKQorUmVnaXN0ZXJJRCogQnl0ZWNv ZGVHZW5lcmF0b3I6OmVtaXROZXdBcnJheUJ1ZmZlcihSZWdpc3RlcklEKiBkc3QsIEpTRml4ZWRB cnJheSogYXJyYXkpCiB7Ci0jaWYgIUFTU0VSVF9ESVNBQkxFRAotICAgIHVuc2lnbmVkIGNoZWNr TGVuZ3RoID0gMDsKLSNlbmRpZgotICAgIGJvb2wgaGFkVmFyaWFibGVFeHByZXNzaW9uID0gZmFs c2U7Ci0gICAgaWYgKGxlbmd0aCkgewotICAgICAgICBmb3IgKEVsZW1lbnROb2RlKiBuID0gZWxl bWVudHM7IG47IG4gPSBuLT5uZXh0KCkpIHsKLSAgICAgICAgICAgIGlmICghbi0+dmFsdWUoKS0+ aXNDb25zdGFudCgpKSB7Ci0gICAgICAgICAgICAgICAgaGFkVmFyaWFibGVFeHByZXNzaW9uID0g dHJ1ZTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAg IGlmIChuLT5lbGlzaW9uKCkpCi0gICAgICAgICAgICAgICAgYnJlYWs7Ci0jaWYgIUFTU0VSVF9E SVNBQkxFRAotICAgICAgICAgICAgY2hlY2tMZW5ndGgrKzsKLSNlbmRpZgotICAgICAgICB9Ci0g ICAgICAgIGlmICghaGFkVmFyaWFibGVFeHByZXNzaW9uKSB7Ci0gICAgICAgICAgICBBU1NFUlQo bGVuZ3RoID09IGNoZWNrTGVuZ3RoKTsKLSAgICAgICAgICAgIGF1dG8qIGFycmF5ID0gSlNGaXhl ZEFycmF5OjpjcmVhdGUoKm1fdm0sIGxlbmd0aCk7Ci0gICAgICAgICAgICB1bnNpZ25lZCBpbmRl eCA9IDA7Ci0gICAgICAgICAgICBmb3IgKEVsZW1lbnROb2RlKiBuID0gZWxlbWVudHM7IGluZGV4 IDwgbGVuZ3RoOyBuID0gbi0+bmV4dCgpKSB7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKG4tPnZh bHVlKCktPmlzQ29uc3RhbnQoKSk7Ci0gICAgICAgICAgICAgICAgYXJyYXktPnNldCgqbV92bSwg aW5kZXgrKywgc3RhdGljX2Nhc3Q8Q29uc3RhbnROb2RlKj4obi0+dmFsdWUoKSktPmpzVmFsdWUo KnRoaXMpKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGVtaXRPcGNvZGUob3BfbmV3X2Fy cmF5X2J1ZmZlcik7Ci0gICAgICAgICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoZHN0LT5pbmRl eCgpKTsKLSAgICAgICAgICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChhZGRDb25zdGFudFZhbHVl KGFycmF5KS0+aW5kZXgoKSk7Ci0gICAgICAgICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQobmV3 QXJyYXlBbGxvY2F0aW9uUHJvZmlsZSgpKTsKLSAgICAgICAgICAgIHJldHVybiBkc3Q7Ci0gICAg ICAgIH0KLSAgICB9CisgICAgZW1pdE9wY29kZShvcF9uZXdfYXJyYXlfYnVmZmVyKTsKKyAgICBp bnN0cnVjdGlvbnMoKS5hcHBlbmQoZHN0LT5pbmRleCgpKTsKKyAgICBpbnN0cnVjdGlvbnMoKS5h cHBlbmQoYWRkQ29uc3RhbnRWYWx1ZShhcnJheSktPmluZGV4KCkpOworICAgIGluc3RydWN0aW9u cygpLmFwcGVuZChuZXdBcnJheUFsbG9jYXRpb25Qcm9maWxlKCkpOworICAgIHJldHVybiBkc3Q7 Cit9CiAKK1JlZ2lzdGVySUQqIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0TmV3QXJyYXkoUmVnaXN0 ZXJJRCogZHN0LCBFbGVtZW50Tm9kZSogZWxlbWVudHMsIHVuc2lnbmVkIGxlbmd0aCkKK3sKICAg ICBWZWN0b3I8UmVmUHRyPFJlZ2lzdGVySUQ+LCAxNiwgVW5zYWZlVmVjdG9yT3ZlcmZsb3c+IGFy Z3Y7CiAgICAgZm9yIChFbGVtZW50Tm9kZSogbiA9IGVsZW1lbnRzOyBuOyBuID0gbi0+bmV4dCgp KSB7CiAgICAgICAgIGlmICghbGVuZ3RoKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oCmluZGV4IDBmMWZlM2IyMDRhYzky NTI5OWY1ZDUzZGY4MzUxNzg3NjE2YTA4NzAuLjBlZGZlM2RmNGVmNjM4YzExMjVhN2MyYTM5MGIz ODBhNGQyYzIxNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGls ZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv bXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmgKQEAgLTY2OSw2ICs2NjksNyBAQCBuYW1lc3BhY2Ug SlNDIHsKICAgICAgICAgUmVnaXN0ZXJJRCogZW1pdE5ld0FycmF5KFJlZ2lzdGVySUQqIGRzdCwg RWxlbWVudE5vZGUqLCB1bnNpZ25lZCBsZW5ndGgpOyAvLyBzdG9wcyBhdCBmaXJzdCBlbGlzaW9u CiAgICAgICAgIFJlZ2lzdGVySUQqIGVtaXROZXdBcnJheVdpdGhTcHJlYWQoUmVnaXN0ZXJJRCog ZHN0LCBFbGVtZW50Tm9kZSopOwogICAgICAgICBSZWdpc3RlcklEKiBlbWl0TmV3QXJyYXlXaXRo U2l6ZShSZWdpc3RlcklEKiBkc3QsIFJlZ2lzdGVySUQqIGxlbmd0aCk7CisgICAgICAgIFJlZ2lz dGVySUQqIGVtaXROZXdBcnJheUJ1ZmZlcihSZWdpc3RlcklEKiBkc3QsIEpTRml4ZWRBcnJheSop OwogCiAgICAgICAgIFJlZ2lzdGVySUQqIGVtaXROZXdGdW5jdGlvbihSZWdpc3RlcklEKiBkc3Qs IEZ1bmN0aW9uTWV0YWRhdGFOb2RlKik7CiAgICAgICAgIFJlZ2lzdGVySUQqIGVtaXROZXdGdW5j dGlvbkV4cHJlc3Npb24oUmVnaXN0ZXJJRCogZHN0LCBGdW5jRXhwck5vZGUqKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcAppbmRl eCA3ZmZkZTYyM2Y2NzQyMTE4YWQ4NTZhZTU2YTI4Y2YwYTdkODFhNTQwLi44MDY3NmU4NWI0YmQ5 ZGMyYmU4NGJkOWQwN2MyNGYyNWRlMGM2MDc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvYnl0ZWNvbXBpbGVyL05vZGVzQ29kZWdlbi5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwCkBAIC0zODQsMzUgKzM4NCw0OSBA QCBSZWdpc3RlcklEKiBUYWdnZWRUZW1wbGF0ZU5vZGU6OmVtaXRCeXRlY29kZShCeXRlY29kZUdl bmVyYXRvciYgZ2VuZXJhdG9yLCBSZWdpcwogCiBSZWdpc3RlcklEKiBBcnJheU5vZGU6OmVtaXRC eXRlY29kZShCeXRlY29kZUdlbmVyYXRvciYgZ2VuZXJhdG9yLCBSZWdpc3RlcklEKiBkc3QpCiB7 Ci0gICAgLy8gRklYTUU6IFNob3VsZCB3ZSBwdXQgYWxsIG9mIHRoaXMgY29kZSBpbnRvIGVtaXRO ZXdBcnJheT8KLQorICAgIGJvb2wgaGFkVmFyaWFibGVFeHByZXNzaW9uID0gZmFsc2U7CiAgICAg dW5zaWduZWQgbGVuZ3RoID0gMDsKICAgICBFbGVtZW50Tm9kZSogZmlyc3RQdXRFbGVtZW50Owog ICAgIGZvciAoZmlyc3RQdXRFbGVtZW50ID0gbV9lbGVtZW50OyBmaXJzdFB1dEVsZW1lbnQ7IGZp cnN0UHV0RWxlbWVudCA9IGZpcnN0UHV0RWxlbWVudC0+bmV4dCgpKSB7CiAgICAgICAgIGlmIChm aXJzdFB1dEVsZW1lbnQtPmVsaXNpb24oKSB8fCBmaXJzdFB1dEVsZW1lbnQtPnZhbHVlKCktPmlz U3ByZWFkRXhwcmVzc2lvbigpKQogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGlmICghZmly c3RQdXRFbGVtZW50LT52YWx1ZSgpLT5pc0NvbnN0YW50KCkpCisgICAgICAgICAgICBoYWRWYXJp YWJsZUV4cHJlc3Npb24gPSB0cnVlOwogICAgICAgICArK2xlbmd0aDsKICAgICB9CiAKKyAgICBh dXRvIG5ld0FycmF5ID0gWyZnZW5lcmF0b3JdIChSZWdpc3RlcklEKiBkc3QsIEVsZW1lbnROb2Rl KiBlbGVtZW50cywgdW5zaWduZWQgbGVuZ3RoLCBib29sIGhhZFZhcmlhYmxlRXhwcmVzc2lvbikg eworICAgICAgICBpZiAobGVuZ3RoICYmICFoYWRWYXJpYWJsZUV4cHJlc3Npb24pIHsKKyAgICAg ICAgICAgIGF1dG8qIGFycmF5ID0gSlNGaXhlZEFycmF5OjpjcmVhdGUoKmdlbmVyYXRvci52bSgp LCBsZW5ndGgpOworICAgICAgICAgICAgdW5zaWduZWQgaW5kZXggPSAwOworICAgICAgICAgICAg Zm9yIChFbGVtZW50Tm9kZSogZWxlbWVudCA9IGVsZW1lbnRzOyBpbmRleCA8IGxlbmd0aDsgZWxl bWVudCA9IGVsZW1lbnQtPm5leHQoKSkgeworICAgICAgICAgICAgICAgIEFTU0VSVChlbGVtZW50 LT52YWx1ZSgpLT5pc0NvbnN0YW50KCkpOworICAgICAgICAgICAgICAgIGFycmF5LT5zZXQoKmdl bmVyYXRvci52bSgpLCBpbmRleCsrLCBzdGF0aWNfY2FzdDxDb25zdGFudE5vZGUqPihlbGVtZW50 LT52YWx1ZSgpKS0+anNWYWx1ZShnZW5lcmF0b3IpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIHJldHVybiBnZW5lcmF0b3IuZW1pdE5ld0FycmF5QnVmZmVyKGRzdCwgYXJyYXkpOworICAg ICAgICB9CisgICAgICAgIHJldHVybiBnZW5lcmF0b3IuZW1pdE5ld0FycmF5KGRzdCwgZWxlbWVu dHMsIGxlbmd0aCk7CisgICAgfTsKKwogICAgIGlmICghZmlyc3RQdXRFbGVtZW50ICYmICFtX2Vs aXNpb24pCi0gICAgICAgIHJldHVybiBnZW5lcmF0b3IuZW1pdE5ld0FycmF5KGdlbmVyYXRvci5m aW5hbERlc3RpbmF0aW9uKGRzdCksIG1fZWxlbWVudCwgbGVuZ3RoKTsKKyAgICAgICAgcmV0dXJu IG5ld0FycmF5KGdlbmVyYXRvci5maW5hbERlc3RpbmF0aW9uKGRzdCksIG1fZWxlbWVudCwgbGVu Z3RoLCBoYWRWYXJpYWJsZUV4cHJlc3Npb24pOwogCiAgICAgaWYgKGZpcnN0UHV0RWxlbWVudCAm JiBmaXJzdFB1dEVsZW1lbnQtPnZhbHVlKCktPmlzU3ByZWFkRXhwcmVzc2lvbigpKSB7Ci0gICAg ICAgIGJvb2wgaGFzRWxpc2lvbiA9IGZhbHNlOwotICAgICAgICBmb3IgKEVsZW1lbnROb2RlKiBu b2RlID0gbV9lbGVtZW50OyBub2RlOyBub2RlID0gbm9kZS0+bmV4dCgpKSB7Ci0gICAgICAgICAg ICBpZiAoISFub2RlLT5lbGlzaW9uKCkpIHsKLSAgICAgICAgICAgICAgICBoYXNFbGlzaW9uID0g dHJ1ZTsKLSAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgYm9vbCBoYXNFbGlzaW9uID0g bV9lbGlzaW9uOworICAgICAgICBpZiAoIWhhc0VsaXNpb24pIHsKKyAgICAgICAgICAgIGZvciAo RWxlbWVudE5vZGUqIG5vZGUgPSBmaXJzdFB1dEVsZW1lbnQ7IG5vZGU7IG5vZGUgPSBub2RlLT5u ZXh0KCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoISFub2RlLT5lbGlzaW9uKCkpIHsKKyAgICAg ICAgICAgICAgICAgICAgaGFzRWxpc2lvbiA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAg ICBpZiAoISFtX2VsaXNpb24pCi0gICAgICAgICAgICBoYXNFbGlzaW9uID0gdHJ1ZTsKIAogICAg ICAgICBpZiAoIWhhc0VsaXNpb24pCiAgICAgICAgICAgICByZXR1cm4gZ2VuZXJhdG9yLmVtaXRO ZXdBcnJheVdpdGhTcHJlYWQoZ2VuZXJhdG9yLmZpbmFsRGVzdGluYXRpb24oZHN0KSwgbV9lbGVt ZW50KTsKICAgICB9CiAKLSAgICBSZWZQdHI8UmVnaXN0ZXJJRD4gYXJyYXkgPSBnZW5lcmF0b3Iu ZW1pdE5ld0FycmF5KGdlbmVyYXRvci50ZW1wRGVzdGluYXRpb24oZHN0KSwgbV9lbGVtZW50LCBs ZW5ndGgpOworICAgIFJlZlB0cjxSZWdpc3RlcklEPiBhcnJheSA9IG5ld0FycmF5KGdlbmVyYXRv ci50ZW1wRGVzdGluYXRpb24oZHN0KSwgbV9lbGVtZW50LCBsZW5ndGgsIGhhZFZhcmlhYmxlRXhw cmVzc2lvbik7CiAgICAgRWxlbWVudE5vZGUqIG4gPSBmaXJzdFB1dEVsZW1lbnQ7CiAgICAgZm9y ICg7IG47IG4gPSBuLT5uZXh0KCkpIHsKICAgICAgICAgaWYgKG4tPnZhbHVlKCktPmlzU3ByZWFk RXhwcmVzc2lvbigpKQpAQCAtNDA4MSw3ICs0MDk1LDcgQEAgdm9pZCBBcnJheVBhdHRlcm5Ob2Rl OjpiaW5kVmFsdWUoQnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwgUmVnaXN0ZXJJRCogcmhz KQogICAgICAgICB9CiAKICAgICAgICAgY2FzZSBCaW5kaW5nVHlwZTo6UmVzdEVsZW1lbnQ6IHsK LSAgICAgICAgICAgIFJlZlB0cjxSZWdpc3RlcklEPiBhcnJheSA9IGdlbmVyYXRvci5lbWl0TmV3 QXJyYXkoZ2VuZXJhdG9yLm5ld1RlbXBvcmFyeSgpLCAwLCAwKTsKKyAgICAgICAgICAgIFJlZlB0 cjxSZWdpc3RlcklEPiBhcnJheSA9IGdlbmVyYXRvci5lbWl0TmV3QXJyYXkoZ2VuZXJhdG9yLm5l d1RlbXBvcmFyeSgpLCBudWxscHRyLCAwKTsKIAogICAgICAgICAgICAgUmVmPExhYmVsPiBpdGVy YXRpb25Eb25lID0gZ2VuZXJhdG9yLm5ld0xhYmVsKCk7CiAgICAgICAgICAgICBpZiAoIWRvbmUp CkBAIC00MTMzLDcgKzQxNDcsNyBAQCBSZWdpc3RlcklEKiBBcnJheVBhdHRlcm5Ob2RlOjplbWl0 RGlyZWN0QmluZGluZyhCeXRlY29kZUdlbmVyYXRvciYgZ2VuZXJhdG9yLCBSZQogCiAgICAgUmVm UHRyPFJlZ2lzdGVySUQ+IHJlc3VsdFJlZ2lzdGVyOwogICAgIGlmIChkc3QgJiYgZHN0ICE9IGdl bmVyYXRvci5pZ25vcmVkUmVzdWx0KCkpCi0gICAgICAgIHJlc3VsdFJlZ2lzdGVyID0gZ2VuZXJh dG9yLmVtaXROZXdBcnJheShnZW5lcmF0b3IubmV3VGVtcG9yYXJ5KCksIDAsIDApOworICAgICAg ICByZXN1bHRSZWdpc3RlciA9IGdlbmVyYXRvci5lbWl0TmV3QXJyYXkoZ2VuZXJhdG9yLm5ld1Rl bXBvcmFyeSgpLCBudWxscHRyLCAwKTsKICAgICBpZiAobV90YXJnZXRQYXR0ZXJucy5zaXplKCkg IT0gZWxlbWVudHMuc2l6ZSgpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICBWZWN0b3I8 UmVmUHRyPFJlZ2lzdGVySUQ+PiByZWdpc3RlcnM7Cg==