136055 2014-08-18 17:53:18 -0700 DFG::freezeFragile should register the frozen value's structure 2015-07-01 18:31:56 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 133426 135750 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenb mmirman msaboff oliver sam oldest_to_newest 1029925 0 fpizlo 2014-08-18 17:53:18 -0700 ... 1105888 1 fpizlo 2015-06-30 16:33:13 -0700 I believe that we previously did not do this because of the suspicion that it might be worthwhile to sometimes track a value without tracking its structure. But right now all users of freeze() will eventually register the value's structure, except in cases where they obviously should but they obviously don't. That causes bugs. It would be easier to just make freeze() always register the structure and then not have any doubts about whose responsibility it is. 1105889 2 255873 fpizlo 2015-06-30 16:36:54 -0700 Created attachment 255873 the patch 1106111 3 255873 ggaren 2015-07-01 10:51:24 -0700 Comment on attachment 255873 the patch r=me 1106115 4 255873 mark.lam 2015-07-01 11:11:02 -0700 Comment on attachment 255873 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=255873&action=review > Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp:55 > for (FrozenValue* value : m_graph.m_frozenValues) > - registerStructure(value->structure()); > + m_graph.assertIsRegistered(value->structure()); According to Graph::freezeFragile() and FrozenValue::freeze(), we can freeze non-cell values. In those cases, value->structure() is a nullptr. Is this assertion valid without a nullcheck on value->structure() first? In Graph::assertIsRegistered(), it looks like it will deref the passed in structure without any checks. 1106119 5 fpizlo 2015-07-01 11:21:40 -0700 (In reply to comment #4) > Comment on attachment 255873 [details] > the patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255873&action=review > > > Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp:55 > > for (FrozenValue* value : m_graph.m_frozenValues) > > - registerStructure(value->structure()); > > + m_graph.assertIsRegistered(value->structure()); > > According to Graph::freezeFragile() and FrozenValue::freeze(), we can freeze > non-cell values. In those cases, value->structure() is a nullptr. Is this > assertion valid without a nullcheck on value->structure() first? In > Graph::assertIsRegistered(), it looks like it will deref the passed in > structure without any checks. Wow, good catch! It turns out that this works because assertIsRegistered() returns early before the end of the structure registration phase. So this is just a broken no-op! I'll fix and post a new patch. 1106274 6 fpizlo 2015-07-01 18:08:43 -0700 (In reply to comment #5) > (In reply to comment #4) > > Comment on attachment 255873 [details] > > the patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=255873&action=review > > > > > Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp:55 > > > for (FrozenValue* value : m_graph.m_frozenValues) > > > - registerStructure(value->structure()); > > > + m_graph.assertIsRegistered(value->structure()); > > > > According to Graph::freezeFragile() and FrozenValue::freeze(), we can freeze > > non-cell values. In those cases, value->structure() is a nullptr. Is this > > assertion valid without a nullcheck on value->structure() first? In > > Graph::assertIsRegistered(), it looks like it will deref the passed in > > structure without any checks. > > Wow, good catch! It turns out that this works because assertIsRegistered() > returns early before the end of the structure registration phase. So this > is just a broken no-op! I'll fix and post a new patch. And this revealed a bug. freezeFragile() was loading the structure and registering it, but then the act of freezing would load the structure a second time. That was racy. The fix is to load the structure only once. Posting new patch now... 1106275 7 255979 fpizlo 2015-07-01 18:09:06 -0700 Created attachment 255979 the patch 1106276 8 255979 mark.lam 2015-07-01 18:23:42 -0700 Comment on attachment 255979 the patch r=me 1106279 9 fpizlo 2015-07-01 18:31:56 -0700 Landed in http://trac.webkit.org/changeset/186215 255873 2015-06-30 16:36:54 -0700 2015-07-01 18:09:06 -0700 the patch blah.patch text/plain 4218 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg2MTQ3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDE1LTA2LTMwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHOjpmcmVlemVGcmFnaWxlIHNob3VsZCByZWdpc3RlciB0aGUgZnJvemVuIHZhbHVlJ3Mgc3Ry dWN0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzYwNTUKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjEwNDIxMjAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRoaXMgZml4ZXMgd2VpcmQg Y29uY3VycmVuY3kgYnVncyB3aGVyZSB0aGUgY29uc3RhbnQgZm9sZGluZyBwaGFzZSB0cmllcyB0 byBjb252ZXJ0CisgICAgICAgIHNvbWV0aGluZyB0byBhIGNvbnN0YW50IGJ1dCB0aGVuIGNyYXNo ZXMgYmVjYXVzZSB0aGUgY29uc3RhbnQncyBzdHJ1Y3R1cmUgd2Fzbid0CisgICAgICAgIHJlZ2lz dGVyZWQuIFRoZSBBSSB3YXMgcmVnaXN0ZXJpbmcgdGhlIHN0cnVjdHVyZSBvZiBhbnkgdmFsdWUg aXQgc2F3LCBidXQgY29uc3RhbnQgZm9sZGluZworICAgICAgICB3YXNuJ3QgLSBhbmQgdGhhdCdz IGZpbmUgc28gbG9uZyBhcyB0aGVyZSBhaW4ndCBubyBjb25jdXJyZW5jeS4KKyAgICAgICAgCisg ICAgICAgIFRoZSBiZXN0IGZpeCBpcyB0byBqdXN0IG1ha2UgaXQgaW1wb3NzaWJsZSB0byBpbnRy b2R1Y2UgYSBjb25zdGFudCBpbnRvIHRoZSBJUiB3aXRob3V0CisgICAgICAgIHJlZ2lzdGVyaW5n IGl0cyBzdHJ1Y3R1cmUuIFRoYXQncyB3aGF0IHRoaXMgY2hhbmdlIGRvZXMuIFRoaXMgaXMgbm90 IG9ubHkgYSBncmVhdAorICAgICAgICBjb25jdXJyZW5jeSBmaXggLSBpdCBhbHNvIG1ha2VzIHRo ZSBjb21waWxlciBzb21ld2hhdCBlYXNpZXIgdG8gaGFjayBvbiBiZWNhdXNlIGl0J3Mgb25lCisg ICAgICAgIGxlc3MgY2FzZSBvZiBzdHJ1Y3R1cmUgcmVnaXN0ZXJpbmcgdGhhdCB5b3UgaGF2ZSB0 byByZW1lbWJlciBhYm91dC4KKworICAgICAgICAqIGRmZy9ERkdBYnN0cmFjdFZhbHVlLmNwcDoK KyAgICAgICAgKEpTQzo6REZHOjpBYnN0cmFjdFZhbHVlOjpzZXRPU1JFbnRyeVZhbHVlKTogTm8g bmVlZCB0byByZWdpc3Rlci4KKyAgICAgICAgKEpTQzo6REZHOjpBYnN0cmFjdFZhbHVlOjpzZXQp OiBXZSBzdGlsbCBjYWxsIHJlZ2lzdGVyLCBidXQganVzdCB0byBnZXQgdGhlIHdhdGNocG9pbnQg c3RhdGUuCisgICAgICAgICogZGZnL0RGR0dyYXBoLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpH cmFwaDo6ZnJlZXplRnJhZ2lsZSk6IFJlZ2lzdGVyIHRoZSBzdHJ1Y3R1cmUuCisgICAgICAgICog ZGZnL0RGR1N0cnVjdHVyZVJlZ2lzdHJhdGlvblBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZH OjpTdHJ1Y3R1cmVSZWdpc3RyYXRpb25QaGFzZTo6cnVuKTogQXNzZXJ0IHRoYXQgdGhlc2UgYXJl IGFsbCByZWdpc3RlcmVkLgorCiAyMDE1LTA2LTMwICBCYXNpbGUgQ2xlbWVudCAgPGJhc2lsZV9j bGVtZW50QGFwcGxlLmNvbT4KIAogICAgICAgICBBbGxvdyBvYmplY3QgYWxsb2NhdGlvbiBzaW5r aW5nIHRocm91Z2ggR2V0U2NvcGUsIEdldEV4ZWN1dGFibGUgYW5kIFNraXBTY29wZSBub2RlcwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdFZhbHVlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0VmFsdWUuY3Bw CShyZXZpc2lvbiAxODYxMzQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3Ry YWN0VmFsdWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MSw3ICs1MSw2IEBAIHZvaWQgQWJzdHJh Y3RWYWx1ZTo6c2V0T1NSRW50cnlWYWx1ZShHcmEKIHsKICAgICBpZiAoISF2YWx1ZSAmJiB2YWx1 ZS52YWx1ZSgpLmlzQ2VsbCgpKSB7CiAgICAgICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gdmFs dWUuc3RydWN0dXJlKCk7Ci0gICAgICAgIGdyYXBoLnJlZ2lzdGVyU3RydWN0dXJlKHN0cnVjdHVy ZSk7CiAgICAgICAgIG1fc3RydWN0dXJlID0gc3RydWN0dXJlOwogICAgICAgICBtX2FycmF5TW9k ZXMgPSBhc0FycmF5TW9kZXMoc3RydWN0dXJlLT5pbmRleGluZ1R5cGUoKSk7CiAgICAgfSBlbHNl IHsKQEAgLTcwLDkgKzY5LDYgQEAgdm9pZCBBYnN0cmFjdFZhbHVlOjpzZXQoR3JhcGgmIGdyYXBo LCBjbwogewogICAgIGlmICghIXZhbHVlICYmIHZhbHVlLnZhbHVlKCkuaXNDZWxsKCkpIHsKICAg ICAgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSB2YWx1ZS5zdHJ1Y3R1cmUoKTsKLSAgICAgICAg Ly8gRklYTUU6IFRoaXMgY2hlY2sgbWF5IG5vdCBiZSBuZWNlc3Nhcnkgc2luY2UgYW55IGZyb3pl biB2YWx1ZSBzaG91bGQgaGF2ZSBpdHMgc3RydWN0dXJlCi0gICAgICAgIC8vIHdhdGNoZWQgYWxy ZWFkeS4KLSAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNjA1NQogICAgICAgICBpZiAoZ3JhcGgucmVnaXN0ZXJTdHJ1Y3R1cmUoc3RydWN0dXJlKSA9 PSBTdHJ1Y3R1cmVSZWdpc3RlcmVkQW5kV2F0Y2hlZCkgewogICAgICAgICAgICAgbV9zdHJ1Y3R1 cmUgPSBzdHJ1Y3R1cmU7CiAgICAgICAgICAgICBpZiAoY2xvYmJlclN0YXRlID09IFN0cnVjdHVy ZXNBcmVDbG9iYmVyZWQpIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHR3Jh cGguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHR3JhcGgu Y3BwCShyZXZpc2lvbiAxODYxMzQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dy YXBoLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIxNCw2ICsxMjE0LDkgQEAgRnJvemVuVmFsdWUq IEdyYXBoOjpmcmVlemVGcmFnaWxlKEpTVmFsdQogICAgIGlmICh2YWx1ZS5pc1VJbnQzMigpKQog ICAgICAgICBtX3VpbnQzMlZhbHVlc0luVXNlLmFwcGVuZCh2YWx1ZS5hc1VJbnQzMigpKTsKICAg ICAKKyAgICBpZiAoISF2YWx1ZSAmJiB2YWx1ZS5pc0NlbGwoKSkKKyAgICAgICAgcmVnaXN0ZXJT dHJ1Y3R1cmUodmFsdWUuYXNDZWxsKCktPnN0cnVjdHVyZSgpKTsKKyAgICAKICAgICByZXR1cm4g cmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IG1fZnJvemVuVmFsdWVzLmFkZChGcm96ZW5WYWx1ZTo6 ZnJlZXplKHZhbHVlKSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3RydWN0dXJlUmVnaXN0cmF0aW9uUGhhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3RydWN0dXJlUmVnaXN0cmF0aW9uUGhhc2UuY3BwCShyZXZpc2lv biAxODYxMzQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1N0cnVjdHVyZVJlZ2lz dHJhdGlvblBoYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTIsNyArNTIsNyBAQCBwdWJsaWM6 CiAgICAgICAgIHJlZ2lzdGVyU3RydWN0dXJlKG1fZ3JhcGgubV92bS5nZXR0ZXJTZXR0ZXJTdHJ1 Y3R1cmUuZ2V0KCkpOwogICAgICAgICAKICAgICAgICAgZm9yIChGcm96ZW5WYWx1ZSogdmFsdWUg OiBtX2dyYXBoLm1fZnJvemVuVmFsdWVzKQotICAgICAgICAgICAgcmVnaXN0ZXJTdHJ1Y3R1cmUo dmFsdWUtPnN0cnVjdHVyZSgpKTsKKyAgICAgICAgICAgIG1fZ3JhcGguYXNzZXJ0SXNSZWdpc3Rl cmVkKHZhbHVlLT5zdHJ1Y3R1cmUoKSk7CiAgICAgICAgIAogICAgICAgICBmb3IgKEJsb2NrSW5k ZXggYmxvY2tJbmRleCA9IG1fZ3JhcGgubnVtQmxvY2tzKCk7IGJsb2NrSW5kZXgtLTspIHsKICAg ICAgICAgICAgIEJhc2ljQmxvY2sqIGJsb2NrID0gbV9ncmFwaC5ibG9jayhibG9ja0luZGV4KTsK 255979 2015-07-01 18:09:06 -0700 2015-07-01 18:23:42 -0700 the patch blah.patch text/plain 5595 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg2MTQ3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDE1LTA2LTMwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHOjpmcmVlemVGcmFnaWxlIHNob3VsZCByZWdpc3RlciB0aGUgZnJvemVuIHZhbHVlJ3Mgc3Ry dWN0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzYwNTUKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjEwNDIxMjAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRoaXMgZml4ZXMgd2VpcmQg Y29uY3VycmVuY3kgYnVncyB3aGVyZSB0aGUgY29uc3RhbnQgZm9sZGluZyBwaGFzZSB0cmllcyB0 byBjb252ZXJ0CisgICAgICAgIHNvbWV0aGluZyB0byBhIGNvbnN0YW50IGJ1dCB0aGVuIGNyYXNo ZXMgYmVjYXVzZSB0aGUgY29uc3RhbnQncyBzdHJ1Y3R1cmUgd2Fzbid0CisgICAgICAgIHJlZ2lz dGVyZWQuIFRoZSBBSSB3YXMgcmVnaXN0ZXJpbmcgdGhlIHN0cnVjdHVyZSBvZiBhbnkgdmFsdWUg aXQgc2F3LCBidXQgY29uc3RhbnQgZm9sZGluZworICAgICAgICB3YXNuJ3QgLSBhbmQgdGhhdCdz IGZpbmUgc28gbG9uZyBhcyB0aGVyZSBhaW4ndCBubyBjb25jdXJyZW5jeS4KKyAgICAgICAgCisg ICAgICAgIFRoZSBiZXN0IGZpeCBpcyB0byBqdXN0IG1ha2UgaXQgaW1wb3NzaWJsZSB0byBpbnRy b2R1Y2UgYSBjb25zdGFudCBpbnRvIHRoZSBJUiB3aXRob3V0CisgICAgICAgIHJlZ2lzdGVyaW5n IGl0cyBzdHJ1Y3R1cmUuIFRoYXQncyB3aGF0IHRoaXMgY2hhbmdlIGRvZXMuIFRoaXMgaXMgbm90 IG9ubHkgYSBncmVhdAorICAgICAgICBjb25jdXJyZW5jeSBmaXggLSBpdCBhbHNvIG1ha2VzIHRo ZSBjb21waWxlciBzb21ld2hhdCBlYXNpZXIgdG8gaGFjayBvbiBiZWNhdXNlIGl0J3Mgb25lCisg ICAgICAgIGxlc3MgY2FzZSBvZiBzdHJ1Y3R1cmUgcmVnaXN0ZXJpbmcgdGhhdCB5b3UgaGF2ZSB0 byByZW1lbWJlciBhYm91dC4KKworICAgICAgICAqIGRmZy9ERkdBYnN0cmFjdFZhbHVlLmNwcDoK KyAgICAgICAgKEpTQzo6REZHOjpBYnN0cmFjdFZhbHVlOjpzZXRPU1JFbnRyeVZhbHVlKTogTm8g bmVlZCB0byByZWdpc3Rlci4KKyAgICAgICAgKEpTQzo6REZHOjpBYnN0cmFjdFZhbHVlOjpzZXQp OiBXZSBzdGlsbCBjYWxsIHJlZ2lzdGVyLCBidXQganVzdCB0byBnZXQgdGhlIHdhdGNocG9pbnQg c3RhdGUuCisgICAgICAgICogZGZnL0RGR0dyYXBoLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpH cmFwaDo6ZnJlZXplRnJhZ2lsZSk6IFJlZ2lzdGVyIHRoZSBzdHJ1Y3R1cmUuCisgICAgICAgICog ZGZnL0RGR1N0cnVjdHVyZVJlZ2lzdHJhdGlvblBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZH OjpTdHJ1Y3R1cmVSZWdpc3RyYXRpb25QaGFzZTo6cnVuKTogQXNzZXJ0IHRoYXQgdGhlc2UgYXJl IGFsbCByZWdpc3RlcmVkLgorCiAyMDE1LTA2LTMwICBCYXNpbGUgQ2xlbWVudCAgPGJhc2lsZV9j bGVtZW50QGFwcGxlLmNvbT4KIAogICAgICAgICBBbGxvdyBvYmplY3QgYWxsb2NhdGlvbiBzaW5r aW5nIHRocm91Z2ggR2V0U2NvcGUsIEdldEV4ZWN1dGFibGUgYW5kIFNraXBTY29wZSBub2RlcwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdFZhbHVlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0VmFsdWUuY3Bw CShyZXZpc2lvbiAxODYxMzQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3Ry YWN0VmFsdWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MSw3ICs1MSw2IEBAIHZvaWQgQWJzdHJh Y3RWYWx1ZTo6c2V0T1NSRW50cnlWYWx1ZShHcmEKIHsKICAgICBpZiAoISF2YWx1ZSAmJiB2YWx1 ZS52YWx1ZSgpLmlzQ2VsbCgpKSB7CiAgICAgICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gdmFs dWUuc3RydWN0dXJlKCk7Ci0gICAgICAgIGdyYXBoLnJlZ2lzdGVyU3RydWN0dXJlKHN0cnVjdHVy ZSk7CiAgICAgICAgIG1fc3RydWN0dXJlID0gc3RydWN0dXJlOwogICAgICAgICBtX2FycmF5TW9k ZXMgPSBhc0FycmF5TW9kZXMoc3RydWN0dXJlLT5pbmRleGluZ1R5cGUoKSk7CiAgICAgfSBlbHNl IHsKQEAgLTcwLDkgKzY5LDYgQEAgdm9pZCBBYnN0cmFjdFZhbHVlOjpzZXQoR3JhcGgmIGdyYXBo LCBjbwogewogICAgIGlmICghIXZhbHVlICYmIHZhbHVlLnZhbHVlKCkuaXNDZWxsKCkpIHsKICAg ICAgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSB2YWx1ZS5zdHJ1Y3R1cmUoKTsKLSAgICAgICAg Ly8gRklYTUU6IFRoaXMgY2hlY2sgbWF5IG5vdCBiZSBuZWNlc3Nhcnkgc2luY2UgYW55IGZyb3pl biB2YWx1ZSBzaG91bGQgaGF2ZSBpdHMgc3RydWN0dXJlCi0gICAgICAgIC8vIHdhdGNoZWQgYWxy ZWFkeS4KLSAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNjA1NQogICAgICAgICBpZiAoZ3JhcGgucmVnaXN0ZXJTdHJ1Y3R1cmUoc3RydWN0dXJlKSA9 PSBTdHJ1Y3R1cmVSZWdpc3RlcmVkQW5kV2F0Y2hlZCkgewogICAgICAgICAgICAgbV9zdHJ1Y3R1 cmUgPSBzdHJ1Y3R1cmU7CiAgICAgICAgICAgICBpZiAoY2xvYmJlclN0YXRlID09IFN0cnVjdHVy ZXNBcmVDbG9iYmVyZWQpIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHR3Jh cGguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHR3JhcGgu Y3BwCShyZXZpc2lvbiAxODYxMzQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dy YXBoLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIxNCw3ICsxMjE0LDExIEBAIEZyb3plblZhbHVl KiBHcmFwaDo6ZnJlZXplRnJhZ2lsZShKU1ZhbHUKICAgICBpZiAodmFsdWUuaXNVSW50MzIoKSkK ICAgICAgICAgbV91aW50MzJWYWx1ZXNJblVzZS5hcHBlbmQodmFsdWUuYXNVSW50MzIoKSk7CiAg ICAgCi0gICAgcmV0dXJuIHJlc3VsdC5pdGVyYXRvci0+dmFsdWUgPSBtX2Zyb3plblZhbHVlcy5h ZGQoRnJvemVuVmFsdWU6OmZyZWV6ZSh2YWx1ZSkpOworICAgIEZyb3plblZhbHVlIGZyb3plblZh bHVlID0gRnJvemVuVmFsdWU6OmZyZWV6ZSh2YWx1ZSk7CisgICAgaWYgKFN0cnVjdHVyZSogc3Ry dWN0dXJlID0gZnJvemVuVmFsdWUuc3RydWN0dXJlKCkpCisgICAgICAgIHJlZ2lzdGVyU3RydWN0 dXJlKHN0cnVjdHVyZSk7CisgICAgCisgICAgcmV0dXJuIHJlc3VsdC5pdGVyYXRvci0+dmFsdWUg PSBtX2Zyb3plblZhbHVlcy5hZGQoZnJvemVuVmFsdWUpOwogfQogCiBGcm96ZW5WYWx1ZSogR3Jh cGg6OmZyZWV6ZShKU1ZhbHVlIHZhbHVlKQpAQCAtMTI1OCw2ICsxMjYyLDEwIEBAIFN0cnVjdHVy ZVJlZ2lzdHJhdGlvblJlc3VsdCBHcmFwaDo6cmVnaXMKIAogdm9pZCBHcmFwaDo6YXNzZXJ0SXNS ZWdpc3RlcmVkKFN0cnVjdHVyZSogc3RydWN0dXJlKQogeworICAgIC8vIEl0J3MgY29udmVuaWVu dCB0byBiZSBhYmxlIHRvIGNhbGwgdGhpcyB3aXRoIGEgbWF5YmUtbnVsbCBzdHJ1Y3R1cmUuCisg ICAgaWYgKCFzdHJ1Y3R1cmUpCisgICAgICAgIHJldHVybjsKKyAgICAKICAgICBpZiAobV9zdHJ1 Y3R1cmVSZWdpc3RyYXRpb25TdGF0ZSA9PSBIYXZlTm90U3RhcnRlZFJlZ2lzdGVyaW5nKQogICAg ICAgICByZXR1cm47CiAgICAgCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1N0 cnVjdHVyZVJlZ2lzdHJhdGlvblBoYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR1N0cnVjdHVyZVJlZ2lzdHJhdGlvblBoYXNlLmNwcAkocmV2aXNpb24g MTg2MTM0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTdHJ1Y3R1cmVSZWdpc3Ry YXRpb25QaGFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0LDExIEBAIHB1YmxpYzoK ICAgICAKICAgICBib29sIHJ1bigpCiAgICAgeworICAgICAgICAvLyBXZSBuZWVkIHRvIHNldCB0 aGlzIGJlZm9yZSB0aGlzIHBoYXNlIGZpbmlzaGVzLiBUaGlzIHBoYXNlIGRvZXNuJ3QgZG8gYW55 dGhpbmcKKyAgICAgICAgLy8gY29uZGl0aW9uZWQgb24gdGhpcyBmaWVsZCwgZXhjZXB0IGZvciBh c3NlcnRJc1JlZ2lzdGVyZWQoKSBiZWxvdy4gV2UgaW50ZW5kIGZvciB0aGF0CisgICAgICAgIC8v IG1ldGhvZCB0byBiZWhhdmUgYXMgaWYgdGhlIHBoYXNlIHdhcyBhbHJlYWR5IGZpbmlzaGVkLiBT bywgd2Ugc2V0IHRoaXMgdXAgaGVyZS4KKyAgICAgICAgbV9ncmFwaC5tX3N0cnVjdHVyZVJlZ2lz dHJhdGlvblN0YXRlID0gQWxsU3RydWN0dXJlc0FyZVJlZ2lzdGVyZWQ7CisgICAgICAgIAogICAg ICAgICAvLyBUaGVzZSBhcmUgcHJldHR5IGR1bWIsIGJ1dCBuZWVkZWQgdG8gcGxhY2F0ZSBzdWJz ZXF1ZW50IGFzc2VydGlvbnMuIFdlIGRvbid0IGFjdHVhbGx5CiAgICAgICAgIC8vIGhhdmUgdG8g d2F0Y2ggdGhlc2UgYmVjYXVzZSB0aGVyZSBpcyBubyB3YXkgdG8gdHJhbnNpdGlvbiBhd2F5IGZy b20gaXQsIGJ1dCB0aGV5IGFyZQogICAgICAgICAvLyB3YXRjaGFibGUgYW5kIHNvIHdlIHdpbGwg YXNzZXJ0IGlmIHRoZXkgYXJlbid0IHdhdGNoZWQuCkBAIC01Miw3ICs1Nyw3IEBAIHB1YmxpYzoK ICAgICAgICAgcmVnaXN0ZXJTdHJ1Y3R1cmUobV9ncmFwaC5tX3ZtLmdldHRlclNldHRlclN0cnVj dHVyZS5nZXQoKSk7CiAgICAgICAgIAogICAgICAgICBmb3IgKEZyb3plblZhbHVlKiB2YWx1ZSA6 IG1fZ3JhcGgubV9mcm96ZW5WYWx1ZXMpCi0gICAgICAgICAgICByZWdpc3RlclN0cnVjdHVyZSh2 YWx1ZS0+c3RydWN0dXJlKCkpOworICAgICAgICAgICAgbV9ncmFwaC5hc3NlcnRJc1JlZ2lzdGVy ZWQodmFsdWUtPnN0cnVjdHVyZSgpKTsKICAgICAgICAgCiAgICAgICAgIGZvciAoQmxvY2tJbmRl eCBibG9ja0luZGV4ID0gbV9ncmFwaC5udW1CbG9ja3MoKTsgYmxvY2tJbmRleC0tOykgewogICAg ICAgICAgICAgQmFzaWNCbG9jayogYmxvY2sgPSBtX2dyYXBoLmJsb2NrKGJsb2NrSW5kZXgpOwpA QCAtMTQxLDggKzE0Niw2IEBAIHB1YmxpYzoKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAg ICAgICAKLSAgICAgICAgbV9ncmFwaC5tX3N0cnVjdHVyZVJlZ2lzdHJhdGlvblN0YXRlID0gQWxs U3RydWN0dXJlc0FyZVJlZ2lzdGVyZWQ7Ci0gICAgICAgIAogICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICB9CiAK