204998 2019-12-08 10:30:57 -0800 [WebAssembly] Fix LLIntGenerator's checkConsistency contract 2019-12-08 17:35:24 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tzagallo tzagallo commit-queue ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1596709 0 tzagallo 2019-12-08 10:30:57 -0800 ... 1596710 1 tzagallo 2019-12-08 10:31:48 -0800 <rdar://problem/57733405> 1596711 2 385124 tzagallo 2019-12-08 10:36:17 -0800 Created attachment 385124 Patch 1596725 3 385124 mark.lam 2019-12-08 12:55:35 -0800 Comment on attachment 385124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385124&action=review > Source/JavaScriptCore/ChangeLog:18 > + In this patch I also removed the consistency check from calls to push in addArguments and addLocal, since at > + that point the expression stack must be empty. If that wasn't the case, those calls would be incorrect for the > + same reason as above: we perform several pushes in a row, which means that the stacks would be out of sync. At the top of FunctionParser<Context>::parse(), I suggest ASSERT(m_expressionStack.isEmpty()). This ensures and documents that a consistency check is not needed there. Alternatively, you can just call checkConsistency() there anyway, which makes it even clearer. It's effectively a no-op, but will clearly document that we know the expression stack is consistent at that point. 1596740 4 385124 tzagallo 2019-12-08 16:51:40 -0800 Comment on attachment 385124 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385124&action=review Thanks for the review. >> Source/JavaScriptCore/ChangeLog:18 >> + same reason as above: we perform several pushes in a row, which means that the stacks would be out of sync. > > At the top of FunctionParser<Context>::parse(), I suggest ASSERT(m_expressionStack.isEmpty()). This ensures and documents that a consistency check is not needed there. Alternatively, you can just call checkConsistency() there anyway, which makes it even clearer. It's effectively a no-op, but will clearly document that we know the expression stack is consistent at that point. That makes sense. I just added the checkConsistency call at the beginning of addArguments and addLocal. 1596741 5 385128 tzagallo 2019-12-08 16:52:08 -0800 Created attachment 385128 Patch for landing 1596744 6 385128 commit-queue 2019-12-08 17:35:23 -0800 Comment on attachment 385128 Patch for landing Clearing flags on attachment: 385128 Committed r253280: <https://trac.webkit.org/changeset/253280> 1596745 7 commit-queue 2019-12-08 17:35:24 -0800 All reviewed patches have been landed. Closing bug. 385124 2019-12-08 10:36:17 -0800 2019-12-08 16:52:06 -0800 Patch bug-204998-20191208103615.patch text/plain 4700 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMjc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj NDc0YjE5NGM0YWYzNjM3NjZlOWE0MDY5ZmVhOGZjNmM4MTg4MmZkLi43ZmM4MWRlNWQzZTFmNWZl NzkzOGQyZjkyNTM1YWFlM2QyZGM5MWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxOS0xMi0wOCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBbV2ViQXNzZW1ibHldIEZpeCBMTEludEdlbmVyYXRvcidzIGNoZWNrQ29u c2lzdGVuY3kgY29udHJhY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwNDk5OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTc3MzM0MDU+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgY2hlY2sgdGhl IGNvbnNpc3RlbmN5IG9mIHRoZSBXZWJBc3NlbWJseSBwYXJzZXIncyBleHByZXNzaW9uIHN0YWNr IGV2ZXJ5IHRpbWUgdGhlIExMSW50R2VuZXJhdG9yIGNhbGxzCisgICAgICAgIHB1c2ggdG8gYWxs b2NhdGUgYSBuZXcgc3RhY2sgdmFsdWUuIEhvd2V2ZXIsIGlmIHdlIGNhbGwgcHVzaCBtb3JlIHRo YW4gb25jZSAoZS5nLiBpbiBhIGxvb3ApLCB0aGUgc3RhY2sKKyAgICAgICAgaXMgbm8gbG9uZ2Vy IGNvbnNpc3RlbnQsIHNpbmNlIHRob3NlIHZhbHVlcyBoYXZlIG5vdCB5ZXQgYmVlbiBwbGFjZWQg aW4gdGhlIHBhcnNlcidzIGV4cHJlc3Npb24gc3RhY2ssIHNvCisgICAgICAgIHRoZSBnZW5lcmF0 b3IgYW5kIHBhcnNlcidzIHN0YWNrcyBhcmUgb3V0IG9mIHN5bmMuIEluc3RlYWQsIHdoZW5ldmVy IHdlIG5lZWQgdG8gcHVzaCBtdWx0aXBsZSB2YWx1ZXMsIHdlCisgICAgICAgIHNob3VsZCBmaXJz dCBtYW51YWxseSBjYWxsIGNoZWNrQ29uc2lzdGVuY3kgYmVmb3JlIGFueSBwdXNoZXMsIGFuZCBh bGwgcHVzaGVzIGFmdGVyIHRoYXQgc2hvdWxkIGJlIHJlcGxhY2VkCisgICAgICAgIHdpdGggcHVz aChOb0NvbnNpc3RlbmN5Q2hlY2spLgorCisgICAgICAgIEluIHRoaXMgcGF0Y2ggSSBhbHNvIHJl bW92ZWQgdGhlIGNvbnNpc3RlbmN5IGNoZWNrIGZyb20gY2FsbHMgdG8gcHVzaCBpbiBhZGRBcmd1 bWVudHMgYW5kIGFkZExvY2FsLCBzaW5jZSBhdAorICAgICAgICB0aGF0IHBvaW50IHRoZSBleHBy ZXNzaW9uIHN0YWNrIG11c3QgYmUgZW1wdHkuIElmIHRoYXQgd2Fzbid0IHRoZSBjYXNlLCB0aG9z ZSBjYWxscyB3b3VsZCBiZSBpbmNvcnJlY3QgZm9yIHRoZQorICAgICAgICBzYW1lIHJlYXNvbiBh cyBhYm92ZTogd2UgcGVyZm9ybSBzZXZlcmFsIHB1c2hlcyBpbiBhIHJvdywgd2hpY2ggbWVhbnMg dGhhdCB0aGUgc3RhY2tzIHdvdWxkIGJlIG91dCBvZiBzeW5jLgorCisgICAgICAgICogd2FzbS9X YXNtTExJbnRHZW5lcmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpXYXNtOjpMTEludEdlbmVyYXRv cjo6Y2FsbEluZm9ybWF0aW9uRm9yQ2FsbGVyKToKKyAgICAgICAgKEpTQzo6V2FzbTo6TExJbnRH ZW5lcmF0b3I6OmFkZEFyZ3VtZW50cyk6CisgICAgICAgIChKU0M6Oldhc206OkxMSW50R2VuZXJh dG9yOjphZGRMb2NhbCk6CisKIDIwMTktMTItMDcgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIE9iamVjdC5wcm90b3R5cGUuaXNQcm90b3R5cGVPZigpIHNob3VsZCBj aGVjayBpZiB0aGUgcGFzc2VkIGluIHZhbHVlIGlzIGEgbm9uLW9iamVjdCBmaXJzdC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21MTEludEdlbmVyYXRvci5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtTExJbnRHZW5lcmF0b3IuY3BwCmluZGV4 IDczZmYyMzlmMGRlMTBiNDhlMTFkNDdiYTJiM2YwNmIxYmRhY2NjMDAuLmZkNzUwN2IzNmVhNjIw ZjNkZjEwNWVkYjg5NGZmYWQ1MWRiNDIxMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS93YXNtL1dhc21MTEludEdlbmVyYXRvci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3dhc20vV2FzbUxMSW50R2VuZXJhdG9yLmNwcApAQCAtNTkxLDggKzU5MSw5IEBAIGF1dG8g TExJbnRHZW5lcmF0b3I6OmNhbGxJbmZvcm1hdGlvbkZvckNhbGxlcihjb25zdCBTaWduYXR1cmUm IHNpZ25hdHVyZSkgLT4gTExJCiAgICAgbV9zdGFja1NpemUgPSBpbml0aWFsU3RhY2tTaXplOwog CiAgICAgYXV0byBjb21taXRSZXN1bHRzID0gW3RoaXMsIHRlbXBvcmFyeVJlc3VsdHMgPSBXVEZN b3ZlKHRlbXBvcmFyeVJlc3VsdHMpXShSZXN1bHRMaXN0JiByZXN1bHRzKSB7CisgICAgICAgIGNo ZWNrQ29uc2lzdGVuY3koKTsKICAgICAgICAgZm9yIChhdXRvIHRlbXBvcmFyeVJlc3VsdCA6IHRl bXBvcmFyeVJlc3VsdHMpIHsKLSAgICAgICAgICAgIEV4cHJlc3Npb25UeXBlIHJlc3VsdCA9IHB1 c2goKTsKKyAgICAgICAgICAgIEV4cHJlc3Npb25UeXBlIHJlc3VsdCA9IHB1c2goTm9Db25zaXN0 ZW5jeUNoZWNrKTsKICAgICAgICAgICAgIFdhc21Nb3Y6OmVtaXQodGhpcywgcmVzdWx0LCB0ZW1w b3JhcnlSZXN1bHQpOwogICAgICAgICAgICAgcmVzdWx0cy5hcHBlbmQocmVzdWx0KTsKICAgICAg ICAgfQpAQCAtNjYxLDcgKzY2Miw3IEBAIGF1dG8gTExJbnRHZW5lcmF0b3I6OmFkZEFyZ3VtZW50 cyhjb25zdCBTaWduYXR1cmUmIHNpZ25hdHVyZSkgLT4gUGFydGlhbFJlc3VsdAogCiAgICAgVmVj dG9yPFZpcnR1YWxSZWdpc3Rlcj4gcmVnaXN0ZXJBcmd1bWVudHMoZ3ByQ291bnQgKyBmcHJDb3Vu dCk7CiAgICAgZm9yICh1aW50MzJfdCBpID0gMDsgaSA8IGdwckNvdW50ICsgZnByQ291bnQ7IGkr KykKLSAgICAgICAgcmVnaXN0ZXJBcmd1bWVudHNbaV0gPSBwdXNoKCk7CisgICAgICAgIHJlZ2lz dGVyQXJndW1lbnRzW2ldID0gcHVzaChOb0NvbnNpc3RlbmN5Q2hlY2spOwogCiAgICAgY29uc3Qg YXV0byBhZGRBcmd1bWVudCA9IFsmXSh1aW50MzJfdCBpbmRleCwgdWludDMyX3QmIGNvdW50LCB1 aW50MzJfdCBtYXgpIHsKICAgICAgICAgaWYgKGNvdW50IDwgbWF4KQpAQCAtNzAwLDcgKzcwMSw3 IEBAIGF1dG8gTExJbnRHZW5lcmF0b3I6OmFkZExvY2FsKFR5cGUgdHlwZSwgdWludDMyX3QgY291 bnQpIC0+IFBhcnRpYWxSZXN1bHQKICAgICBjYXNlIFR5cGU6OkFueXJlZjoKICAgICBjYXNlIFR5 cGU6OkZ1bmNyZWY6CiAgICAgICAgIHdoaWxlIChjb3VudC0tKQotICAgICAgICAgICAgbV91bml0 aWFsaXplZExvY2Fscy5hcHBlbmQocHVzaCgpKTsKKyAgICAgICAgICAgIG1fdW5pdGlhbGl6ZWRM b2NhbHMuYXBwZW5kKHB1c2goTm9Db25zaXN0ZW5jeUNoZWNrKSk7CiAgICAgICAgIGJyZWFrOwog ICAgIGRlZmF1bHQ6CiAgICAgICAgIG1fc3RhY2tTaXplICs9IGNvdW50OwpkaWZmIC0tZ2l0IGEv SlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCBlOGI2NDE1YjRlNGQz NzdmYTliOWI4ZjNhNDI4MTNmZTIxMWU5ODc0Li4xYmZhOTFiM2NkNTdlYzY1OTU5NTNlNTE5NTc1 OTFhOGJiOGYxMTcwIDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE5LTEyLTA4ICBUYWRldSBaYWdhbGxvICA8 dHphZ2FsbG9AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJBc3NlbWJseV0gRml4IExMSW50R2Vu ZXJhdG9yJ3MgY2hlY2tDb25zaXN0ZW5jeSBjb250cmFjdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0OTk4CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS81NzczMzQwNT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHdhc20vcmVncmVzcy9zdGFjay1jb25zaXN0ZW5jeS5qczogQWRkZWQuCisKIDIwMTkt MTItMDggIENhaW8gTGltYSAgPHRpY2Fpb2xpbWFAZ21haWwuY29tPgogCiAgICAgICAgIFtBUk12 N10gU2tpcCBmbGFreSBzdHJlc3MgdGVzdHMKZGlmZiAtLWdpdCBhL0pTVGVzdHMvd2FzbS9yZWdy ZXNzL3N0YWNrLWNvbnNpc3RlbmN5LmpzIGIvSlNUZXN0cy93YXNtL3JlZ3Jlc3Mvc3RhY2stY29u c2lzdGVuY3kuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDY0ZjM3MDU5YzEwZjBlMWNhNTRiNmJlNDc1YzEwNDY4 NzkxMzQ0MwotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvd2FzbS9yZWdyZXNzL3N0YWNrLWNv bnNpc3RlbmN5LmpzCkBAIC0wLDAgKzEsMTIgQEAKK2ltcG9ydCB7IGluc3RhbnRpYXRlIH0gZnJv bSAiLi4vd2FidC13cmFwcGVyLmpzIjsKKworaW5zdGFudGlhdGUoYAorKG1vZHVsZQorICAoZnVu YyAkZm9vIChyZXN1bHQgaTMyIGkzMikgdW5yZWFjaGFibGUpCisgIChmdW5jIChwYXJhbSBpMzIp IChyZXN1bHQgaTMyIGkzMiBpMzIpCisgICAgICAgIChsb2NhbC5nZXQgMCkKKyAgICAgICAgKGxv b3AgKHBhcmFtIGkzMikgKHJlc3VsdCBpMzIgaTMyIGkzMikKKyAgICAgICAgICAgICAgY2FsbCAk Zm9vKQorICAgICAgICApCisgICkKK2ApOwo= 385128 2019-12-08 16:52:08 -0800 2019-12-08 17:35:23 -0800 Patch for landing bug-204998-20191208165205.patch text/plain 4845 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMjc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj NDc0YjE5NGM0YWYzNjM3NjZlOWE0MDY5ZmVhOGZjNmM4MTg4MmZkLi43ZDdkZTEzNTIzMmVhMTNk NGE1OGJiNGQ5OWU4NDkzZjRlYzEyZTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxOS0xMi0wOCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBbV2ViQXNzZW1ibHldIEZpeCBMTEludEdlbmVyYXRvcidzIGNoZWNrQ29u c2lzdGVuY3kgY29udHJhY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwNDk5OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTc3MzM0MDU+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTWFyayBMYW0uCisKKyAgICAgICAgV2UgY2hlY2sgdGhlIGNvbnNp c3RlbmN5IG9mIHRoZSBXZWJBc3NlbWJseSBwYXJzZXIncyBleHByZXNzaW9uIHN0YWNrIGV2ZXJ5 IHRpbWUgdGhlIExMSW50R2VuZXJhdG9yIGNhbGxzCisgICAgICAgIHB1c2ggdG8gYWxsb2NhdGUg YSBuZXcgc3RhY2sgdmFsdWUuIEhvd2V2ZXIsIGlmIHdlIGNhbGwgcHVzaCBtb3JlIHRoYW4gb25j ZSAoZS5nLiBpbiBhIGxvb3ApLCB0aGUgc3RhY2sKKyAgICAgICAgaXMgbm8gbG9uZ2VyIGNvbnNp c3RlbnQsIHNpbmNlIHRob3NlIHZhbHVlcyBoYXZlIG5vdCB5ZXQgYmVlbiBwbGFjZWQgaW4gdGhl IHBhcnNlcidzIGV4cHJlc3Npb24gc3RhY2ssIHNvCisgICAgICAgIHRoZSBnZW5lcmF0b3IgYW5k IHBhcnNlcidzIHN0YWNrcyBhcmUgb3V0IG9mIHN5bmMuIEluc3RlYWQsIHdoZW5ldmVyIHdlIG5l ZWQgdG8gcHVzaCBtdWx0aXBsZSB2YWx1ZXMsIHdlCisgICAgICAgIHNob3VsZCBmaXJzdCBtYW51 YWxseSBjYWxsIGNoZWNrQ29uc2lzdGVuY3kgYmVmb3JlIGFueSBwdXNoZXMsIGFuZCBhbGwgcHVz aGVzIGFmdGVyIHRoYXQgc2hvdWxkIGJlIHJlcGxhY2VkCisgICAgICAgIHdpdGggcHVzaChOb0Nv bnNpc3RlbmN5Q2hlY2spLgorCisgICAgICAgICogd2FzbS9XYXNtTExJbnRHZW5lcmF0b3IuY3Bw OgorICAgICAgICAoSlNDOjpXYXNtOjpMTEludEdlbmVyYXRvcjo6Y2FsbEluZm9ybWF0aW9uRm9y Q2FsbGVyKToKKyAgICAgICAgKEpTQzo6V2FzbTo6TExJbnRHZW5lcmF0b3I6OmFkZEFyZ3VtZW50 cyk6CisgICAgICAgIChKU0M6Oldhc206OkxMSW50R2VuZXJhdG9yOjphZGRMb2NhbCk6CisKIDIw MTktMTItMDcgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIE9iamVj dC5wcm90b3R5cGUuaXNQcm90b3R5cGVPZigpIHNob3VsZCBjaGVjayBpZiB0aGUgcGFzc2VkIGlu IHZhbHVlIGlzIGEgbm9uLW9iamVjdCBmaXJzdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS93YXNtL1dhc21MTEludEdlbmVyYXRvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvd2FzbS9XYXNtTExJbnRHZW5lcmF0b3IuY3BwCmluZGV4IDczZmYyMzlmMGRlMTBiNDhlMTFk NDdiYTJiM2YwNmIxYmRhY2NjMDAuLmFiMTc0MDZhZmI3MzRhNzA4ZGYxMWRiYjY4MDE1MThiNzY2 NWZiNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNtL1dhc21MTEludEdl bmVyYXRvci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbUxMSW50R2Vu ZXJhdG9yLmNwcApAQCAtNTkxLDggKzU5MSw5IEBAIGF1dG8gTExJbnRHZW5lcmF0b3I6OmNhbGxJ bmZvcm1hdGlvbkZvckNhbGxlcihjb25zdCBTaWduYXR1cmUmIHNpZ25hdHVyZSkgLT4gTExJCiAg ICAgbV9zdGFja1NpemUgPSBpbml0aWFsU3RhY2tTaXplOwogCiAgICAgYXV0byBjb21taXRSZXN1 bHRzID0gW3RoaXMsIHRlbXBvcmFyeVJlc3VsdHMgPSBXVEZNb3ZlKHRlbXBvcmFyeVJlc3VsdHMp XShSZXN1bHRMaXN0JiByZXN1bHRzKSB7CisgICAgICAgIGNoZWNrQ29uc2lzdGVuY3koKTsKICAg ICAgICAgZm9yIChhdXRvIHRlbXBvcmFyeVJlc3VsdCA6IHRlbXBvcmFyeVJlc3VsdHMpIHsKLSAg ICAgICAgICAgIEV4cHJlc3Npb25UeXBlIHJlc3VsdCA9IHB1c2goKTsKKyAgICAgICAgICAgIEV4 cHJlc3Npb25UeXBlIHJlc3VsdCA9IHB1c2goTm9Db25zaXN0ZW5jeUNoZWNrKTsKICAgICAgICAg ICAgIFdhc21Nb3Y6OmVtaXQodGhpcywgcmVzdWx0LCB0ZW1wb3JhcnlSZXN1bHQpOwogICAgICAg ICAgICAgcmVzdWx0cy5hcHBlbmQocmVzdWx0KTsKICAgICAgICAgfQpAQCAtNjQ3LDYgKzY0OCw4 IEBAIGF1dG8gTExJbnRHZW5lcmF0b3I6OmNhbGxJbmZvcm1hdGlvbkZvckNhbGxlZShjb25zdCBT aWduYXR1cmUmIHNpZ25hdHVyZSkgLT4gVmVjCiAKIGF1dG8gTExJbnRHZW5lcmF0b3I6OmFkZEFy Z3VtZW50cyhjb25zdCBTaWduYXR1cmUmIHNpZ25hdHVyZSkgLT4gUGFydGlhbFJlc3VsdAogewor ICAgIGNoZWNrQ29uc2lzdGVuY3koKTsKKwogICAgIG1fY29kZUJsb2NrLT5tX251bUFyZ3VtZW50 cyA9IHNpZ25hdHVyZS5hcmd1bWVudENvdW50KCk7CiAgICAgbV9ub3JtYWxpemVkQXJndW1lbnRz LnJlc2l6ZShtX2NvZGVCbG9jay0+bV9udW1Bcmd1bWVudHMpOwogCkBAIC02NjEsNyArNjY0LDcg QEAgYXV0byBMTEludEdlbmVyYXRvcjo6YWRkQXJndW1lbnRzKGNvbnN0IFNpZ25hdHVyZSYgc2ln bmF0dXJlKSAtPiBQYXJ0aWFsUmVzdWx0CiAKICAgICBWZWN0b3I8VmlydHVhbFJlZ2lzdGVyPiBy ZWdpc3RlckFyZ3VtZW50cyhncHJDb3VudCArIGZwckNvdW50KTsKICAgICBmb3IgKHVpbnQzMl90 IGkgPSAwOyBpIDwgZ3ByQ291bnQgKyBmcHJDb3VudDsgaSsrKQotICAgICAgICByZWdpc3RlckFy Z3VtZW50c1tpXSA9IHB1c2goKTsKKyAgICAgICAgcmVnaXN0ZXJBcmd1bWVudHNbaV0gPSBwdXNo KE5vQ29uc2lzdGVuY3lDaGVjayk7CiAKICAgICBjb25zdCBhdXRvIGFkZEFyZ3VtZW50ID0gWyZd KHVpbnQzMl90IGluZGV4LCB1aW50MzJfdCYgY291bnQsIHVpbnQzMl90IG1heCkgewogICAgICAg ICBpZiAoY291bnQgPCBtYXgpCkBAIC02OTUsMTIgKzY5OCwxNCBAQCBhdXRvIExMSW50R2VuZXJh dG9yOjphZGRBcmd1bWVudHMoY29uc3QgU2lnbmF0dXJlJiBzaWduYXR1cmUpIC0+IFBhcnRpYWxS ZXN1bHQKIAogYXV0byBMTEludEdlbmVyYXRvcjo6YWRkTG9jYWwoVHlwZSB0eXBlLCB1aW50MzJf dCBjb3VudCkgLT4gUGFydGlhbFJlc3VsdAogeworICAgIGNoZWNrQ29uc2lzdGVuY3koKTsKKwog ICAgIG1fY29kZUJsb2NrLT5tX251bVZhcnMgKz0gY291bnQ7CiAgICAgc3dpdGNoICh0eXBlKSB7 CiAgICAgY2FzZSBUeXBlOjpBbnlyZWY6CiAgICAgY2FzZSBUeXBlOjpGdW5jcmVmOgogICAgICAg ICB3aGlsZSAoY291bnQtLSkKLSAgICAgICAgICAgIG1fdW5pdGlhbGl6ZWRMb2NhbHMuYXBwZW5k KHB1c2goKSk7CisgICAgICAgICAgICBtX3VuaXRpYWxpemVkTG9jYWxzLmFwcGVuZChwdXNoKE5v Q29uc2lzdGVuY3lDaGVjaykpOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAg ICBtX3N0YWNrU2l6ZSArPSBjb3VudDsKZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIv SlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZThiNjQxNWI0ZTRkMzc3ZmE5YjliOGYzYTQyODEzZmUy MTFlOTg3NC4uNjEyMDM3ODVlOWYyYTc2ZjdiMWNkZWQ1NzkyZDI4OGIxZmVjMzVmNiAxMDA2NDQK LS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMyBAQAorMjAxOS0xMi0wOCAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNvbT4K KworICAgICAgICBbV2ViQXNzZW1ibHldIEZpeCBMTEludEdlbmVyYXRvcidzIGNoZWNrQ29uc2lz dGVuY3kgY29udHJhY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNDk5OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTc3MzM0MDU+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTWFyayBMYW0uCisKKyAgICAgICAgKiB3YXNtL3JlZ3Jlc3Mvc3RhY2st Y29uc2lzdGVuY3kuanM6IEFkZGVkLgorCiAyMDE5LTEyLTA4ICBDYWlvIExpbWEgIDx0aWNhaW9s aW1hQGdtYWlsLmNvbT4KIAogICAgICAgICBbQVJNdjddIFNraXAgZmxha3kgc3RyZXNzIHRlc3Rz CmRpZmYgLS1naXQgYS9KU1Rlc3RzL3dhc20vcmVncmVzcy9zdGFjay1jb25zaXN0ZW5jeS5qcyBi L0pTVGVzdHMvd2FzbS9yZWdyZXNzL3N0YWNrLWNvbnNpc3RlbmN5LmpzCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ2 NGYzNzA1OWMxMGYwZTFjYTU0YjZiZTQ3NWMxMDQ2ODc5MTM0NDMKLS0tIC9kZXYvbnVsbAorKysg Yi9KU1Rlc3RzL3dhc20vcmVncmVzcy9zdGFjay1jb25zaXN0ZW5jeS5qcwpAQCAtMCwwICsxLDEy IEBACitpbXBvcnQgeyBpbnN0YW50aWF0ZSB9IGZyb20gIi4uL3dhYnQtd3JhcHBlci5qcyI7CisK K2luc3RhbnRpYXRlKGAKKyhtb2R1bGUKKyAgKGZ1bmMgJGZvbyAocmVzdWx0IGkzMiBpMzIpIHVu cmVhY2hhYmxlKQorICAoZnVuYyAocGFyYW0gaTMyKSAocmVzdWx0IGkzMiBpMzIgaTMyKQorICAg ICAgICAobG9jYWwuZ2V0IDApCisgICAgICAgIChsb29wIChwYXJhbSBpMzIpIChyZXN1bHQgaTMy IGkzMiBpMzIpCisgICAgICAgICAgICAgIGNhbGwgJGZvbykKKyAgICAgICAgKQorICApCitgKTsK