181299 2018-01-04 11:58:15 -0800 Do value profiling in to_this 2018-01-04 21:13:18 -0800 1 1 1 Unclassified WebKit JavaScriptCore Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff rmorisset ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1385874 0 saam 2018-01-04 11:58:15 -0800 When looping over node, for ToThis, we should assign node to ToThis->child1().node(). Also, we should extend the heuristic for https://bugs.webkit.org/show_bug.cgi?id=181296 to also account for GetLocal. 1385994 1 saam 2018-01-04 16:52:36 -0800 (In reply to Saam Barati from comment #0) > When looping over node, for ToThis, we should assign node to > ToThis->child1().node(). > Also, we should extend the heuristic for > https://bugs.webkit.org/show_bug.cgi?id=181296 to also account for GetLocal. We should not do this. But we should have ToThis do value profiling. Right now, we do this stupid thing (for strict mode): ToThis(@something prediction SpecObjectOther) Will say the ToThis produces SpecObjectOther. But really, who knows what this produces. SpecObjectOther means the thing could have a custom toThis that does arbitrary things. 1386008 2 330505 saam 2018-01-04 18:24:23 -0800 Created attachment 330505 patch 1386053 3 330505 commit-queue 2018-01-04 21:12:55 -0800 Comment on attachment 330505 patch Clearing flags on attachment: 330505 Committed r226436: <https://trac.webkit.org/changeset/226436> 1386054 4 commit-queue 2018-01-04 21:12:57 -0800 All reviewed patches have been landed. Closing bug. 1386055 5 webkit-bug-importer 2018-01-04 21:13:18 -0800 <rdar://problem/36313127> 330505 2018-01-04 18:24:23 -0800 2018-01-04 21:12:55 -0800 patch c-backup.diff text/plain 10806 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjI2NDMyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBA CisyMDE4LTAxLTA0ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IERvIHZhbHVlIHByb2ZpbGluZyBpbiB0b190aGlzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODEyOTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgdmFsdWUgcHJvZmlsaW5nIHRv IHRvX3RoaXMuIFdlIHVzZSB0aGUgcmVzdWx0IG9mIHRoZSB2YWx1ZQorICAgICAgICBwcm9maWxp bmcgb25seSBmb3Igc3RyaWN0IG1vZGUgY29kZSB3aGVuIHdlIGRvbid0IHByZWRpY3QgdGhhdCB0 aGUgaW5wdXQgaXMKKyAgICAgICAgb2YgYSBzcGVjaWZpYyB0eXBlLiBUaGlzIGhlbHBzIHdoZW4g dGhlIGlucHV0IGlzIFNwZWNDZWxsT3RoZXIuIFN1Y2ggY2VsbHMKKyAgICAgICAgbWlnaHQgaW1w bGVtZW50IGEgY3VzdG9tIFRvVGhpcywgd2hpY2ggY2FuIHByb2R1Y2UgYW4gYXJiaXRyYXJ5IHJl c3VsdC4gQmVmb3JlCisgICAgICAgIHRoaXMgcGF0Y2gsIGluIHByZWRpY3Rpb24gcHJvcGFnYXRp b24sIHdlIHdlcmUgc2F5aW5nIHRoYXQgYSBUb1RoaXMgd2l0aCBhCisgICAgICAgIFNwZWNDZWxs T3RoZXIgaW5wdXQgYWxzbyBwcm9kdWNlZCBTcGVjQ2VsbE90aGVyLiBIb3dldmVyLCB0aGlzIGlz IGluY29ycmVjdCwKKyAgICAgICAgZ2l2ZW4gdGhhdCB0aGUgaW5wdXQgbWF5IGltcGxlbWVudCBU b1RoaXMgdGhhdCBwcm9kdWNlcyBhbiBhcmJpdHJhcnkgcmVzdWx0LgorICAgICAgICBUaGlzIGlz IHNlZW4gaW5zaWRlIFNwZWVkb21ldGVyLiBUaGlzIHBhdGNoIGZpeGVzIGFuIE9TUiBleGl0IGxv b3AgaW4gU3BlZWRvbWV0ZXIuCisgICAgICAgIAorICAgICAgICBJbnRlcmVzdGluZ2x5LCB0aGlz IHBhdGNoIG9ubHkgZG9lcyB2YWx1ZSBwcm9maWxpbmcgb24gdGhlIHNsb3cgcGF0aC4gVGhlIGZh c3QKKyAgICAgICAgcGF0aCBvZiB0b190aGlzIGluIHRoZSBMTEludC9iYXNlbGluZSBqdXN0IHBl cmZvcm0gYSBzdHJ1Y3R1cmUgY2hlY2suIElmIGl0CisgICAgICAgIHBhc3NlcywgdGhlIHJlc3Vs dCBpcyB0aGUgc2FtZSBhcyB0aGUgaW5wdXQuIFRoZXJlZm9yZSwgZG9pbmcgdmFsdWUgcHJvZmls aW5nCisgICAgICAgIGZyb20gdGhlIGZhc3QgcGF0aCB3b3VsZG4ndCBhY3R1YWxseSBwcm9kdWNl IG5ldyBpbmZvcm1hdGlvbiBmb3IgdGhlIFZhbHVlUHJvZmlsZS4KKworICAgICAgICAqIGJ5dGVj b2RlL0J5dGVjb2RlRHVtcGVyLmNwcDoKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVEdW1wZXI8Qmxv Y2s+OjpkdW1wQnl0ZWNvZGUpOgorICAgICAgICAqIGJ5dGVjb2RlL0J5dGVjb2RlTGlzdC5qc29u OgorICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChKU0M6OkNvZGVC bG9jazo6ZmluaXNoQ3JlYXRpb24pOgorICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdl bmVyYXRvci5jcHA6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjpCeXRlY29kZUdl bmVyYXRvcik6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0VG9UaGlzKToK KyAgICAgICAgKiBieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaDoKKyAgICAgICAgKiBk ZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFy c2VyOjpwYXJzZUJsb2NrKToKKyAgICAgICAgKiBkZmcvREZHTm9kZS5oOgorICAgICAgICAoSlND OjpERkc6Ok5vZGU6Omhhc0hlYXBQcmVkaWN0aW9uKToKKyAgICAgICAgKiBkZmcvREZHUHJlZGlj dGlvblByb3BhZ2F0aW9uUGhhc2UuY3BwOgorICAgICAgICAqIHJ1bnRpbWUvQ29tbW9uU2xvd1Bh dGhzLmNwcDoKKyAgICAgICAgKEpTQzo6U0xPV19QQVRIX0RFQ0wpOgorCiAyMDE4LTAxLTA0ICBK RiBCYXN0aWVuICA8amZiYXN0aWVuQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYXNzZW1ibGVy IHN1cHBvcnQgZm9yIHg4NiBsZmVuY2UgYW5kIHNmZW5jZQpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlRHVtcGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVEdW1wZXIuY3BwCShyZXZpc2lvbiAyMjYz NzEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVEdW1wZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC03MDUsNiArNzA1LDcgQEAgdm9pZCBCeXRlY29kZUR1bXBlcjxC bG9jaz46OmR1bXBCeXRlY29kZQogICAgICAgICBpZiAoc3RydWN0dXJlKQogICAgICAgICAgICAg b3V0LnByaW50KCIsIGNhY2hlKHN0cnVjdCA9ICIsIFJhd1BvaW50ZXIoc3RydWN0dXJlKSwgIiki KTsKICAgICAgICAgb3V0LnByaW50KCIsICIsIGdldFRvVGhpc1N0YXR1cygqKCsraXQpKSk7Cisg ICAgICAgIGR1bXBWYWx1ZVByb2ZpbGluZyhvdXQsIGl0LCBoYXNQcmludGVkUHJvZmlsaW5nKTsK ICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGNhc2Ugb3BfY2hlY2tfdGR6OiB7CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNvZGVMaXN0Lmpzb24KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5dGVjb2RlTGlzdC5qc29uCShy ZXZpc2lvbiAyMjYzNzEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQnl0ZWNv ZGVMaXN0Lmpzb24JKHdvcmtpbmcgY29weSkKQEAgLTE1LDcgKzE1LDcgQEAKICAgICAgICAgICAg ICAgICAgICAgICAgIHsiY2FjaGVkQ2FsbGVlIiA6ICJXcml0ZUJhcnJpZXI8SlNDZWxsPiJ9XX0s CiAgICAgICAgICAgICB7ICJuYW1lIiA6ICJvcF9nZXRfYXJndW1lbnQiLCAibGVuZ3RoIiA6IDQg fSwKICAgICAgICAgICAgIHsgIm5hbWUiIDogIm9wX2FyZ3VtZW50X2NvdW50IiwgImxlbmd0aCIg OiAyIH0sCi0gICAgICAgICAgICB7ICJuYW1lIiA6ICJvcF90b190aGlzIiwgImxlbmd0aCIgOiA0 IH0sCisgICAgICAgICAgICB7ICJuYW1lIiA6ICJvcF90b190aGlzIiwgImxlbmd0aCIgOiA1IH0s CiAgICAgICAgICAgICB7ICJuYW1lIiA6ICJvcF9jaGVja190ZHoiLCAibGVuZ3RoIiA6IDIgfSwK ICAgICAgICAgICAgIHsgIm5hbWUiIDogIm9wX25ld19vYmplY3QiLCAibGVuZ3RoIiA6IDQgfSwK ICAgICAgICAgICAgIHsgIm5hbWUiIDogIm9wX25ld19hcnJheSIsICJsZW5ndGgiIDogNSB9LApJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9jay5jcHAJKHJl dmlzaW9uIDIyNjM3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxv Y2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NzQsNiArNTc0LDExIEBAIGJvb2wgQ29kZUJsb2Nr OjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIFMKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 CiAKKyAgICAgICAgY2FzZSBvcF90b190aGlzOiB7CisgICAgICAgICAgICBsaW5rVmFsdWVQcm9m aWxlKGksIG9wTGVuZ3RoKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisKICAgICAg ICAgY2FzZSBvcF9pbjoKICAgICAgICAgY2FzZSBvcF9wdXRfYnlfdmFsOgogICAgICAgICBjYXNl IG9wX3B1dF9ieV92YWxfZGlyZWN0OiB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcAkocmV2aXNpb24g MjI2MzcxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdl bmVyYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4OSwxMSArNTg5LDcgQEAgQnl0ZWNvZGVH ZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKFZNJgogCiAgICAgICAgIC8vIEZJWE1FOiBFbWl0 IHRvX3RoaXMgb25seSB3aGVuIEdlbmVyYXRvciB1c2VzIGl0LgogICAgICAgICAvLyBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxNTg2Ci0gICAgICAgIG1fY29kZUJs b2NrLT5hZGRQcm9wZXJ0eUFjY2Vzc0luc3RydWN0aW9uKGluc3RydWN0aW9ucygpLnNpemUoKSk7 Ci0gICAgICAgIGVtaXRPcGNvZGUob3BfdG9fdGhpcyk7Ci0gICAgICAgIGluc3RydWN0aW9ucygp LmFwcGVuZChraWxsKCZtX3RoaXNSZWdpc3RlcikpOwotICAgICAgICBpbnN0cnVjdGlvbnMoKS5h cHBlbmQoMCk7Ci0gICAgICAgIGluc3RydWN0aW9ucygpLmFwcGVuZCgwKTsKKyAgICAgICAgZW1p dFRvVGhpcygpOwogCiAgICAgICAgIGVtaXRNb3ZlKG1fZ2VuZXJhdG9yUmVnaXN0ZXIsICZtX2Nh bGxlZVJlZ2lzdGVyKTsKICAgICAgICAgZW1pdENyZWF0ZVRoaXMobV9nZW5lcmF0b3JSZWdpc3Rl cik7CkBAIC02MTEsMTEgKzYwNyw3IEBAIEJ5dGVjb2RlR2VuZXJhdG9yOjpCeXRlY29kZUdlbmVy YXRvcihWTSYKICAgICAgICAgaWYgKHBhcnNlTW9kZSAhPSBTb3VyY2VQYXJzZU1vZGU6OkFzeW5j QXJyb3dGdW5jdGlvbk1vZGUpIHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBFbWl0IHRvX3RoaXMg b25seSB3aGVuIEFzeW5jRnVuY3Rpb25Cb2R5IHVzZXMgaXQuCiAgICAgICAgICAgICAvLyBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxNTg2Ci0gICAgICAgICAgICBt X2NvZGVCbG9jay0+YWRkUHJvcGVydHlBY2Nlc3NJbnN0cnVjdGlvbihpbnN0cnVjdGlvbnMoKS5z aXplKCkpOwotICAgICAgICAgICAgZW1pdE9wY29kZShvcF90b190aGlzKTsKLSAgICAgICAgICAg IGluc3RydWN0aW9ucygpLmFwcGVuZChraWxsKCZtX3RoaXNSZWdpc3RlcikpOwotICAgICAgICAg ICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKDApOwotICAgICAgICAgICAgaW5zdHJ1Y3Rpb25zKCku YXBwZW5kKDApOworICAgICAgICAgICAgZW1pdFRvVGhpcygpOwogICAgICAgICB9CiAKICAgICAg ICAgZW1pdE5ld09iamVjdChtX2dlbmVyYXRvclJlZ2lzdGVyKTsKQEAgLTY3NywxMyArNjY5LDgg QEAgQnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKFZNJgogICAgICAgICAgICAg ICAgICAgICBzaG91bGRFbWl0VG9UaGlzID0gdHJ1ZTsKICAgICAgICAgICAgICAgICB9CiAKLSAg ICAgICAgICAgICAgICBpZiAoc2hvdWxkRW1pdFRvVGhpcykgewotICAgICAgICAgICAgICAgICAg ICBtX2NvZGVCbG9jay0+YWRkUHJvcGVydHlBY2Nlc3NJbnN0cnVjdGlvbihpbnN0cnVjdGlvbnMo KS5zaXplKCkpOwotICAgICAgICAgICAgICAgICAgICBlbWl0T3Bjb2RlKG9wX3RvX3RoaXMpOwot ICAgICAgICAgICAgICAgICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoa2lsbCgmbV90aGlzUmVn aXN0ZXIpKTsKLSAgICAgICAgICAgICAgICAgICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKDApOwot ICAgICAgICAgICAgICAgICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoMCk7Ci0gICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIGlmIChzaG91bGRFbWl0VG9UaGlzKQorICAgICAgICAg ICAgICAgICAgICBlbWl0VG9UaGlzKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAg ICAgYnJlYWs7CkBAIC01MjI2LDYgKzUyMTMsMTYgQEAgdm9pZCBJbmRleGVkRm9ySW5Db250ZXh0 OjpmaW5hbGl6ZShCeXRlYwogICAgIH0KIH0KIAordm9pZCBCeXRlY29kZUdlbmVyYXRvcjo6ZW1p dFRvVGhpcygpCit7CisgICAgbV9jb2RlQmxvY2stPmFkZFByb3BlcnR5QWNjZXNzSW5zdHJ1Y3Rp b24oaW5zdHJ1Y3Rpb25zKCkuc2l6ZSgpKTsKKyAgICBVbmxpbmtlZFZhbHVlUHJvZmlsZSBwcm9m aWxlID0gZW1pdFByb2ZpbGVkT3Bjb2RlKG9wX3RvX3RoaXMpOworICAgIGluc3RydWN0aW9ucygp LmFwcGVuZChraWxsKCZtX3RoaXNSZWdpc3RlcikpOworICAgIGluc3RydWN0aW9ucygpLmFwcGVu ZCgwKTsKKyAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQoMCk7CisgICAgaW5zdHJ1Y3Rpb25zKCku YXBwZW5kKHByb2ZpbGUpOworfQorCiB9IC8vIG5hbWVzcGFjZSBKU0MKIAogbmFtZXNwYWNlIFdU RiB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2Vu ZXJhdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxl ci9CeXRlY29kZUdlbmVyYXRvci5oCShyZXZpc2lvbiAyMjYzNzEpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmgJKHdvcmtpbmcgY29weSkK QEAgLTk2Nyw2ICs5NjcsOCBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgYm9vbCBpc05ld1Rh cmdldFVzZWRJbklubmVyQXJyb3dGdW5jdGlvbigpOwogICAgICAgICBib29sIGlzQXJndW1lbnRz VXNlZEluSW5uZXJBcnJvd0Z1bmN0aW9uKCk7CiAKKyAgICAgICAgdm9pZCBlbWl0VG9UaGlzKCk7 CisKICAgICBwdWJsaWM6CiAgICAgICAgIGJvb2wgaXNTdXBlclVzZWRJbklubmVyQXJyb3dGdW5j dGlvbigpOwogICAgICAgICBib29sIGlzU3VwZXJDYWxsVXNlZEluSW5uZXJBcnJvd0Z1bmN0aW9u KCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFy c2VyLmNwcAkocmV2aXNpb24gMjI2MzcxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdCeXRlQ29kZVBhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzNjAsNyArNDM2MCw3IEBA IHZvaWQgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQKICAgICAgICAgICAgICAg ICAgICAgfHwgbV9pbmxpbmVTdGFja1RvcC0+bV9wcm9maWxlZEJsb2NrLT5jb3VsZFRha2VTbG93 Q2FzZShtX2N1cnJlbnRJbmRleCkKICAgICAgICAgICAgICAgICAgICAgfHwgbV9pbmxpbmVTdGFj a1RvcC0+bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkQ2FjaGUp CiAgICAgICAgICAgICAgICAgICAgIHx8IChvcDEtPm9wKCkgPT0gR2V0TG9jYWwgJiYgb3AxLT52 YXJpYWJsZUFjY2Vzc0RhdGEoKS0+c3RydWN0dXJlQ2hlY2tIb2lzdGluZ0ZhaWxlZCgpKSkgewot ICAgICAgICAgICAgICAgICAgICBzZXRUaGlzKGFkZFRvR3JhcGgoVG9UaGlzLCBvcDEpKTsKKyAg ICAgICAgICAgICAgICAgICAgc2V0VGhpcyhhZGRUb0dyYXBoKFRvVGhpcywgT3BJbmZvKCksIE9w SW5mbyhnZXRQcmVkaWN0aW9uKCkpLCBvcDEpKTsKICAgICAgICAgICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgICAgICAgICBhZGRUb0dyYXBoKAogICAgICAgICAgICAgICAgICAgICAgICAg Q2hlY2tTdHJ1Y3R1cmUsCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaAkocmV2 aXNpb24gMjI2MzcxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgJKHdv cmtpbmcgY29weSkKQEAgLTE1OTMsNiArMTU5Myw3IEBAIHB1YmxpYzoKICAgICAgICAgY2FzZSBB dG9taWNzWG9yOgogICAgICAgICBjYXNlIEdldER5bmFtaWNWYXI6CiAgICAgICAgIGNhc2UgRXh0 cmFjdFZhbHVlRnJvbVdlYWtNYXBHZXQ6CisgICAgICAgIGNhc2UgVG9UaGlzOgogICAgICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdh dGlvblBoYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlLmNwcAkocmV2aXNpb24gMjI2MzcxKQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdQcmVkaWN0aW9uUHJvcGFnYXRpb25QaGFzZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQ0MiwxMyArNDQyLDEzIEBAIHByaXZhdGU6CiAgICAgICAgICAg ICB9CiAKICAgICAgICAgICAgIFNwZWN1bGF0ZWRUeXBlIHByZWRpY3Rpb24gPSBub2RlLT5jaGls ZDEoKS0+cHJlZGljdGlvbigpOwotICAgICAgICAgICAgaWYgKHByZWRpY3Rpb24pIHsKKyAgICAg ICAgICAgIGlmIChlY21hTW9kZSA9PSBTdHJpY3RNb2RlKQorICAgICAgICAgICAgICAgIGNoYW5n ZWQgfD0gbWVyZ2VQcmVkaWN0aW9uKG5vZGUtPmdldEhlYXBQcmVkaWN0aW9uKCkpOworICAgICAg ICAgICAgZWxzZSBpZiAocHJlZGljdGlvbikgewogICAgICAgICAgICAgICAgIGlmIChwcmVkaWN0 aW9uICYgflNwZWNPYmplY3QpIHsKICAgICAgICAgICAgICAgICAgICAgLy8gV3JhcHBlciBvYmpl Y3RzIGFyZSBjcmVhdGVkIG9ubHkgaW4gc2xvcHB5IG1vZGUuCi0gICAgICAgICAgICAgICAgICAg IGlmIChlY21hTW9kZSAhPSBTdHJpY3RNb2RlKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBw cmVkaWN0aW9uICY9IFNwZWNPYmplY3Q7Ci0gICAgICAgICAgICAgICAgICAgICAgICBwcmVkaWN0 aW9uID0gbWVyZ2VTcGVjdWxhdGlvbnMocHJlZGljdGlvbiwgU3BlY09iamVjdE90aGVyKTsKLSAg ICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBwcmVkaWN0aW9uICY9IFNw ZWNPYmplY3Q7CisgICAgICAgICAgICAgICAgICAgIHByZWRpY3Rpb24gPSBtZXJnZVNwZWN1bGF0 aW9ucyhwcmVkaWN0aW9uLCBTcGVjT2JqZWN0T3RoZXIpOwogICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgICAgICBjaGFuZ2VkIHw9IG1lcmdlUHJlZGljdGlvbihwcmVkaWN0aW9uKTsKICAg ICAgICAgICAgIH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNs b3dQYXRocy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv Q29tbW9uU2xvd1BhdGhzLmNwcAkocmV2aXNpb24gMjI2MzcxKQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjY3 LDcgKzI2NywxMyBAQCBTTE9XX1BBVEhfREVDTChzbG93X3BhdGhfdG9fdGhpcykKICAgICAgICAg cGNbM10udS50b1RoaXNTdGF0dXMgPSBUb1RoaXNDb25mbGljdGVkOwogICAgICAgICBwY1syXS51 LnN0cnVjdHVyZS5jbGVhcigpOwogICAgIH0KLSAgICBSRVRVUk4odjEudG9UaGlzKGV4ZWMsIGV4 ZWMtPmNvZGVCbG9jaygpLT5pc1N0cmljdE1vZGUoKSA/IFN0cmljdE1vZGUgOiBOb3RTdHJpY3RN b2RlKSk7CisgICAgLy8gTm90ZTogV2Ugb25seSBuZWVkIHRvIGRvIHRoaXMgdmFsdWUgcHJvZmls aW5nIGhlcmUgb24gdGhlIHNsb3cgcGF0aC4gVGhlIGZhc3QgcGF0aAorICAgIC8vIGp1c3QgcmV0 dXJucyB0aGUgaW5wdXQgdG8gdG9fdGhpcyBpZiB0aGUgc3RydWN0dXJlIGNoZWNrIHN1Y2NlZWRz LiBJZiB0aGUgc3RydWN0dXJlCisgICAgLy8gY2hlY2sgc3VjY2VlZHMsIGRvaW5nIHZhbHVlIHBy b2ZpbGluZyBoZXJlIGlzIGVxdWl2YWxlbnQgdG8gZG9pbmcgaXQgd2l0aCBhIHBvdGVudGlhbGx5 CisgICAgLy8gZGlmZmVyZW50IG9iamVjdCB0aGF0IHN0aWxsIGhhcyB0aGUgc2FtZSBzdHJ1Y3R1 cmUgb24gdGhlIGZhc3QgcGF0aCBzaW5jZSBpdCdsbCBwcm9kdWNlCisgICAgLy8gdGhlIHNhbWUg U3BlY3VsYXRlZFR5cGUuIFRoZXJlZm9yZSwgd2UgZG9uJ3QgbmVlZCB0byB3b3JyeSBhYm91dCB2 YWx1ZSBwcm9maWxpbmcgb24gdGhlCisgICAgLy8gZmFzdCBwYXRoLgorICAgIFJFVFVSTl9QUk9G SUxFRChvcF90b190aGlzLCB2MS50b1RoaXMoZXhlYywgZXhlYy0+Y29kZUJsb2NrKCktPmlzU3Ry aWN0TW9kZSgpID8gU3RyaWN0TW9kZSA6IE5vdFN0cmljdE1vZGUpKTsKIH0KIAogU0xPV19QQVRI X0RFQ0woc2xvd19wYXRoX3Rocm93X3Rkel9lcnJvcikK