209824 2020-03-31 11:49:03 -0700 REGRESSION: ASSERTION FAILED: regExpObjectNode in JSC::DFG::StrengthReductionPhase::handleNode 2020-03-31 13:57:16 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=209375 InRadar P2 Normal --- 1 ryanhaddad mark.lam darin ews-watchlist keith_miller mark.lam msaboff ross.kirsling saam tzagallo webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1636157 0 ryanhaddad 2020-03-31 11:49:03 -0700 36 tests are asserting on the Debug JSC queue: ASSERTION FAILED: regExpObjectNode ./dfg/DFGStrengthReductionPhase.cpp(542) : void JSC::DFG::StrengthReductionPhase::handleNode() 1 0x10a4c7c29 WTFCrash 2 0x10ac2601b WTFCrashWithInfo(int, char const*, char const*, int) 3 0x10b514e36 JSC::DFG::StrengthReductionPhase::handleNode() 4 0x10b512942 JSC::DFG::StrengthReductionPhase::run() 5 0x10b512704 bool JSC::DFG::runAndLog<JSC::DFG::StrengthReductionPhase>(JSC::DFG::StrengthReductionPhase&) 6 0x10b504a2b bool JSC::DFG::runPhase<JSC::DFG::StrengthReductionPhase>(JSC::DFG::Graph&) 7 0x10b5049f5 JSC::DFG::performStrengthReduction(JSC::DFG::Graph&) 8 0x10b413440 JSC::DFG::Plan::compileInThreadImpl() 9 0x10b40ff48 JSC::DFG::Plan::compileInThread(JSC::DFG::ThreadData*) 10 0x10b56b1fe JSC::DFG::Worklist::ThreadBody::work() 11 0x10a4de593 WTF::AutomaticThread::start(WTF::AbstractLocker const&)::$_0::operator()() const 12 0x10a4de17e WTF::Detail::CallableWrapper<WTF::AutomaticThread::start(WTF::AbstractLocker const&)::$_0, void>::call() 13 0x10a4f2252 WTF::Function<void ()>::operator()() const 14 0x10a5a6b78 WTF::Thread::entryPoint(WTF::Thread::NewThreadContext*) 15 0x10a5b3fa8 WTF::wtfThreadEntryPoint(void*) 16 0x7fff70703109 _pthread_start 17 0x7fff706feb8b thread_start ** The following JSC stress test failures have been introduced: microbenchmarks/emscripten-cube2hash.js.ftl-eager microbenchmarks/emscripten-cube2hash.js.ftl-eager-no-cjit microbenchmarks/emscripten-cube2hash.js.ftl-eager-no-cjit-b3o1 stress/ftl-regexp-exec.js.bytecode-cache stress/ftl-regexp-exec.js.default stress/ftl-regexp-exec.js.ftl-eager stress/ftl-regexp-exec.js.ftl-eager-no-cjit stress/ftl-regexp-exec.js.ftl-eager-no-cjit-b3o1 stress/ftl-regexp-exec.js.ftl-no-cjit-b3o0 stress/ftl-regexp-exec.js.ftl-no-cjit-no-inline-validate stress/ftl-regexp-exec.js.ftl-no-cjit-no-put-stack-validate stress/ftl-regexp-exec.js.ftl-no-cjit-small-pool stress/ftl-regexp-exec.js.ftl-no-cjit-validate-sampling-profiler stress/phantom-regexp-regexp-exec.js.bytecode-cache stress/phantom-regexp-regexp-exec.js.default stress/phantom-regexp-regexp-exec.js.ftl-eager stress/phantom-regexp-regexp-exec.js.ftl-eager-no-cjit stress/phantom-regexp-regexp-exec.js.ftl-eager-no-cjit-b3o1 stress/phantom-regexp-regexp-exec.js.ftl-no-cjit-b3o0 stress/phantom-regexp-regexp-exec.js.ftl-no-cjit-no-inline-validate stress/phantom-regexp-regexp-exec.js.ftl-no-cjit-no-put-stack-validate stress/phantom-regexp-regexp-exec.js.ftl-no-cjit-small-pool stress/phantom-regexp-regexp-exec.js.ftl-no-cjit-validate-sampling-profiler stress/regexp-exec-effect-after-exception.js.ftl-eager stress/regexp-exec-effect-after-exception.js.ftl-eager-no-cjit stress/regexp-exec-effect-after-exception.js.ftl-eager-no-cjit-b3o1 stress/regexp-exec-effect-after-exception.js.ftl-no-cjit-b3o0 stress/regexp-exec-effect-after-exception.js.ftl-no-cjit-no-inline-validate stress/regexp-exec-effect-after-exception.js.ftl-no-cjit-no-put-stack-validate stress/regexp-exec-effect-after-exception.js.ftl-no-cjit-validate-sampling-profiler stress/v8-regexp-strict.js.ftl-eager stress/v8-regexp-strict.js.ftl-eager-no-cjit stress/v8-regexp-strict.js.ftl-eager-no-cjit-b3o1 v8-v6/v8-regexp.js.ftl-eager v8-v6/v8-regexp.js.ftl-eager-no-cjit v8-v6/v8-regexp.js.ftl-eager-no-cjit-b3o1 https://build.webkit.org/builders/Apple-Catalina-Debug-JSC-Tests/builds/596/steps/jscore-test/logs/stdio 1636158 1 ryanhaddad 2020-03-31 11:49:48 -0700 This assert was added with https://trac.webkit.org/changeset/259246/webkit 1636163 2 mark.lam 2020-03-31 11:51:46 -0700 <rdar://problem/61092415> 1636167 3 ross.kirsling 2020-03-31 12:05:05 -0700 Argh, looks like this must be when we've already successfully done convertToStatic and are now reconsidering foldToConstant. 1636191 4 395082 ross.kirsling 2020-03-31 12:52:45 -0700 Created attachment 395082 Patch 1636192 5 ross.kirsling 2020-03-31 12:53:20 -0700 Sorry about that! 1636194 6 395082 darin 2020-03-31 12:55:35 -0700 Comment on attachment 395082 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395082&action=review > Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp:556 > + && otherNode->child2()->isInt32Constant() > + && otherNode->child2()->asInt32() >= 0) { > + lastIndex = static_cast<unsigned>(otherNode->child2()->asInt32()); Moved code, not new. This seems a lot like isUInt32/asUInt32 and a little strange that we’re using static_cast instead. 1636206 7 395082 mark.lam 2020-03-31 13:08:30 -0700 Comment on attachment 395082 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395082&action=review r=me >> Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp:556 >> + lastIndex = static_cast<unsigned>(otherNode->child2()->asInt32()); > > Moved code, not new. This seems a lot like isUInt32/asUInt32 and a little strange that we’re using static_cast instead. Yes, let's just use asUint32() and remove the need for the cast. 1636220 8 395086 ross.kirsling 2020-03-31 13:27:42 -0700 Created attachment 395086 Patch for landing 1636224 9 ews-feeder 2020-03-31 13:57:15 -0700 Committed r259310: <https://trac.webkit.org/changeset/259310> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395086. 395082 2020-03-31 12:52:45 -0700 2020-03-31 13:27:41 -0700 Patch bug-209824-20200331125245.patch text/plain 4658 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm MGUzNGFiMTQwNzk4M2ZlYmMxNWEwY2IwNjVjZmRmNjY0YjUxOWNiLi44ZGM3Mzg3MmUxZmRjNzFh NTE2NzM1YWYwMzFlMmZlNDZjYTZkZjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAyMC0wMy0zMSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTjogQVNTRVJUSU9OIEZBSUxFRDogcmVnRXhwT2Jq ZWN0Tm9kZSBpbiBKU0M6OkRGRzo6U3RyZW5ndGhSZWR1Y3Rpb25QaGFzZTo6aGFuZGxlTm9kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5ODI0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkZmcvREZH U3RyZW5ndGhSZWR1Y3Rpb25QaGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3RyZW5ndGhS ZWR1Y3Rpb25QaGFzZTo6aGFuZGxlTm9kZSk6CisgICAgICAgIEl0J3MgdHJ1ZSB0aGF0IHdlIG5l ZWQgdG8gdmVyaWZ5IGxhc3RJbmRleCBldmVuIHdoZW4gYSBSZWdFeHAgaXMgbmVpdGhlciBnbG9i YWwgbm9yIHN0aWNreSwKKyAgICAgICAgYnV0IGlmIERGRydzIGFscmVhZHkgY29udmVydGVkIFJl Z0V4cEV4ZWMgdG8gUmVnRXhwRXhlY05vbkdsb2JhbE9yU3RpY2t5LCB0aGF0IG1lYW5zIHdlJ3Zl IHRocm93biBhd2F5CisgICAgICAgIHRoZSBSZWdFeHBPYmplY3Qgbm9kZSwgc28gd2Ugc2hvdWxk bid0IHRyeSB0byByZXZlcmlmeSBsYXN0SW5kZXggd2hlbiB3ZSByZWNvbnNpZGVyIGZvbGRpbmcg dG8gY29uc3RhbnQuCisKIDIwMjAtMDMtMzAgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxl LmNvbT4KIAogICAgICAgICBbSlNDXSBERkdBcnJheU1vZGU6OmFscmVhZHlDaGVja2VkIHNob3Vs ZCBoYXZlIE5vbkFycmF5IGNoZWNrIHdoZW4gQXJyYXlNb2RlIGlzIE5vbkFycmF5K1Nsb3dQdXRB cnJheVN0b3JhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3Ry ZW5ndGhSZWR1Y3Rpb25QaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1N0 cmVuZ3RoUmVkdWN0aW9uUGhhc2UuY3BwCmluZGV4IGFhOTE1ZTYxOTNjYTEyZDA3NGY3YWMwYmIz NDMyOTg3MDQ5MTA1NGIuLmM2ZDU1ZTRhMTRjYmZlMDNjNmRjNzUzZGE1ZGUzMmMzMmM1OGYzZGUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3RyZW5ndGhSZWR1Y3Rp b25QaGFzZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTdHJlbmd0aFJl ZHVjdGlvblBoYXNlLmNwcApAQCAtNTM1LDMzICs1MzUsMzUgQEAgcHJpdmF0ZToKIAogICAgICAg ICAgICAgQVNTRVJUKG1fbm9kZS0+b3AoKSAhPSBSZWdFeHBNYXRjaEZhc3QpOwogCi0gICAgICAg ICAgICAvLyBUaGlzIHdpbGwgb25seSB3b3JrIGlmIHdlIGNhbiBwcm92ZSB3aGF0IHRoZSB2YWx1 ZSBvZiBsYXN0SW5kZXggaXMuIFRvIGRvIHRoaXMKLSAgICAgICAgICAgIC8vIHNhZmVseSwgd2Ug bmVlZCB0byBleGVjdXRlIHRoZSBpbnNlcnRpb24gc2V0IHNvIHRoYXQgd2Ugc2VlIGFueSBwcmV2 aW91cyBzdHJlbmd0aAotICAgICAgICAgICAgLy8gcmVkdWN0aW9ucy4gVGhpcyBpcyBuZWVkZWQg Zm9yIHNvdW5kbmVzcyBzaW5jZSBvdGhlcndpc2UgdGhlIGVmZmVjdGZ1bG5lc3Mgb2YgYW55Ci0g ICAgICAgICAgICAvLyBwcmV2aW91cyBzdHJlbmd0aCByZWR1Y3Rpb25zIHdvdWxkIGJlIGludmlz aWJsZSB0byB1cy4KLSAgICAgICAgICAgIEFTU0VSVChyZWdFeHBPYmplY3ROb2RlKTsKLSAgICAg ICAgICAgIGV4ZWN1dGVJbnNlcnRpb25TZXQoKTsKICAgICAgICAgICAgIHVuc2lnbmVkIGxhc3RJ bmRleCA9IFVJTlRfTUFYOwotICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBvdGhlck5vZGVJbmRl eCA9IG1fbm9kZUluZGV4OyBvdGhlck5vZGVJbmRleC0tOykgewotICAgICAgICAgICAgICAgIE5v ZGUqIG90aGVyTm9kZSA9IG1fYmxvY2stPmF0KG90aGVyTm9kZUluZGV4KTsKLSAgICAgICAgICAg ICAgICBpZiAob3RoZXJOb2RlID09IHJlZ0V4cE9iamVjdE5vZGUpIHsKLSAgICAgICAgICAgICAg ICAgICAgbGFzdEluZGV4ID0gMDsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICBpZiAobV9ub2RlLT5vcCgpICE9IFJlZ0V4cEV4ZWNOb25HbG9iYWxPclN0aWNreSkgewor ICAgICAgICAgICAgICAgIC8vIFRoaXMgd2lsbCBvbmx5IHdvcmsgaWYgd2UgY2FuIHByb3ZlIHdo YXQgdGhlIHZhbHVlIG9mIGxhc3RJbmRleCBpcy4gVG8gZG8gdGhpcworICAgICAgICAgICAgICAg IC8vIHNhZmVseSwgd2UgbmVlZCB0byBleGVjdXRlIHRoZSBpbnNlcnRpb24gc2V0IHNvIHRoYXQg d2Ugc2VlIGFueSBwcmV2aW91cyBzdHJlbmd0aAorICAgICAgICAgICAgICAgIC8vIHJlZHVjdGlv bnMuIFRoaXMgaXMgbmVlZGVkIGZvciBzb3VuZG5lc3Mgc2luY2Ugb3RoZXJ3aXNlIHRoZSBlZmZl Y3RmdWxuZXNzIG9mIGFueQorICAgICAgICAgICAgICAgIC8vIHByZXZpb3VzIHN0cmVuZ3RoIHJl ZHVjdGlvbnMgd291bGQgYmUgaW52aXNpYmxlIHRvIHVzLgorICAgICAgICAgICAgICAgIEFTU0VS VChyZWdFeHBPYmplY3ROb2RlKTsKKyAgICAgICAgICAgICAgICBleGVjdXRlSW5zZXJ0aW9uU2V0 KCk7CisgICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBvdGhlck5vZGVJbmRleCA9IG1fbm9k ZUluZGV4OyBvdGhlck5vZGVJbmRleC0tOykgeworICAgICAgICAgICAgICAgICAgICBOb2RlKiBv dGhlck5vZGUgPSBtX2Jsb2NrLT5hdChvdGhlck5vZGVJbmRleCk7CisgICAgICAgICAgICAgICAg ICAgIGlmIChvdGhlck5vZGUgPT0gcmVnRXhwT2JqZWN0Tm9kZSkgeworICAgICAgICAgICAgICAg ICAgICAgICAgbGFzdEluZGV4ID0gMDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGlmIChvdGhlck5vZGUt Pm9wKCkgPT0gU2V0UmVnRXhwT2JqZWN0TGFzdEluZGV4CisgICAgICAgICAgICAgICAgICAgICAg ICAmJiBvdGhlck5vZGUtPmNoaWxkMSgpID09IHJlZ0V4cE9iamVjdE5vZGUKKyAgICAgICAgICAg ICAgICAgICAgICAgICYmIG90aGVyTm9kZS0+Y2hpbGQyKCktPmlzSW50MzJDb25zdGFudCgpCisg ICAgICAgICAgICAgICAgICAgICAgICAmJiBvdGhlck5vZGUtPmNoaWxkMigpLT5hc0ludDMyKCkg Pj0gMCkgeworICAgICAgICAgICAgICAgICAgICAgICAgbGFzdEluZGV4ID0gc3RhdGljX2Nhc3Q8 dW5zaWduZWQ+KG90aGVyTm9kZS0+Y2hpbGQyKCktPmFzSW50MzIoKSk7CisgICAgICAgICAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAg ICAgICBpZiAod3JpdGVzT3ZlcmxhcChtX2dyYXBoLCBvdGhlck5vZGUsIFJlZ0V4cE9iamVjdF9s YXN0SW5kZXgpKQorICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAg ICAgfQotICAgICAgICAgICAgICAgIGlmIChvdGhlck5vZGUtPm9wKCkgPT0gU2V0UmVnRXhwT2Jq ZWN0TGFzdEluZGV4Ci0gICAgICAgICAgICAgICAgICAgICYmIG90aGVyTm9kZS0+Y2hpbGQxKCkg PT0gcmVnRXhwT2JqZWN0Tm9kZQotICAgICAgICAgICAgICAgICAgICAmJiBvdGhlck5vZGUtPmNo aWxkMigpLT5pc0ludDMyQ29uc3RhbnQoKQotICAgICAgICAgICAgICAgICAgICAmJiBvdGhlck5v ZGUtPmNoaWxkMigpLT5hc0ludDMyKCkgPj0gMCkgewotICAgICAgICAgICAgICAgICAgICBsYXN0 SW5kZXggPSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ob3RoZXJOb2RlLT5jaGlsZDIoKS0+YXNJbnQz MigpKTsKKyAgICAgICAgICAgICAgICBpZiAobGFzdEluZGV4ID09IFVJTlRfTUFYKSB7CisgICAg ICAgICAgICAgICAgICAgIGlmICh2ZXJib3NlKQorICAgICAgICAgICAgICAgICAgICAgICAgZGF0 YUxvZygiR2l2aW5nIHVwIGJlY2F1c2UgdGhlIGxhc3QgaW5kZXggaXMgbm90IGtub3duLlxuIik7 CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgICAgICBpZiAod3JpdGVzT3ZlcmxhcChtX2dyYXBoLCBvdGhlck5vZGUsIFJlZ0V4cE9iamVj dF9sYXN0SW5kZXgpKQotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0K LSAgICAgICAgICAgIGlmIChsYXN0SW5kZXggPT0gVUlOVF9NQVgpIHsKLSAgICAgICAgICAgICAg ICBpZiAodmVyYm9zZSkKLSAgICAgICAgICAgICAgICAgICAgZGF0YUxvZygiR2l2aW5nIHVwIGJl Y2F1c2UgdGhlIGxhc3QgaW5kZXggaXMgbm90IGtub3duLlxuIik7Ci0gICAgICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoIXJlZ0V4cC0+Z2xvYmFsT3JT dGlja3koKSkKICAgICAgICAgICAgICAgICBsYXN0SW5kZXggPSAwOwo= 395086 2020-03-31 13:27:42 -0700 2020-03-31 13:57:16 -0700 Patch for landing bug-209824-20200331132742.patch text/plain 4630 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm MGUzNGFiMTQwNzk4M2ZlYmMxNWEwY2IwNjVjZmRmNjY0YjUxOWNiLi43YjRiZTEwMWI0ZmJkODI4 YTE5YzA2NTJlNzdkYjI2NTE1M2Y2OTllIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAyMC0wMy0zMSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTjogQVNTRVJUSU9OIEZBSUxFRDogcmVnRXhwT2Jq ZWN0Tm9kZSBpbiBKU0M6OkRGRzo6U3RyZW5ndGhSZWR1Y3Rpb25QaGFzZTo6aGFuZGxlTm9kZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5ODI0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBMYW0uCisKKyAgICAgICAgKiBkZmcvREZHU3RyZW5n dGhSZWR1Y3Rpb25QaGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3RyZW5ndGhSZWR1Y3Rp b25QaGFzZTo6aGFuZGxlTm9kZSk6CisgICAgICAgIEl0J3MgdHJ1ZSB0aGF0IHdlIG5lZWQgdG8g dmVyaWZ5IGxhc3RJbmRleCBldmVuIHdoZW4gYSBSZWdFeHAgaXMgbmVpdGhlciBnbG9iYWwgbm9y IHN0aWNreSwKKyAgICAgICAgYnV0IGlmIERGRydzIGFscmVhZHkgY29udmVydGVkIFJlZ0V4cEV4 ZWMgdG8gUmVnRXhwRXhlY05vbkdsb2JhbE9yU3RpY2t5LCB0aGF0IG1lYW5zIHdlJ3ZlIHRocm93 biBhd2F5CisgICAgICAgIHRoZSBSZWdFeHBPYmplY3Qgbm9kZSwgc28gd2Ugc2hvdWxkbid0IHRy eSB0byByZXZlcmlmeSBsYXN0SW5kZXggd2hlbiB3ZSByZWNvbnNpZGVyIGZvbGRpbmcgdG8gY29u c3RhbnQuCisKIDIwMjAtMDMtMzAgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4K IAogICAgICAgICBbSlNDXSBERkdBcnJheU1vZGU6OmFscmVhZHlDaGVja2VkIHNob3VsZCBoYXZl IE5vbkFycmF5IGNoZWNrIHdoZW4gQXJyYXlNb2RlIGlzIE5vbkFycmF5K1Nsb3dQdXRBcnJheVN0 b3JhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3RyZW5ndGhS ZWR1Y3Rpb25QaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1N0cmVuZ3Ro UmVkdWN0aW9uUGhhc2UuY3BwCmluZGV4IGFhOTE1ZTYxOTNjYTEyZDA3NGY3YWMwYmIzNDMyOTg3 MDQ5MTA1NGIuLjc1ZjNhMDZiMGZjYjE4ZjgwZjQzNGQ4OGNiZGQxODUxZDg0NWU1MWQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3RyZW5ndGhSZWR1Y3Rpb25QaGFz ZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTdHJlbmd0aFJlZHVjdGlv blBoYXNlLmNwcApAQCAtNTM1LDMzICs1MzUsMzUgQEAgcHJpdmF0ZToKIAogICAgICAgICAgICAg QVNTRVJUKG1fbm9kZS0+b3AoKSAhPSBSZWdFeHBNYXRjaEZhc3QpOwogCi0gICAgICAgICAgICAv LyBUaGlzIHdpbGwgb25seSB3b3JrIGlmIHdlIGNhbiBwcm92ZSB3aGF0IHRoZSB2YWx1ZSBvZiBs YXN0SW5kZXggaXMuIFRvIGRvIHRoaXMKLSAgICAgICAgICAgIC8vIHNhZmVseSwgd2UgbmVlZCB0 byBleGVjdXRlIHRoZSBpbnNlcnRpb24gc2V0IHNvIHRoYXQgd2Ugc2VlIGFueSBwcmV2aW91cyBz dHJlbmd0aAotICAgICAgICAgICAgLy8gcmVkdWN0aW9ucy4gVGhpcyBpcyBuZWVkZWQgZm9yIHNv dW5kbmVzcyBzaW5jZSBvdGhlcndpc2UgdGhlIGVmZmVjdGZ1bG5lc3Mgb2YgYW55Ci0gICAgICAg ICAgICAvLyBwcmV2aW91cyBzdHJlbmd0aCByZWR1Y3Rpb25zIHdvdWxkIGJlIGludmlzaWJsZSB0 byB1cy4KLSAgICAgICAgICAgIEFTU0VSVChyZWdFeHBPYmplY3ROb2RlKTsKLSAgICAgICAgICAg IGV4ZWN1dGVJbnNlcnRpb25TZXQoKTsKICAgICAgICAgICAgIHVuc2lnbmVkIGxhc3RJbmRleCA9 IFVJTlRfTUFYOwotICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBvdGhlck5vZGVJbmRleCA9IG1f bm9kZUluZGV4OyBvdGhlck5vZGVJbmRleC0tOykgewotICAgICAgICAgICAgICAgIE5vZGUqIG90 aGVyTm9kZSA9IG1fYmxvY2stPmF0KG90aGVyTm9kZUluZGV4KTsKLSAgICAgICAgICAgICAgICBp ZiAob3RoZXJOb2RlID09IHJlZ0V4cE9iamVjdE5vZGUpIHsKLSAgICAgICAgICAgICAgICAgICAg bGFzdEluZGV4ID0gMDsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBp ZiAobV9ub2RlLT5vcCgpICE9IFJlZ0V4cEV4ZWNOb25HbG9iYWxPclN0aWNreSkgeworICAgICAg ICAgICAgICAgIC8vIFRoaXMgd2lsbCBvbmx5IHdvcmsgaWYgd2UgY2FuIHByb3ZlIHdoYXQgdGhl IHZhbHVlIG9mIGxhc3RJbmRleCBpcy4gVG8gZG8gdGhpcworICAgICAgICAgICAgICAgIC8vIHNh ZmVseSwgd2UgbmVlZCB0byBleGVjdXRlIHRoZSBpbnNlcnRpb24gc2V0IHNvIHRoYXQgd2Ugc2Vl IGFueSBwcmV2aW91cyBzdHJlbmd0aAorICAgICAgICAgICAgICAgIC8vIHJlZHVjdGlvbnMuIFRo aXMgaXMgbmVlZGVkIGZvciBzb3VuZG5lc3Mgc2luY2Ugb3RoZXJ3aXNlIHRoZSBlZmZlY3RmdWxu ZXNzIG9mIGFueQorICAgICAgICAgICAgICAgIC8vIHByZXZpb3VzIHN0cmVuZ3RoIHJlZHVjdGlv bnMgd291bGQgYmUgaW52aXNpYmxlIHRvIHVzLgorICAgICAgICAgICAgICAgIEFTU0VSVChyZWdF eHBPYmplY3ROb2RlKTsKKyAgICAgICAgICAgICAgICBleGVjdXRlSW5zZXJ0aW9uU2V0KCk7Cisg ICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBvdGhlck5vZGVJbmRleCA9IG1fbm9kZUluZGV4 OyBvdGhlck5vZGVJbmRleC0tOykgeworICAgICAgICAgICAgICAgICAgICBOb2RlKiBvdGhlck5v ZGUgPSBtX2Jsb2NrLT5hdChvdGhlck5vZGVJbmRleCk7CisgICAgICAgICAgICAgICAgICAgIGlm IChvdGhlck5vZGUgPT0gcmVnRXhwT2JqZWN0Tm9kZSkgeworICAgICAgICAgICAgICAgICAgICAg ICAgbGFzdEluZGV4ID0gMDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGlmIChvdGhlck5vZGUtPm9wKCkg PT0gU2V0UmVnRXhwT2JqZWN0TGFzdEluZGV4CisgICAgICAgICAgICAgICAgICAgICAgICAmJiBv dGhlck5vZGUtPmNoaWxkMSgpID09IHJlZ0V4cE9iamVjdE5vZGUKKyAgICAgICAgICAgICAgICAg ICAgICAgICYmIG90aGVyTm9kZS0+Y2hpbGQyKCktPmlzSW50MzJDb25zdGFudCgpCisgICAgICAg ICAgICAgICAgICAgICAgICAmJiBvdGhlck5vZGUtPmNoaWxkMigpLT5hc0ludDMyKCkgPj0gMCkg eworICAgICAgICAgICAgICAgICAgICAgICAgbGFzdEluZGV4ID0gb3RoZXJOb2RlLT5jaGlsZDIo KS0+YXNVSW50MzIoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGlmICh3cml0ZXNPdmVybGFwKG1fZ3Jh cGgsIG90aGVyTm9kZSwgUmVnRXhwT2JqZWN0X2xhc3RJbmRleCkpCisgICAgICAgICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgaWYgKG90 aGVyTm9kZS0+b3AoKSA9PSBTZXRSZWdFeHBPYmplY3RMYXN0SW5kZXgKLSAgICAgICAgICAgICAg ICAgICAgJiYgb3RoZXJOb2RlLT5jaGlsZDEoKSA9PSByZWdFeHBPYmplY3ROb2RlCi0gICAgICAg ICAgICAgICAgICAgICYmIG90aGVyTm9kZS0+Y2hpbGQyKCktPmlzSW50MzJDb25zdGFudCgpCi0g ICAgICAgICAgICAgICAgICAgICYmIG90aGVyTm9kZS0+Y2hpbGQyKCktPmFzSW50MzIoKSA+PSAw KSB7Ci0gICAgICAgICAgICAgICAgICAgIGxhc3RJbmRleCA9IHN0YXRpY19jYXN0PHVuc2lnbmVk PihvdGhlck5vZGUtPmNoaWxkMigpLT5hc0ludDMyKCkpOworICAgICAgICAgICAgICAgIGlmIChs YXN0SW5kZXggPT0gVUlOVF9NQVgpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHZlcmJvc2Up CisgICAgICAgICAgICAgICAgICAgICAgICBkYXRhTG9nKCJHaXZpbmcgdXAgYmVjYXVzZSB0aGUg bGFzdCBpbmRleCBpcyBub3Qga25vd24uXG4iKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGlmICh3cml0ZXNPdmVybGFwKG1f Z3JhcGgsIG90aGVyTm9kZSwgUmVnRXhwT2JqZWN0X2xhc3RJbmRleCkpCi0gICAgICAgICAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKGxhc3RJbmRleCA9 PSBVSU5UX01BWCkgewotICAgICAgICAgICAgICAgIGlmICh2ZXJib3NlKQotICAgICAgICAgICAg ICAgICAgICBkYXRhTG9nKCJHaXZpbmcgdXAgYmVjYXVzZSB0aGUgbGFzdCBpbmRleCBpcyBub3Qg a25vd24uXG4iKTsKLSAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIGlmICghcmVnRXhwLT5nbG9iYWxPclN0aWNreSgpKQogICAgICAgICAgICAgICAgIGxh c3RJbmRleCA9IDA7Cg==