135782 2014-08-08 18:21:22 -0700 for-in optimization should also make sure the base matches the object being iterated 2014-08-18 18:32:35 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 135812 1 mhahnenberg mhahnenberg fpizlo ggaren mark.lam oldest_to_newest 1028030 0 mhahnenberg 2014-08-08 18:21:22 -0700 Fix on its way... 1028031 1 236329 mhahnenberg 2014-08-08 18:23:45 -0700 Created attachment 236329 Patch 1028044 2 236331 mhahnenberg 2014-08-08 23:00:43 -0700 Created attachment 236331 Patch 1028235 3 236331 ggaren 2014-08-11 11:25:48 -0700 Comment on attachment 236331 Patch r=me 1028262 4 236331 commit-queue 2014-08-11 12:00:04 -0700 Comment on attachment 236331 Patch Clearing flags on attachment: 236331 Committed r172401: <http://trac.webkit.org/changeset/172401> 1028263 5 commit-queue 2014-08-11 12:00:07 -0700 All reviewed patches have been landed. Closing bug. 1028271 6 mark.lam 2014-08-11 12:28:19 -0700 The new test in this patch is failing on 32-bit: http://build.webkit.org/builders/Apple%20Mavericks%2032-bit%20JSC%20%28BuildAndTest%29/builds/3491/steps/webkit-32bit-jsc-test/logs/stdio 1028278 7 mark.lam 2014-08-11 12:49:40 -0700 Looks like this is not just a 32-bit issue: http://build.webkit.org/builders/Apple%20Mavericks%20Release%20WK1%20%28Tests%29/builds/7945 1028285 8 commit-queue 2014-08-11 12:56:51 -0700 Re-opened since this is blocked by bug 135812 1028293 9 mark.lam 2014-08-11 13:17:10 -0700 Looks like there's a bug in the test. "for (var p in a) {" should be "for (var p in b) {". Currently re-testing before re-landing. 1028327 10 ggaren 2014-08-11 14:47:05 -0700 <rdar://problem/17793974> 1028328 11 ggaren 2014-08-11 14:47:19 -0700 Sorry, ignore that Radar link. 1028332 12 mark.lam 2014-08-11 15:01:09 -0700 Patch re-landed in r172413: <http://trac.webkit.org/r172413>. 1029929 13 fpizlo 2014-08-18 18:32:35 -0700 This was a 50% regression on string-fasta. 236329 2014-08-08 18:23:45 -0700 2014-08-08 23:00:39 -0700 Patch bug-135782-20140808182335.patch text/plain 10462 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTcyMzcwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBA CisyMDE0LTA4LTA4ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgZm9yLWluIG9wdGltaXphdGlvbiBzaG91bGQgYWxzbyBtYWtlIHN1cmUgdGhlIGJh c2UgbWF0Y2hlcyB0aGUgb2JqZWN0IGJlaW5nIGl0ZXJhdGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU3ODIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiB3ZSBhY2Nlc3MgYSBkaWZmZXJlbnQgYmFz ZSBvYmplY3Qgd2l0aCB0aGUgc2FtZSBpbmRleCwgd2Ugc2hvdWxkbid0IHRyeSB0byByYW5kb21s eSAKKyAgICAgICAgbG9hZCBmcm9tIHRoYXQgb2JqZWN0J3MgYmFja2luZyBzdG9yZS4KKworICAg ICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHA6CisgICAgICAgIChKU0M6 OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0R2V0QnlWYWwpOgorICAgICAgICAoSlNDOjpCeXRlY29k ZUdlbmVyYXRvcjo6cHVzaEluZGV4ZWRGb3JJblNjb3BlKToKKyAgICAgICAgKEpTQzo6Qnl0ZWNv ZGVHZW5lcmF0b3I6OnB1c2hTdHJ1Y3R1cmVGb3JJblNjb3BlKToKKyAgICAgICAgKiBieXRlY29t cGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaDoKKyAgICAgICAgKEpTQzo6Rm9ySW5Db250ZXh0OjpG b3JJbkNvbnRleHQpOgorICAgICAgICAoSlNDOjpGb3JJbkNvbnRleHQ6OmJhc2UpOgorICAgICAg ICAoSlNDOjpTdHJ1Y3R1cmVGb3JJbkNvbnRleHQ6OlN0cnVjdHVyZUZvckluQ29udGV4dCk6Cisg ICAgICAgIChKU0M6OkluZGV4ZWRGb3JJbkNvbnRleHQ6OkluZGV4ZWRGb3JJbkNvbnRleHQpOgor ICAgICAgICAqIGJ5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwOgorICAgICAgICAoSlNDOjpG b3JJbk5vZGU6OmVtaXRNdWx0aUxvb3BCeXRlY29kZSk6CisgICAgICAgICogZGZnL0RGR1NwZWN1 bGF0aXZlSklUNjQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21w aWxlKToKKyAgICAgICAgKiBqaXQvSklUT3Bjb2Rlcy5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6 ZW1pdF9vcF9oYXNfc3RydWN0dXJlX3Byb3BlcnR5KToKKyAgICAgICAgKEpTQzo6SklUOjplbWl0 X29wX25leHRfZW51bWVyYXRvcl9wbmFtZSk6CisgICAgICAgICogdGVzdHMvc3RyZXNzL2Zvci1p bi10ZXN0cy5qczoKKwogMjAxNC0wOC0wNyAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNv bT4KIAogICAgICAgICBDcmVhdGUgYSBtb3JlIGdlbmVyaWMgd2F5IGZvciBWTUVudHJ5U2NvcGUg dG8gbm90aWZ5IHRob3NlIGludGVyZXN0ZWQgdGhhdCBpdCB3aWxsIGJlIGRlc3Ryb3llZApJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRl Y29kZUdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDE3MjMyNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNDQ1LDYgKzE0NDUsOSBAQCBSZWdpc3RlcklEKiBCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdEdl dEJ5CiB7CiAgICAgZm9yIChzaXplX3QgaSA9IG1fZm9ySW5Db250ZXh0U3RhY2suc2l6ZSgpOyBp ID4gMDsgaS0tKSB7CiAgICAgICAgIEZvckluQ29udGV4dCogY29udGV4dCA9IG1fZm9ySW5Db250 ZXh0U3RhY2tbaSAtIDFdLmdldCgpOworICAgICAgICBpZiAoY29udGV4dC0+YmFzZSgpICE9IGJh c2UpCisgICAgICAgICAgICBjb250aW51ZTsKKwogICAgICAgICBpZiAoY29udGV4dC0+bG9jYWwo KSAhPSBwcm9wZXJ0eSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCkBAIC0yNjIwLDExICsyNjIz LDExIEBAIFJlZ2lzdGVySUQqIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0VG9JbmQKICAgICByZXR1 cm4gZHN0OwogfQogCi12b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjpwdXNoSW5kZXhlZEZvckluU2Nv cGUoUmVnaXN0ZXJJRCogbG9jYWxSZWdpc3RlciwgUmVnaXN0ZXJJRCogaW5kZXhSZWdpc3RlcikK K3ZvaWQgQnl0ZWNvZGVHZW5lcmF0b3I6OnB1c2hJbmRleGVkRm9ySW5TY29wZShSZWdpc3RlcklE KiBiYXNlUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGxvY2FsUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGlu ZGV4UmVnaXN0ZXIpCiB7CiAgICAgaWYgKCFsb2NhbFJlZ2lzdGVyKQogICAgICAgICByZXR1cm47 Ci0gICAgbV9mb3JJbkNvbnRleHRTdGFjay5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxJbmRleGVk Rm9ySW5Db250ZXh0Pihsb2NhbFJlZ2lzdGVyLCBpbmRleFJlZ2lzdGVyKSk7CisgICAgbV9mb3JJ bkNvbnRleHRTdGFjay5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxJbmRleGVkRm9ySW5Db250ZXh0 PihiYXNlUmVnaXN0ZXIsIGxvY2FsUmVnaXN0ZXIsIGluZGV4UmVnaXN0ZXIpKTsKIH0KIAogdm9p ZCBCeXRlY29kZUdlbmVyYXRvcjo6cG9wSW5kZXhlZEZvckluU2NvcGUoUmVnaXN0ZXJJRCogbG9j YWxSZWdpc3RlcikKQEAgLTI2MzQsMTEgKzI2MzcsMTEgQEAgdm9pZCBCeXRlY29kZUdlbmVyYXRv cjo6cG9wSW5kZXhlZEZvckluUwogICAgIG1fZm9ySW5Db250ZXh0U3RhY2sucmVtb3ZlTGFzdCgp OwogfQogCi12b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjpwdXNoU3RydWN0dXJlRm9ySW5TY29wZShS ZWdpc3RlcklEKiBsb2NhbFJlZ2lzdGVyLCBSZWdpc3RlcklEKiBpbmRleFJlZ2lzdGVyLCBSZWdp c3RlcklEKiBwcm9wZXJ0eVJlZ2lzdGVyLCBSZWdpc3RlcklEKiBlbnVtZXJhdG9yUmVnaXN0ZXIp Cit2b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjpwdXNoU3RydWN0dXJlRm9ySW5TY29wZShSZWdpc3Rl cklEKiBiYXNlUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGxvY2FsUmVnaXN0ZXIsIFJlZ2lzdGVySUQq IGluZGV4UmVnaXN0ZXIsIFJlZ2lzdGVySUQqIHByb3BlcnR5UmVnaXN0ZXIsIFJlZ2lzdGVySUQq IGVudW1lcmF0b3JSZWdpc3RlcikKIHsKICAgICBpZiAoIWxvY2FsUmVnaXN0ZXIpCiAgICAgICAg IHJldHVybjsKLSAgICBtX2ZvckluQ29udGV4dFN0YWNrLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVl PFN0cnVjdHVyZUZvckluQ29udGV4dD4obG9jYWxSZWdpc3RlciwgaW5kZXhSZWdpc3RlciwgcHJv cGVydHlSZWdpc3RlciwgZW51bWVyYXRvclJlZ2lzdGVyKSk7CisgICAgbV9mb3JJbkNvbnRleHRT dGFjay5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxTdHJ1Y3R1cmVGb3JJbkNvbnRleHQ+KGJhc2VS ZWdpc3RlciwgbG9jYWxSZWdpc3RlciwgaW5kZXhSZWdpc3RlciwgcHJvcGVydHlSZWdpc3Rlciwg ZW51bWVyYXRvclJlZ2lzdGVyKSk7CiB9CiAKIHZvaWQgQnl0ZWNvZGVHZW5lcmF0b3I6OnBvcFN0 cnVjdHVyZUZvckluU2NvcGUoUmVnaXN0ZXJJRCogbG9jYWxSZWdpc3RlcikKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJh dG9yLmgJKHJldmlzaW9uIDE3MjMyNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29t cGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtOTksOCArOTksOSBA QCBuYW1lc3BhY2UgSlNDIHsKIAogICAgIGNsYXNzIEZvckluQ29udGV4dCB7CiAgICAgcHVibGlj OgotICAgICAgICBGb3JJbkNvbnRleHQoUmVnaXN0ZXJJRCogbG9jYWxSZWdpc3RlcikKLSAgICAg ICAgICAgIDogbV9sb2NhbFJlZ2lzdGVyKGxvY2FsUmVnaXN0ZXIpCisgICAgICAgIEZvckluQ29u dGV4dChSZWdpc3RlcklEKiBiYXNlUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGxvY2FsUmVnaXN0ZXIp CisgICAgICAgICAgICA6IG1fYmFzZVJlZ2lzdGVyKGJhc2VSZWdpc3RlcikKKyAgICAgICAgICAg ICwgbV9sb2NhbFJlZ2lzdGVyKGxvY2FsUmVnaXN0ZXIpCiAgICAgICAgICAgICAsIG1faXNWYWxp ZCh0cnVlKQogICAgICAgICB7CiAgICAgICAgIH0KQEAgLTExOCwxNyArMTE5LDE5IEBAIG5hbWVz cGFjZSBKU0MgewogICAgICAgICB9OwogICAgICAgICB2aXJ0dWFsIEZvckluQ29udGV4dFR5cGUg dHlwZSgpIGNvbnN0ID0gMDsKIAorICAgICAgICBSZWdpc3RlcklEKiBiYXNlKCkgY29uc3QgeyBy ZXR1cm4gbV9iYXNlUmVnaXN0ZXIuZ2V0KCk7IH0KICAgICAgICAgUmVnaXN0ZXJJRCogbG9jYWwo KSBjb25zdCB7IHJldHVybiBtX2xvY2FsUmVnaXN0ZXIuZ2V0KCk7IH0KIAogICAgIHByaXZhdGU6 CisgICAgICAgIFJlZlB0cjxSZWdpc3RlcklEPiBtX2Jhc2VSZWdpc3RlcjsKICAgICAgICAgUmVm UHRyPFJlZ2lzdGVySUQ+IG1fbG9jYWxSZWdpc3RlcjsKICAgICAgICAgYm9vbCBtX2lzVmFsaWQ7 CiAgICAgfTsKIAogICAgIGNsYXNzIFN0cnVjdHVyZUZvckluQ29udGV4dCA6IHB1YmxpYyBGb3JJ bkNvbnRleHQgewogICAgIHB1YmxpYzoKLSAgICAgICAgU3RydWN0dXJlRm9ySW5Db250ZXh0KFJl Z2lzdGVySUQqIGxvY2FsUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGluZGV4UmVnaXN0ZXIsIFJlZ2lz dGVySUQqIHByb3BlcnR5UmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGVudW1lcmF0b3JSZWdpc3RlcikK LSAgICAgICAgICAgIDogRm9ySW5Db250ZXh0KGxvY2FsUmVnaXN0ZXIpCisgICAgICAgIFN0cnVj dHVyZUZvckluQ29udGV4dChSZWdpc3RlcklEKiBiYXNlUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGxv Y2FsUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGluZGV4UmVnaXN0ZXIsIFJlZ2lzdGVySUQqIHByb3Bl cnR5UmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGVudW1lcmF0b3JSZWdpc3RlcikKKyAgICAgICAgICAg IDogRm9ySW5Db250ZXh0KGJhc2VSZWdpc3RlciwgbG9jYWxSZWdpc3RlcikKICAgICAgICAgICAg ICwgbV9pbmRleFJlZ2lzdGVyKGluZGV4UmVnaXN0ZXIpCiAgICAgICAgICAgICAsIG1fcHJvcGVy dHlSZWdpc3Rlcihwcm9wZXJ0eVJlZ2lzdGVyKQogICAgICAgICAgICAgLCBtX2VudW1lcmF0b3JS ZWdpc3RlcihlbnVtZXJhdG9yUmVnaXN0ZXIpCkBAIC0xNTIsOCArMTU1LDggQEAgbmFtZXNwYWNl IEpTQyB7CiAKICAgICBjbGFzcyBJbmRleGVkRm9ySW5Db250ZXh0IDogcHVibGljIEZvckluQ29u dGV4dCB7CiAgICAgcHVibGljOgotICAgICAgICBJbmRleGVkRm9ySW5Db250ZXh0KFJlZ2lzdGVy SUQqIGxvY2FsUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGluZGV4UmVnaXN0ZXIpCi0gICAgICAgICAg ICA6IEZvckluQ29udGV4dChsb2NhbFJlZ2lzdGVyKQorICAgICAgICBJbmRleGVkRm9ySW5Db250 ZXh0KFJlZ2lzdGVySUQqIGJhc2VSZWdpc3RlciwgUmVnaXN0ZXJJRCogbG9jYWxSZWdpc3Rlciwg UmVnaXN0ZXJJRCogaW5kZXhSZWdpc3RlcikKKyAgICAgICAgICAgIDogRm9ySW5Db250ZXh0KGJh c2VSZWdpc3RlciwgbG9jYWxSZWdpc3RlcikKICAgICAgICAgICAgICwgbV9pbmRleFJlZ2lzdGVy KGluZGV4UmVnaXN0ZXIpCiAgICAgICAgIHsKICAgICAgICAgfQpAQCAtNTI1LDkgKzUyOCw5IEBA IG5hbWVzcGFjZSBKU0MgewogICAgICAgICB2b2lkIHB1c2hGaW5hbGx5Q29udGV4dChTdGF0ZW1l bnROb2RlKiBmaW5hbGx5QmxvY2spOwogICAgICAgICB2b2lkIHBvcEZpbmFsbHlDb250ZXh0KCk7 CiAKLSAgICAgICAgdm9pZCBwdXNoSW5kZXhlZEZvckluU2NvcGUoUmVnaXN0ZXJJRCogbG9jYWws IFJlZ2lzdGVySUQqIGluZGV4KTsKKyAgICAgICAgdm9pZCBwdXNoSW5kZXhlZEZvckluU2NvcGUo UmVnaXN0ZXJJRCogYmFzZSwgUmVnaXN0ZXJJRCogbG9jYWwsIFJlZ2lzdGVySUQqIGluZGV4KTsK ICAgICAgICAgdm9pZCBwb3BJbmRleGVkRm9ySW5TY29wZShSZWdpc3RlcklEKiBsb2NhbCk7Ci0g ICAgICAgIHZvaWQgcHVzaFN0cnVjdHVyZUZvckluU2NvcGUoUmVnaXN0ZXJJRCogbG9jYWwsIFJl Z2lzdGVySUQqIGluZGV4LCBSZWdpc3RlcklEKiBwcm9wZXJ0eSwgUmVnaXN0ZXJJRCogZW51bWVy YXRvcik7CisgICAgICAgIHZvaWQgcHVzaFN0cnVjdHVyZUZvckluU2NvcGUoUmVnaXN0ZXJJRCog YmFzZSwgUmVnaXN0ZXJJRCogbG9jYWwsIFJlZ2lzdGVySUQqIGluZGV4LCBSZWdpc3RlcklEKiBw cm9wZXJ0eSwgUmVnaXN0ZXJJRCogZW51bWVyYXRvcik7CiAgICAgICAgIHZvaWQgcG9wU3RydWN0 dXJlRm9ySW5TY29wZShSZWdpc3RlcklEKiBsb2NhbCk7CiAgICAgICAgIHZvaWQgaW52YWxpZGF0 ZUZvckluQ29udGV4dEZvckxvY2FsKFJlZ2lzdGVySUQqIGxvY2FsKTsKIApJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcAko cmV2aXNpb24gMTcyMzI0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9O b2Rlc0NvZGVnZW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDQ0LDcgKzIwNDQsNyBAQCB2b2lk IEZvckluTm9kZTo6ZW1pdE11bHRpTG9vcEJ5dGVjb2RlKEJ5CiAgICAgICAgIGdlbmVyYXRvci5l bWl0VG9JbmRleFN0cmluZyhwcm9wZXJ0eU5hbWUuZ2V0KCksIGkuZ2V0KCkpOwogICAgICAgICB0 aGlzLT5lbWl0TG9vcEhlYWRlcihnZW5lcmF0b3IsIHByb3BlcnR5TmFtZS5nZXQoKSk7CiAKLSAg ICAgICAgZ2VuZXJhdG9yLnB1c2hJbmRleGVkRm9ySW5TY29wZShsb2NhbC5nZXQoKSwgaS5nZXQo KSk7CisgICAgICAgIGdlbmVyYXRvci5wdXNoSW5kZXhlZEZvckluU2NvcGUoYmFzZS5nZXQoKSwg bG9jYWwuZ2V0KCksIGkuZ2V0KCkpOwogICAgICAgICBnZW5lcmF0b3IuZW1pdE5vZGUoZHN0LCBt X3N0YXRlbWVudCk7CiAgICAgICAgIGdlbmVyYXRvci5wb3BJbmRleGVkRm9ySW5TY29wZShsb2Nh bC5nZXQoKSk7CiAKQEAgLTIwNzgsNyArMjA3OCw3IEBAIHZvaWQgRm9ySW5Ob2RlOjplbWl0TXVs dGlMb29wQnl0ZWNvZGUoQnkKIAogICAgICAgICB0aGlzLT5lbWl0TG9vcEhlYWRlcihnZW5lcmF0 b3IsIHByb3BlcnR5TmFtZS5nZXQoKSk7CiAKLSAgICAgICAgZ2VuZXJhdG9yLnB1c2hTdHJ1Y3R1 cmVGb3JJblNjb3BlKGxvY2FsLmdldCgpLCBpLmdldCgpLCBwcm9wZXJ0eU5hbWUuZ2V0KCksIHN0 cnVjdHVyZUVudW1lcmF0b3IuZ2V0KCkpOworICAgICAgICBnZW5lcmF0b3IucHVzaFN0cnVjdHVy ZUZvckluU2NvcGUoYmFzZS5nZXQoKSwgbG9jYWwuZ2V0KCksIGkuZ2V0KCksIHByb3BlcnR5TmFt ZS5nZXQoKSwgc3RydWN0dXJlRW51bWVyYXRvci5nZXQoKSk7CiAgICAgICAgIGdlbmVyYXRvci5l bWl0Tm9kZShkc3QsIG1fc3RhdGVtZW50KTsKICAgICAgICAgZ2VuZXJhdG9yLnBvcFN0cnVjdHVy ZUZvckluU2NvcGUobG9jYWwuZ2V0KCkpOwogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAJKHJldmlzaW9uIDE3MjMyNCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQ4ODgsNyArNDg4OCw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBp bGUoTm9kZSogbm9kZSkKICAgICAgICAgTWFjcm9Bc3NlbWJsZXI6Okp1bXAgaW5Cb3VuZHMgPSBt X2ppdC5icmFuY2gzMihNYWNyb0Fzc2VtYmxlcjo6QmVsb3csIAogICAgICAgICAgICAgaW5kZXhH UFIsIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKGVudW1lcmF0b3JHUFIsIEpTUHJvcGVydHlOYW1l RW51bWVyYXRvcjo6Y2FjaGVkUHJvcGVydHlOYW1lc0xlbmd0aE9mZnNldCgpKSk7CiAKLSAgICAg ICAgbV9qaXQubW92ZShNYWNyb0Fzc2VtYmxlcjo6VHJ1c3RlZEltbTMyKFZhbHVlTnVsbCksIHJl c3VsdEdQUik7CisgICAgICAgIG1faml0Lm1vdmUoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW02 NChKU1ZhbHVlOjplbmNvZGUoanNOdWxsKCkpKSwgcmVzdWx0R1BSKTsKIAogICAgICAgICBNYWNy b0Fzc2VtYmxlcjo6SnVtcCBkb25lID0gbV9qaXQuanVtcCgpOwogICAgICAgICBpbkJvdW5kcy5s aW5rKCZtX2ppdCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5j cHAJKHJldmlzaW9uIDE3MjMyNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bj b2Rlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMzEsNyArMTEzMSw3IEBAIHZvaWQgSklUOjpl bWl0X29wX2hhc19zdHJ1Y3R1cmVfcHJvcGVydHkKICAgICBsb2FkMzIoQWRkcmVzcyhyZWdUMCwg SlNDZWxsOjpzdHJ1Y3R1cmVJRE9mZnNldCgpKSwgcmVnVDApOwogICAgIGFkZFNsb3dDYXNlKGJy YW5jaDMyKE5vdEVxdWFsLCByZWdUMCwgQWRkcmVzcyhyZWdUMSwgSlNQcm9wZXJ0eU5hbWVFbnVt ZXJhdG9yOjpjYWNoZWRTdHJ1Y3R1cmVJRE9mZnNldCgpKSkpOwogICAgIAotICAgIG1vdmUoVHJ1 c3RlZEltbTMyKFZhbHVlVHJ1ZSksIHJlZ1QwKTsKKyAgICBtb3ZlKFRydXN0ZWRJbW02NChKU1Zh bHVlOjplbmNvZGUoanNCb29sZWFuKHRydWUpKSksIHJlZ1QwKTsKICAgICBlbWl0UHV0VmlydHVh bFJlZ2lzdGVyKGRzdCk7CiB9CiAKQEAgLTEzMjAsNyArMTMyMCw3IEBAIHZvaWQgSklUOjplbWl0 X29wX25leHRfZW51bWVyYXRvcl9wbmFtZSgKICAgICBlbWl0R2V0VmlydHVhbFJlZ2lzdGVyKGVu dW1lcmF0b3IsIHJlZ1QxKTsKICAgICBKdW1wIGluQm91bmRzID0gYnJhbmNoMzIoQmVsb3csIHJl Z1QwLCBBZGRyZXNzKHJlZ1QxLCBKU1Byb3BlcnR5TmFtZUVudW1lcmF0b3I6OmNhY2hlZFByb3Bl cnR5TmFtZXNMZW5ndGhPZmZzZXQoKSkpOwogCi0gICAgbW92ZShUcnVzdGVkSW1tMzIoVmFsdWVO dWxsKSwgcmVnVDApOworICAgIG1vdmUoVHJ1c3RlZEltbTY0KEpTVmFsdWU6OmVuY29kZShqc051 bGwoKSkpLCByZWdUMCk7CiAKICAgICBKdW1wIGRvbmUgPSBqdW1wKCk7CiAgICAgaW5Cb3VuZHMu bGluayh0aGlzKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvZm9y LWluLXRlc3RzLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9z dHJlc3MvZm9yLWluLXRlc3RzLmpzCShyZXZpc2lvbiAxNzIzMjQpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvdGVzdHMvc3RyZXNzL2Zvci1pbi10ZXN0cy5qcwkod29ya2luZyBjb3B5KQpAQCAt NzUsMyArNzUsMjQgQEAKICAgICB9CiAgICAgZm9vKG51bGwpOwogfSkoKTsKKyhmdW5jdGlvbigp IHsKKyAgICB2YXIgZm9vID0gZnVuY3Rpb24oYSwgYikgeworICAgICAgICBmb3IgKHZhciBwIGlu IGEpIHsKKyAgICAgICAgICAgIHZhciBmMSA9IGFbcF07CisgICAgICAgICAgICB2YXIgZjIgPSBi W3BdOworICAgICAgICAgICAgaWYgKGYxID09PSBmMikKKyAgICAgICAgICAgICAgICBjb250aW51 ZTsKKyAgICAgICAgICAgIGFbcF0gPSBiW3BdOworICAgICAgICB9CisgICAgfTsKKyAgICBub0lu bGluZShmb28pOworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgMTAwMDA7ICsraSkgeworICAgICAg ICB2YXIgbzEgPSB7fTsKKyAgICAgICAgdmFyIG8yID0ge307CisgICAgICAgIG8yLnggPSA0MjsK KyAgICAgICAgbzIueSA9IDUzOworICAgICAgICBmb28obzEsIG8yKTsKKyAgICAgICAgaWYgKG8x LnggIT09IG8yLnggJiYgbzEueSAhPT0gbzIueSkKKyAgICAgICAgICAgIHRocm93IG5ldyBFcnJv cigiYmFkIHJlc3VsdCIpOworICAgIH0KK30pKCk7Cg== 236331 2014-08-08 23:00:43 -0700 2014-08-11 12:00:04 -0700 Patch bug-135782-20140808230032.patch text/plain 8535 mhahnenberg SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTcyMzcxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDE0LTA4LTA4ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgZm9yLWluIG9wdGltaXphdGlvbiBzaG91bGQgYWxzbyBtYWtlIHN1cmUgdGhlIGJh c2UgbWF0Y2hlcyB0aGUgb2JqZWN0IGJlaW5nIGl0ZXJhdGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU3ODIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiB3ZSBhY2Nlc3MgYSBkaWZmZXJlbnQgYmFz ZSBvYmplY3Qgd2l0aCB0aGUgc2FtZSBpbmRleCwgd2Ugc2hvdWxkbid0IHRyeSB0byByYW5kb21s eSAKKyAgICAgICAgbG9hZCBmcm9tIHRoYXQgb2JqZWN0J3MgYmFja2luZyBzdG9yZS4KKworICAg ICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHA6CisgICAgICAgIChKU0M6 OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0R2V0QnlWYWwpOgorICAgICAgICAoSlNDOjpCeXRlY29k ZUdlbmVyYXRvcjo6cHVzaEluZGV4ZWRGb3JJblNjb3BlKToKKyAgICAgICAgKEpTQzo6Qnl0ZWNv ZGVHZW5lcmF0b3I6OnB1c2hTdHJ1Y3R1cmVGb3JJblNjb3BlKToKKyAgICAgICAgKiBieXRlY29t cGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaDoKKyAgICAgICAgKEpTQzo6Rm9ySW5Db250ZXh0OjpG b3JJbkNvbnRleHQpOgorICAgICAgICAoSlNDOjpGb3JJbkNvbnRleHQ6OmJhc2UpOgorICAgICAg ICAoSlNDOjpTdHJ1Y3R1cmVGb3JJbkNvbnRleHQ6OlN0cnVjdHVyZUZvckluQ29udGV4dCk6Cisg ICAgICAgIChKU0M6OkluZGV4ZWRGb3JJbkNvbnRleHQ6OkluZGV4ZWRGb3JJbkNvbnRleHQpOgor ICAgICAgICAqIGJ5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwOgorICAgICAgICAoSlNDOjpG b3JJbk5vZGU6OmVtaXRNdWx0aUxvb3BCeXRlY29kZSk6CisgICAgICAgICogdGVzdHMvc3RyZXNz L2Zvci1pbi10ZXN0cy5qczoKKwogMjAxNC0wOC0wNyAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFw cGxlLmNvbT4KIAogICAgICAgICBDcmVhdGUgYSBtb3JlIGdlbmVyaWMgd2F5IGZvciBWTUVudHJ5 U2NvcGUgdG8gbm90aWZ5IHRob3NlIGludGVyZXN0ZWQgdGhhdCBpdCB3aWxsIGJlIGRlc3Ryb3ll ZApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVy YXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxl ci9CeXRlY29kZUdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDE3MjM3MSkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xNDQ1LDYgKzE0NDUsOSBAQCBSZWdpc3RlcklEKiBCeXRlY29kZUdlbmVyYXRvcjo6 ZW1pdEdldEJ5CiB7CiAgICAgZm9yIChzaXplX3QgaSA9IG1fZm9ySW5Db250ZXh0U3RhY2suc2l6 ZSgpOyBpID4gMDsgaS0tKSB7CiAgICAgICAgIEZvckluQ29udGV4dCogY29udGV4dCA9IG1fZm9y SW5Db250ZXh0U3RhY2tbaSAtIDFdLmdldCgpOworICAgICAgICBpZiAoY29udGV4dC0+YmFzZSgp ICE9IGJhc2UpCisgICAgICAgICAgICBjb250aW51ZTsKKwogICAgICAgICBpZiAoY29udGV4dC0+ bG9jYWwoKSAhPSBwcm9wZXJ0eSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCkBAIC0yNjIwLDEx ICsyNjIzLDExIEBAIFJlZ2lzdGVySUQqIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0VG9JbmQKICAg ICByZXR1cm4gZHN0OwogfQogCi12b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjpwdXNoSW5kZXhlZEZv ckluU2NvcGUoUmVnaXN0ZXJJRCogbG9jYWxSZWdpc3RlciwgUmVnaXN0ZXJJRCogaW5kZXhSZWdp c3RlcikKK3ZvaWQgQnl0ZWNvZGVHZW5lcmF0b3I6OnB1c2hJbmRleGVkRm9ySW5TY29wZShSZWdp c3RlcklEKiBiYXNlUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGxvY2FsUmVnaXN0ZXIsIFJlZ2lzdGVy SUQqIGluZGV4UmVnaXN0ZXIpCiB7CiAgICAgaWYgKCFsb2NhbFJlZ2lzdGVyKQogICAgICAgICBy ZXR1cm47Ci0gICAgbV9mb3JJbkNvbnRleHRTdGFjay5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxJ bmRleGVkRm9ySW5Db250ZXh0Pihsb2NhbFJlZ2lzdGVyLCBpbmRleFJlZ2lzdGVyKSk7CisgICAg bV9mb3JJbkNvbnRleHRTdGFjay5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxJbmRleGVkRm9ySW5D b250ZXh0PihiYXNlUmVnaXN0ZXIsIGxvY2FsUmVnaXN0ZXIsIGluZGV4UmVnaXN0ZXIpKTsKIH0K IAogdm9pZCBCeXRlY29kZUdlbmVyYXRvcjo6cG9wSW5kZXhlZEZvckluU2NvcGUoUmVnaXN0ZXJJ RCogbG9jYWxSZWdpc3RlcikKQEAgLTI2MzQsMTEgKzI2MzcsMTEgQEAgdm9pZCBCeXRlY29kZUdl bmVyYXRvcjo6cG9wSW5kZXhlZEZvckluUwogICAgIG1fZm9ySW5Db250ZXh0U3RhY2sucmVtb3Zl TGFzdCgpOwogfQogCi12b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjpwdXNoU3RydWN0dXJlRm9ySW5T Y29wZShSZWdpc3RlcklEKiBsb2NhbFJlZ2lzdGVyLCBSZWdpc3RlcklEKiBpbmRleFJlZ2lzdGVy LCBSZWdpc3RlcklEKiBwcm9wZXJ0eVJlZ2lzdGVyLCBSZWdpc3RlcklEKiBlbnVtZXJhdG9yUmVn aXN0ZXIpCit2b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjpwdXNoU3RydWN0dXJlRm9ySW5TY29wZShS ZWdpc3RlcklEKiBiYXNlUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGxvY2FsUmVnaXN0ZXIsIFJlZ2lz dGVySUQqIGluZGV4UmVnaXN0ZXIsIFJlZ2lzdGVySUQqIHByb3BlcnR5UmVnaXN0ZXIsIFJlZ2lz dGVySUQqIGVudW1lcmF0b3JSZWdpc3RlcikKIHsKICAgICBpZiAoIWxvY2FsUmVnaXN0ZXIpCiAg ICAgICAgIHJldHVybjsKLSAgICBtX2ZvckluQ29udGV4dFN0YWNrLmFwcGVuZChzdGQ6Om1ha2Vf dW5pcXVlPFN0cnVjdHVyZUZvckluQ29udGV4dD4obG9jYWxSZWdpc3RlciwgaW5kZXhSZWdpc3Rl ciwgcHJvcGVydHlSZWdpc3RlciwgZW51bWVyYXRvclJlZ2lzdGVyKSk7CisgICAgbV9mb3JJbkNv bnRleHRTdGFjay5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxTdHJ1Y3R1cmVGb3JJbkNvbnRleHQ+ KGJhc2VSZWdpc3RlciwgbG9jYWxSZWdpc3RlciwgaW5kZXhSZWdpc3RlciwgcHJvcGVydHlSZWdp c3RlciwgZW51bWVyYXRvclJlZ2lzdGVyKSk7CiB9CiAKIHZvaWQgQnl0ZWNvZGVHZW5lcmF0b3I6 OnBvcFN0cnVjdHVyZUZvckluU2NvcGUoUmVnaXN0ZXJJRCogbG9jYWxSZWdpc3RlcikKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2Rl R2VuZXJhdG9yLmgJKHJldmlzaW9uIDE3MjM3MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtOTksOCAr OTksOSBAQCBuYW1lc3BhY2UgSlNDIHsKIAogICAgIGNsYXNzIEZvckluQ29udGV4dCB7CiAgICAg cHVibGljOgotICAgICAgICBGb3JJbkNvbnRleHQoUmVnaXN0ZXJJRCogbG9jYWxSZWdpc3RlcikK LSAgICAgICAgICAgIDogbV9sb2NhbFJlZ2lzdGVyKGxvY2FsUmVnaXN0ZXIpCisgICAgICAgIEZv ckluQ29udGV4dChSZWdpc3RlcklEKiBiYXNlUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGxvY2FsUmVn aXN0ZXIpCisgICAgICAgICAgICA6IG1fYmFzZVJlZ2lzdGVyKGJhc2VSZWdpc3RlcikKKyAgICAg ICAgICAgICwgbV9sb2NhbFJlZ2lzdGVyKGxvY2FsUmVnaXN0ZXIpCiAgICAgICAgICAgICAsIG1f aXNWYWxpZCh0cnVlKQogICAgICAgICB7CiAgICAgICAgIH0KQEAgLTExOCwxNyArMTE5LDE5IEBA IG5hbWVzcGFjZSBKU0MgewogICAgICAgICB9OwogICAgICAgICB2aXJ0dWFsIEZvckluQ29udGV4 dFR5cGUgdHlwZSgpIGNvbnN0ID0gMDsKIAorICAgICAgICBSZWdpc3RlcklEKiBiYXNlKCkgY29u c3QgeyByZXR1cm4gbV9iYXNlUmVnaXN0ZXIuZ2V0KCk7IH0KICAgICAgICAgUmVnaXN0ZXJJRCog bG9jYWwoKSBjb25zdCB7IHJldHVybiBtX2xvY2FsUmVnaXN0ZXIuZ2V0KCk7IH0KIAogICAgIHBy aXZhdGU6CisgICAgICAgIFJlZlB0cjxSZWdpc3RlcklEPiBtX2Jhc2VSZWdpc3RlcjsKICAgICAg ICAgUmVmUHRyPFJlZ2lzdGVySUQ+IG1fbG9jYWxSZWdpc3RlcjsKICAgICAgICAgYm9vbCBtX2lz VmFsaWQ7CiAgICAgfTsKIAogICAgIGNsYXNzIFN0cnVjdHVyZUZvckluQ29udGV4dCA6IHB1Ymxp YyBGb3JJbkNvbnRleHQgewogICAgIHB1YmxpYzoKLSAgICAgICAgU3RydWN0dXJlRm9ySW5Db250 ZXh0KFJlZ2lzdGVySUQqIGxvY2FsUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGluZGV4UmVnaXN0ZXIs IFJlZ2lzdGVySUQqIHByb3BlcnR5UmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGVudW1lcmF0b3JSZWdp c3RlcikKLSAgICAgICAgICAgIDogRm9ySW5Db250ZXh0KGxvY2FsUmVnaXN0ZXIpCisgICAgICAg IFN0cnVjdHVyZUZvckluQ29udGV4dChSZWdpc3RlcklEKiBiYXNlUmVnaXN0ZXIsIFJlZ2lzdGVy SUQqIGxvY2FsUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGluZGV4UmVnaXN0ZXIsIFJlZ2lzdGVySUQq IHByb3BlcnR5UmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGVudW1lcmF0b3JSZWdpc3RlcikKKyAgICAg ICAgICAgIDogRm9ySW5Db250ZXh0KGJhc2VSZWdpc3RlciwgbG9jYWxSZWdpc3RlcikKICAgICAg ICAgICAgICwgbV9pbmRleFJlZ2lzdGVyKGluZGV4UmVnaXN0ZXIpCiAgICAgICAgICAgICAsIG1f cHJvcGVydHlSZWdpc3Rlcihwcm9wZXJ0eVJlZ2lzdGVyKQogICAgICAgICAgICAgLCBtX2VudW1l cmF0b3JSZWdpc3RlcihlbnVtZXJhdG9yUmVnaXN0ZXIpCkBAIC0xNTIsOCArMTU1LDggQEAgbmFt ZXNwYWNlIEpTQyB7CiAKICAgICBjbGFzcyBJbmRleGVkRm9ySW5Db250ZXh0IDogcHVibGljIEZv ckluQ29udGV4dCB7CiAgICAgcHVibGljOgotICAgICAgICBJbmRleGVkRm9ySW5Db250ZXh0KFJl Z2lzdGVySUQqIGxvY2FsUmVnaXN0ZXIsIFJlZ2lzdGVySUQqIGluZGV4UmVnaXN0ZXIpCi0gICAg ICAgICAgICA6IEZvckluQ29udGV4dChsb2NhbFJlZ2lzdGVyKQorICAgICAgICBJbmRleGVkRm9y SW5Db250ZXh0KFJlZ2lzdGVySUQqIGJhc2VSZWdpc3RlciwgUmVnaXN0ZXJJRCogbG9jYWxSZWdp c3RlciwgUmVnaXN0ZXJJRCogaW5kZXhSZWdpc3RlcikKKyAgICAgICAgICAgIDogRm9ySW5Db250 ZXh0KGJhc2VSZWdpc3RlciwgbG9jYWxSZWdpc3RlcikKICAgICAgICAgICAgICwgbV9pbmRleFJl Z2lzdGVyKGluZGV4UmVnaXN0ZXIpCiAgICAgICAgIHsKICAgICAgICAgfQpAQCAtNTI1LDkgKzUy OCw5IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB2b2lkIHB1c2hGaW5hbGx5Q29udGV4dChT dGF0ZW1lbnROb2RlKiBmaW5hbGx5QmxvY2spOwogICAgICAgICB2b2lkIHBvcEZpbmFsbHlDb250 ZXh0KCk7CiAKLSAgICAgICAgdm9pZCBwdXNoSW5kZXhlZEZvckluU2NvcGUoUmVnaXN0ZXJJRCog bG9jYWwsIFJlZ2lzdGVySUQqIGluZGV4KTsKKyAgICAgICAgdm9pZCBwdXNoSW5kZXhlZEZvcklu U2NvcGUoUmVnaXN0ZXJJRCogYmFzZSwgUmVnaXN0ZXJJRCogbG9jYWwsIFJlZ2lzdGVySUQqIGlu ZGV4KTsKICAgICAgICAgdm9pZCBwb3BJbmRleGVkRm9ySW5TY29wZShSZWdpc3RlcklEKiBsb2Nh bCk7Ci0gICAgICAgIHZvaWQgcHVzaFN0cnVjdHVyZUZvckluU2NvcGUoUmVnaXN0ZXJJRCogbG9j YWwsIFJlZ2lzdGVySUQqIGluZGV4LCBSZWdpc3RlcklEKiBwcm9wZXJ0eSwgUmVnaXN0ZXJJRCog ZW51bWVyYXRvcik7CisgICAgICAgIHZvaWQgcHVzaFN0cnVjdHVyZUZvckluU2NvcGUoUmVnaXN0 ZXJJRCogYmFzZSwgUmVnaXN0ZXJJRCogbG9jYWwsIFJlZ2lzdGVySUQqIGluZGV4LCBSZWdpc3Rl cklEKiBwcm9wZXJ0eSwgUmVnaXN0ZXJJRCogZW51bWVyYXRvcik7CiAgICAgICAgIHZvaWQgcG9w U3RydWN0dXJlRm9ySW5TY29wZShSZWdpc3RlcklEKiBsb2NhbCk7CiAgICAgICAgIHZvaWQgaW52 YWxpZGF0ZUZvckluQ29udGV4dEZvckxvY2FsKFJlZ2lzdGVySUQqIGxvY2FsKTsKIApJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2Vu LmNwcAkocmV2aXNpb24gMTcyMzcxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21w aWxlci9Ob2Rlc0NvZGVnZW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDQ0LDcgKzIwNDQsNyBA QCB2b2lkIEZvckluTm9kZTo6ZW1pdE11bHRpTG9vcEJ5dGVjb2RlKEJ5CiAgICAgICAgIGdlbmVy YXRvci5lbWl0VG9JbmRleFN0cmluZyhwcm9wZXJ0eU5hbWUuZ2V0KCksIGkuZ2V0KCkpOwogICAg ICAgICB0aGlzLT5lbWl0TG9vcEhlYWRlcihnZW5lcmF0b3IsIHByb3BlcnR5TmFtZS5nZXQoKSk7 CiAKLSAgICAgICAgZ2VuZXJhdG9yLnB1c2hJbmRleGVkRm9ySW5TY29wZShsb2NhbC5nZXQoKSwg aS5nZXQoKSk7CisgICAgICAgIGdlbmVyYXRvci5wdXNoSW5kZXhlZEZvckluU2NvcGUoYmFzZS5n ZXQoKSwgbG9jYWwuZ2V0KCksIGkuZ2V0KCkpOwogICAgICAgICBnZW5lcmF0b3IuZW1pdE5vZGUo ZHN0LCBtX3N0YXRlbWVudCk7CiAgICAgICAgIGdlbmVyYXRvci5wb3BJbmRleGVkRm9ySW5TY29w ZShsb2NhbC5nZXQoKSk7CiAKQEAgLTIwNzgsNyArMjA3OCw3IEBAIHZvaWQgRm9ySW5Ob2RlOjpl bWl0TXVsdGlMb29wQnl0ZWNvZGUoQnkKIAogICAgICAgICB0aGlzLT5lbWl0TG9vcEhlYWRlcihn ZW5lcmF0b3IsIHByb3BlcnR5TmFtZS5nZXQoKSk7CiAKLSAgICAgICAgZ2VuZXJhdG9yLnB1c2hT dHJ1Y3R1cmVGb3JJblNjb3BlKGxvY2FsLmdldCgpLCBpLmdldCgpLCBwcm9wZXJ0eU5hbWUuZ2V0 KCksIHN0cnVjdHVyZUVudW1lcmF0b3IuZ2V0KCkpOworICAgICAgICBnZW5lcmF0b3IucHVzaFN0 cnVjdHVyZUZvckluU2NvcGUoYmFzZS5nZXQoKSwgbG9jYWwuZ2V0KCksIGkuZ2V0KCksIHByb3Bl cnR5TmFtZS5nZXQoKSwgc3RydWN0dXJlRW51bWVyYXRvci5nZXQoKSk7CiAgICAgICAgIGdlbmVy YXRvci5lbWl0Tm9kZShkc3QsIG1fc3RhdGVtZW50KTsKICAgICAgICAgZ2VuZXJhdG9yLnBvcFN0 cnVjdHVyZUZvckluU2NvcGUobG9jYWwuZ2V0KCkpOwogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvdGVzdHMvc3RyZXNzL2Zvci1pbi10ZXN0cy5qcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL2Zvci1pbi10ZXN0cy5qcwkocmV2aXNpb24gMTcy MzcxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9mb3ItaW4tdGVzdHMu anMJKHdvcmtpbmcgY29weSkKQEAgLTc1LDMgKzc1LDI2IEBACiAgICAgfQogICAgIGZvbyhudWxs KTsKIH0pKCk7CisoZnVuY3Rpb24oKSB7CisgICAgdmFyIGZvbyA9IGZ1bmN0aW9uKGEsIGIpIHsK KyAgICAgICAgZm9yICh2YXIgcCBpbiBhKSB7CisgICAgICAgICAgICB2YXIgZjEgPSBhW3BdOwor ICAgICAgICAgICAgdmFyIGYyID0gYltwXTsKKyAgICAgICAgICAgIGlmIChmMSA9PT0gZjIpCisg ICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBhW3BdID0gYltwXTsKKyAgICAg ICAgfQorICAgIH07CisgICAgbm9JbmxpbmUoZm9vKTsKKyAgICBmb3IgKHZhciBpID0gMDsgaSA8 IDEwMDAwOyArK2kpIHsKKyAgICAgICAgdmFyIG8xID0ge307CisgICAgICAgIHZhciBvMiA9IHt9 OworICAgICAgICBvMi54ID0gNDI7CisgICAgICAgIG8yLnkgPSA1MzsKKyAgICAgICAgZm9vKG8x LCBvMik7CisgICAgICAgIGlmIChvMS54ICE9PSBvMi54KQorICAgICAgICAgICAgdGhyb3cgbmV3 IEVycm9yKCJiYWQgcmVzdWx0OiAiICsgbzEueCArICIhPT0iICsgbzIueCk7CisgICAgICAgIGlm IChvMS55ICE9PSBvMi55KQorICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJiYWQgcmVzdWx0 OiAiICsgbzEueSArICIhPT0iICsgbzIueSk7CisgICAgfQorfSkoKTsK