157213 2016-04-29 16:16:37 -0700 ToThis should be able to be eliminated in Constant Folding 2016-05-02 11:20:06 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 keith_miller keith_miller commit-queue mark.lam msaboff saam oldest_to_newest 1188847 0 keith_miller 2016-04-29 16:16:37 -0700 ToThis should be able to be eliminated in Constant Folding 1188986 1 277790 keith_miller 2016-04-29 20:44:51 -0700 Created attachment 277790 Patch 1189253 2 277790 saam 2016-05-01 16:11:25 -0700 Comment on attachment 277790 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=277790&action=review r=me > Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h:146 > + ASSERT(!isStrictMode ? (type.type() != StringType && type.type() != SymbolType) : true); I think this is easier to read as: if (!strictMode) ASSERT(type.type() != StringType && type.type() != SymbolType) 1189415 3 277910 keith_miller 2016-05-02 09:38:44 -0700 Created attachment 277910 Patch for landing 1189416 4 277790 keith_miller 2016-05-02 09:40:03 -0700 Comment on attachment 277790 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=277790&action=review >> Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h:146 >> + ASSERT(!isStrictMode ? (type.type() != StringType && type.type() != SymbolType) : true); > > I think this is easier to read as: > if (!strictMode) > ASSERT(type.type() != StringType && type.type() != SymbolType) I agree, although I actually changed it to: if (!isStrictMode) ASSERT(type.isObjet()); 1189427 5 277910 commit-queue 2016-05-02 10:37:42 -0700 Comment on attachment 277910 Patch for landing Clearing flags on attachment: 277910 Committed r200325: <http://trac.webkit.org/changeset/200325> 1189428 6 commit-queue 2016-05-02 10:37:45 -0700 All reviewed patches have been landed. Closing bug. 1189439 7 277910 ggaren 2016-05-02 11:20:06 -0700 Comment on attachment 277910 Patch for landing Seems like we want a performance regression test for this improvement too. 277790 2016-04-29 20:44:51 -0700 2016-05-02 09:38:38 -0700 Patch bug-157213-20160429204524.patch text/plain 7628 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5OTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw NTVhOWJmMzNiMjM3OTliOGNjMmFjY2ZiMGVmMGI3Yjg5OGRjZDcyLi4zMWZkMDM1NjEzYzdkZWUw MWNiMzBhM2NjMGZmM2M1NzYxNDU5N2Y2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNSBAQAorMjAxNi0wNC0yOSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBUb1RoaXMgc2hvdWxkIGJlIGFibGUgdG8gYmUgZWxpbWluYXRlZCBp biBDb25zdGFudCBGb2xkaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTcyMTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIGVuYWJsZXMgZWxpbWluYXRpbmcgdGhlIFRvVGhpcyB2YWx1 ZSB3aGVuIHdlIGhhdmUgYWJzdHJhY3QgaW50ZXJwcmV0ZXIKKyAgICAgICAgaW5kaWNhdGVzIHRo ZSBub2RlIGlzIG5vdCBuZWVkZWQuIFNpbmNlIHRoZXJlIGFyZSBPYmplY3RzIHRoYXQgb3ZlcnJp ZGUgdGhlaXIKKyAgICAgICAgVG9UaGlzIGJlaGF2aW9yIHdlIGZpcnN0IGNoZWNrIGlmIHdlIGNh biBlbGltaW5hdGUgdGhlIG5vZGUgYnkgbG9va2luZyBhdCBpdHMKKyAgICAgICAgc3BlY3VsYXRl ZCB0eXBlLiBJZiB0aGUgZnVuY3Rpb24gaXMgaW4gc3RyaWN0IG1vZGUgdGhlbiB3ZSBjYW4gZWxp bWluYXRlIFRvVGhpcyBhcworICAgICAgICBsb25nIGFzIHRoZSBzcGVjdWxhdGVkIHR5cGUgaXMg bm90IFNwZWNPYmplY3RPdGhlciBzaW5jZSB0aGF0IGNvbnRhaW5zIG9iamVjdHMKKyAgICAgICAg dGhhdCBtYXkgc2V0IE92ZXJyaWRlc1RvVGhpcy4gSWYgdGhlIGZ1bmN0aW9uIGlzIG5vdCBpbiBz dHJpY3QgbW9kZSB0aGVuIHdlIGNhbgorICAgICAgICBlbGltaW5hdGUgVG9UaGlzIGFzIGxvbmcg aXMgdGhlIHNwZWN1bGF0ZWQgdHlwZSBpcyBhbiBvYmplY3QgdGhhdCBpcyBub3QgU3BlY09iamVj dE90aGVyLgorCisgICAgICAgIElmIHdlIGNhbid0IGVsaW1pbmF0ZSB3aXRoIHR5cGUgaW5mb3Jt YXRpb24gd2UgY2FuIHN0aWxsIGVsaW1pbmF0ZSB0aGUgVG9UaGlzIG5vZGUgd2l0aAorICAgICAg ICB0aGUgcHJvdmVuIHN0cnVjdHVyZSBzZXQuIFdoZW4gVG9UaGlzIG9ubHkgc2VlcyBzdHJ1Y3R1 cmVzIHRoYXQgZG8gbm90IHNldCBPdmVycmlkZXNUb1RoaXMKKyAgICAgICAgaXQgY2FuIGJlIGVs aW1pbmF0ZWQuIEFkZGl0aW9uYWxseSwgaWYgdGhlIGZ1bmN0aW9uIGlzIGluIHN0cmljdCBtb2Rl IHRoZW4gd2UgY2FuIGVsaW1pbmF0ZQorICAgICAgICBUb1RoaXMgYXMgbG9uZyBhcyBhbGwgb25s eSB0aGUgb2JqZWN0IHN0cnVjdHVyZXMgZG9uJ3Qgc2V0IE92ZXJyaWRlc1RvVGhpcy4KKworICAg ICAgICAqIGRmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oOgorICAgICAgICAoSlND OjpERkc6OmlzVG9UaGlzQW5JZGVudGl0eSk6CisgICAgICAgIChKU0M6OkRGRzo6QWJzdHJhY3RJ bnRlcnByZXRlcjxBYnN0cmFjdFN0YXRlVHlwZT46OmV4ZWN1dGVFZmZlY3RzKToKKyAgICAgICAg KiBkZmcvREZHQ29uc3RhbnRGb2xkaW5nUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkNv bnN0YW50Rm9sZGluZ1BoYXNlOjpmb2xkQ29uc3RhbnRzKToKKyAgICAgICAgKiBkZmcvREZHRml4 dXBQaGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Rml4dXBQaGFzZTo6Zml4dXBUb1RoaXMp OgorICAgICAgICAqIHRlc3RzL3N0cmVzcy90by10aGlzLWdsb2JhbC1vYmplY3QuanM6IEFkZGVk LgorICAgICAgICAodGVzdCk6CisgICAgICAgICh0ZXN0Mik6CisgICAgICAgIChnZXQgZm9yKToK KwogMjAxNi0wNC0yMiAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4KIAog ICAgICAgICBbSlNDXSBJbnRlZ2VyIE11bHRpcGx5IG9mIGEgbnVtYmVyIGJ5IGl0c2VsZiBkb2Vz IG5vdCBuZWVkIG5lZ2F0aXZlIHplcm8gc3VwcG9ydApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oCmluZGV4IGNh NzM0M2M0MmVmNDhlOTUyNmE2MDY3ZjJlNzA0ZWYyZmQwM2IwOTEuLjY4MzkyZjg5OTEyMDM5MWM1 NzM5ZWU3MDU5NzZiNzRkMmQ3NzViMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgKQEAgLTEyNyw2ICsx MjcsMzUgQEAgdm9pZCBBYnN0cmFjdEludGVycHJldGVyPEFic3RyYWN0U3RhdGVUeXBlPjo6dmVy aWZ5RWRnZXMoTm9kZSogbm9kZSkKICAgICBERkdfTk9ERV9ET19UT19DSElMRFJFTihtX2dyYXBo LCBub2RlLCB2ZXJpZnlFZGdlKTsKIH0KIAoraW5saW5lIGJvb2wgaXNUb1RoaXNBbklkZW50aXR5 KGJvb2wgaXNTdHJpY3RNb2RlLCBBYnN0cmFjdFZhbHVlJiB2YWx1ZUZvck5vZGUpCit7CisgICAg Ly8gV2UgbG9vayBhdCB0aGUgdHlwZSBmaXJzdCBzaW5jZSB0aGF0IHdpbGwgY292ZXIgbW9zdCBj YXNlcyBhbmQgZG9lcyBub3QgcmVxdWlyZSBpdGVyYXRpbmcgYWxsIHRoZSBzdHJ1Y3R1cmVzLgor ICAgIGlmIChpc1N0cmljdE1vZGUpIHsKKyAgICAgICAgaWYgKHZhbHVlRm9yTm9kZS5tX3R5cGUg JiYgISh2YWx1ZUZvck5vZGUubV90eXBlICYgU3BlY09iamVjdE90aGVyKSkKKyAgICAgICAgICAg IHJldHVybiB0cnVlOworICAgIH0gZWxzZSB7CisgICAgICAgIGlmICh2YWx1ZUZvck5vZGUubV90 eXBlICYmICEodmFsdWVGb3JOb2RlLm1fdHlwZSAmICh+U3BlY09iamVjdCB8IFNwZWNPYmplY3RP dGhlcikpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisgICAgaWYgKChpc1N0 cmljdE1vZGUgfHwgKHZhbHVlRm9yTm9kZS5tX3R5cGUgJiYgISh2YWx1ZUZvck5vZGUubV90eXBl ICYgflNwZWNPYmplY3QpKSkgJiYgdmFsdWVGb3JOb2RlLm1fc3RydWN0dXJlLmlzRmluaXRlKCkp IHsKKyAgICAgICAgYm9vbCBvdmVycmlkZXNUb1RoaXMgPSBmYWxzZTsKKyAgICAgICAgdmFsdWVG b3JOb2RlLm1fc3RydWN0dXJlLmZvckVhY2goWyZdKFN0cnVjdHVyZSogc3RydWN0dXJlKSB7Cisg ICAgICAgICAgICBUeXBlSW5mbyB0eXBlID0gc3RydWN0dXJlLT50eXBlSW5mbygpOworICAgICAg ICAgICAgQVNTRVJUKHR5cGUuaXNPYmplY3QoKSB8fCB0eXBlLnR5cGUoKSA9PSBTdHJpbmdUeXBl IHx8IHR5cGUudHlwZSgpID09IFN5bWJvbFR5cGUpOworICAgICAgICAgICAgQVNTRVJUKCFpc1N0 cmljdE1vZGUgPyAodHlwZS50eXBlKCkgIT0gU3RyaW5nVHlwZSAmJiB0eXBlLnR5cGUoKSAhPSBT eW1ib2xUeXBlKSA6IHRydWUpOworICAgICAgICAgICAgLy8gV2UgZG9uJ3QgbmVlZCB0byB3b3Jy eSBhYm91dCBzdHJpbmdzL3N5bWJvbHMgaGVyZSBzaW5jZSBlaXRoZXI6CisgICAgICAgICAgICAv LyAxKSBXZSBhcmUgaW4gc3RyaWN0IG1vZGUgYW5kIHN0cmluZ3Mvc3ltYm9scyBhcmUgbm90IHdy YXBwZWQKKyAgICAgICAgICAgIC8vIDIpIFRoZSBBSSBoYXMgcHJvdmVuIHRoYXQgdGhlIHR5cGUg b2YgdGhpcyBpcyBhIHN1YnR5cGUgb2Ygb2JqZWN0CisgICAgICAgICAgICBpZiAodHlwZS5pc09i amVjdCgpICYmIHR5cGUub3ZlcnJpZGVzVG9UaGlzKCkpCisgICAgICAgICAgICAgICAgb3ZlcnJp ZGVzVG9UaGlzID0gdHJ1ZTsKKyAgICAgICAgfSk7CisgICAgICAgIHJldHVybiBvdmVycmlkZXNU b1RoaXM7CisgICAgfQorCisgICAgcmV0dXJuIGZhbHNlOworfQorCiB0ZW1wbGF0ZTx0eXBlbmFt ZSBBYnN0cmFjdFN0YXRlVHlwZT4KIGJvb2wgQWJzdHJhY3RJbnRlcnByZXRlcjxBYnN0cmFjdFN0 YXRlVHlwZT46OmV4ZWN1dGVFZmZlY3RzKHVuc2lnbmVkIGNsb2JiZXJMaW1pdCwgTm9kZSogbm9k ZSkKIHsKQEAgLTE4NDcsMjEgKzE4NzYsMTcgQEAgYm9vbCBBYnN0cmFjdEludGVycHJldGVyPEFi c3RyYWN0U3RhdGVUeXBlPjo6ZXhlY3V0ZUVmZmVjdHModW5zaWduZWQgY2xvYmJlckxpbWkKICAg ICBjYXNlIFRvVGhpczogewogICAgICAgICBBYnN0cmFjdFZhbHVlJiBzb3VyY2UgPSBmb3JOb2Rl KG5vZGUtPmNoaWxkMSgpKTsKICAgICAgICAgQWJzdHJhY3RWYWx1ZSYgZGVzdGluYXRpb24gPSBm b3JOb2RlKG5vZGUpOworICAgICAgICBib29sIHN0cmljdE1vZGUgPSBtX2dyYXBoLmV4ZWN1dGFi bGVGb3Iobm9kZS0+b3JpZ2luLnNlbWFudGljKS0+aXNTdHJpY3RNb2RlKCk7CiAKLSAgICAgICAg aWYgKHNvdXJjZS5tX3R5cGUgPT0gU3BlY1N0cmluZ09iamVjdCkgeworICAgICAgICBpZiAoaXNU b1RoaXNBbklkZW50aXR5KHN0cmljdE1vZGUsIHNvdXJjZSkpIHsKICAgICAgICAgICAgIG1fc3Rh dGUuc2V0Rm91bmRDb25zdGFudHModHJ1ZSk7CiAgICAgICAgICAgICBkZXN0aW5hdGlvbiA9IHNv dXJjZTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKG1fZ3Jh cGguZXhlY3V0YWJsZUZvcihub2RlLT5vcmlnaW4uc2VtYW50aWMpLT5pc1N0cmljdE1vZGUoKSkg ewotICAgICAgICAgICAgaWYgKCEoc291cmNlLm1fdHlwZSAmIH4oU3BlY0Z1bGxOdW1iZXIgfCBT cGVjQm9vbGVhbiB8IFNwZWNTdHJpbmcgfCBTcGVjU3ltYm9sKSkpIHsKLSAgICAgICAgICAgICAg ICBtX3N0YXRlLnNldEZvdW5kQ29uc3RhbnRzKHRydWUpOwotICAgICAgICAgICAgICAgIGRlc3Rp bmF0aW9uID0gc291cmNlOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQor ICAgICAgICBpZiAoc3RyaWN0TW9kZSkKICAgICAgICAgICAgIGRlc3RpbmF0aW9uLm1ha2VIZWFw VG9wKCk7Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAgIGVsc2UgewogICAgICAgICAgICAgZGVz dGluYXRpb24gPSBzb3VyY2U7CiAgICAgICAgICAgICBkZXN0aW5hdGlvbi5tZXJnZShTcGVjT2Jq ZWN0KTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdDb25zdGFudEZvbGRpbmdQaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R0NvbnN0YW50Rm9sZGluZ1BoYXNlLmNwcAppbmRleCBjOWRhMzU5OWQ5ODBjMWMzMDVkOWIzZjQ0 MDk1YWRjY2IwZTJjOTQxLi4wYzI0YTVlNTdhNjNkMWNkMzFhZmRlMjE5NDJmM2JhODE0OWUxMDM4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NvbnN0YW50Rm9sZGlu Z1BoYXNlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NvbnN0YW50Rm9s ZGluZ1BoYXNlLmNwcApAQCAtNTUzLDYgKzU1MywxNSBAQCBwcml2YXRlOgogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgfQogCisgICAgICAgICAgICBjYXNlIFRvVGhpczogewor ICAgICAgICAgICAgICAgIGlmICghaXNUb1RoaXNBbklkZW50aXR5KG1fZ3JhcGguZXhlY3V0YWJs ZUZvcihub2RlLT5vcmlnaW4uc2VtYW50aWMpLT5pc1N0cmljdE1vZGUoKSwgbV9zdGF0ZS5mb3JO b2RlKG5vZGUtPmNoaWxkMSgpKSkpCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAg ICAgICAgICAgICAgbm9kZS0+Y29udmVydFRvSWRlbnRpdHkoKTsKKyAgICAgICAgICAgICAgICBj aGFuZ2VkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKwog ICAgICAgICAgICAgY2FzZSBDaGVjazogewogICAgICAgICAgICAgICAgIGFscmVhZHlIYW5kbGVk ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBtX2ludGVycHJldGVyLmV4ZWN1dGUoaW5kZXhJbkJs b2NrKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFz ZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhhc2UuY3BwCmluZGV4 IDI4YmYwNDBjYTEyMzc1ZjI3ZmYxOGJmNDU0OWU0NjQ5YzE0YTgwYTkuLjBiM2NmYzJhMjc4NjJh Mzg0ZGViNDMxZDY0NGQ5MDVhYTFhYjVlNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdGaXh1cFBoYXNlLmNwcApAQCAtMTcyNSw2ICsxNzI1LDkgQEAgcHJpdmF0ZToKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogCisgICAgICAgIC8vIEZJWE1FOiBUaGlzIHNob3Vs ZCBjb3ZlciBvdGhlciB1c2UgY2FzZXMgYnV0IHdlIGRvbid0IGhhdmUgdXNlIGtpbmRzIGZvciB0 aGVtLiBJdCdzIG5vdCBjcml0aWNhbCwKKyAgICAgICAgLy8gaG93ZXZlciwgc2luY2Ugd2UgY292 ZXIgYWxsIHRoZSBtaXNzaW5nIGNhc2VzIGluIGNvbnN0YW50IGZvbGRpbmcuCisgICAgICAgIC8v IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTcyMTMKICAgICAgICAg aWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVTdHJpbmdPYmplY3QoKSkgewogICAg ICAgICAgICAgZml4RWRnZTxTdHJpbmdPYmplY3RVc2U+KG5vZGUtPmNoaWxkMSgpKTsKICAgICAg ICAgICAgIG5vZGUtPmNvbnZlcnRUb0lkZW50aXR5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3RvLXRoaXMtZ2xvYmFsLW9iamVjdC5qcyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvdG8tdGhpcy1nbG9iYWwtb2JqZWN0LmpzCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLmQ0NDlkZTAwNjg2ZWZlMmFkNTc2ZGYzNzU4MDMwZjFmMjMzOTYxMTQKLS0tIC9k ZXYvbnVsbAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3RvLXRoaXMt Z2xvYmFsLW9iamVjdC5qcwpAQCAtMCwwICsxLDI1IEBACitmdW5jdGlvbiB0ZXN0KCkgeworICAg IHJldHVybiB0aGlzLmY7Cit9Citub0lubGluZSh0ZXN0KTsKKworZnVuY3Rpb24gdGVzdDIoKSB7 CisgICAgInVzZSBzdHJpY3QiOworICAgIHJldHVybiB0aGlzLmY7Cit9Citub0lubGluZSh0ZXN0 Mik7CisKK2YgPSA0MjsKKworbGV0IGdldCA9IGV2YWw7CitsZXQgZ2xvYmFsID0gZ2V0KCJ0aGlz Iik7CisKK2ZvciAodmFyIGkgPSAwOyBpIDwgMTAwMDA7ICsraSkgeworICAgIGxldCByZXN1bHQg PSB0ZXN0LmNhbGwoZ2xvYmFsKTsKKyAgICBpZiAocmVzdWx0ICE9PSA0MikKKyAgICAgICAgdGhy b3cgbmV3IEVycm9yKCJiYWQgdGhpcyB2YWx1ZTogIiArIHJlc3VsdCk7CisKKyAgICByZXN1bHQg PSB0ZXN0Mi5jYWxsKGdsb2JhbCk7CisgICAgaWYgKHJlc3VsdCAhPT0gNDIpCisgICAgICAgIHRo cm93IG5ldyBFcnJvcigiYmFkIHRoaXMgdmFsdWU6ICIgKyByZXN1bHQpOworfQo= 277910 2016-05-02 09:38:44 -0700 2016-05-02 10:37:42 -0700 Patch for landing bug-157213-20160502093921.patch text/plain 7597 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5OTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw NTVhOWJmMzNiMjM3OTliOGNjMmFjY2ZiMGVmMGI3Yjg5OGRjZDcyLi45YTA3ODQ3Yjg3OWI1NDhk OGYxZjlhMjU1NjAxMTkyNGE2Yzg2ZWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNSBAQAorMjAxNi0wNC0yOSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBUb1RoaXMgc2hvdWxkIGJlIGFibGUgdG8gYmUgZWxpbWluYXRlZCBp biBDb25zdGFudCBGb2xkaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTcyMTMKKworICAgICAgICBSZXZpZXdlZCBieSBTYWFtIEJhcmF0aS4KKwor ICAgICAgICBUaGlzIHBhdGNoIGVuYWJsZXMgZWxpbWluYXRpbmcgdGhlIFRvVGhpcyB2YWx1ZSB3 aGVuIHdlIGhhdmUgYWJzdHJhY3QgaW50ZXJwcmV0ZXIKKyAgICAgICAgaW5kaWNhdGVzIHRoZSBu b2RlIGlzIG5vdCBuZWVkZWQuIFNpbmNlIHRoZXJlIGFyZSBPYmplY3RzIHRoYXQgb3ZlcnJpZGUg dGhlaXIKKyAgICAgICAgVG9UaGlzIGJlaGF2aW9yIHdlIGZpcnN0IGNoZWNrIGlmIHdlIGNhbiBl bGltaW5hdGUgdGhlIG5vZGUgYnkgbG9va2luZyBhdCBpdHMKKyAgICAgICAgc3BlY3VsYXRlZCB0 eXBlLiBJZiB0aGUgZnVuY3Rpb24gaXMgaW4gc3RyaWN0IG1vZGUgdGhlbiB3ZSBjYW4gZWxpbWlu YXRlIFRvVGhpcyBhcworICAgICAgICBsb25nIGFzIHRoZSBzcGVjdWxhdGVkIHR5cGUgaXMgbm90 IFNwZWNPYmplY3RPdGhlciBzaW5jZSB0aGF0IGNvbnRhaW5zIG9iamVjdHMKKyAgICAgICAgdGhh dCBtYXkgc2V0IE92ZXJyaWRlc1RvVGhpcy4gSWYgdGhlIGZ1bmN0aW9uIGlzIG5vdCBpbiBzdHJp Y3QgbW9kZSB0aGVuIHdlIGNhbgorICAgICAgICBlbGltaW5hdGUgVG9UaGlzIGFzIGxvbmcgaXMg dGhlIHNwZWN1bGF0ZWQgdHlwZSBpcyBhbiBvYmplY3QgdGhhdCBpcyBub3QgU3BlY09iamVjdE90 aGVyLgorCisgICAgICAgIElmIHdlIGNhbid0IGVsaW1pbmF0ZSB3aXRoIHR5cGUgaW5mb3JtYXRp b24gd2UgY2FuIHN0aWxsIGVsaW1pbmF0ZSB0aGUgVG9UaGlzIG5vZGUgd2l0aAorICAgICAgICB0 aGUgcHJvdmVuIHN0cnVjdHVyZSBzZXQuIFdoZW4gVG9UaGlzIG9ubHkgc2VlcyBzdHJ1Y3R1cmVz IHRoYXQgZG8gbm90IHNldCBPdmVycmlkZXNUb1RoaXMKKyAgICAgICAgaXQgY2FuIGJlIGVsaW1p bmF0ZWQuIEFkZGl0aW9uYWxseSwgaWYgdGhlIGZ1bmN0aW9uIGlzIGluIHN0cmljdCBtb2RlIHRo ZW4gd2UgY2FuIGVsaW1pbmF0ZQorICAgICAgICBUb1RoaXMgYXMgbG9uZyBhcyBhbGwgb25seSB0 aGUgb2JqZWN0IHN0cnVjdHVyZXMgZG9uJ3Qgc2V0IE92ZXJyaWRlc1RvVGhpcy4KKworICAgICAg ICAqIGRmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oOgorICAgICAgICAoSlNDOjpE Rkc6OmlzVG9UaGlzQW5JZGVudGl0eSk6CisgICAgICAgIChKU0M6OkRGRzo6QWJzdHJhY3RJbnRl cnByZXRlcjxBYnN0cmFjdFN0YXRlVHlwZT46OmV4ZWN1dGVFZmZlY3RzKToKKyAgICAgICAgKiBk ZmcvREZHQ29uc3RhbnRGb2xkaW5nUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkNvbnN0 YW50Rm9sZGluZ1BoYXNlOjpmb2xkQ29uc3RhbnRzKToKKyAgICAgICAgKiBkZmcvREZHRml4dXBQ aGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Rml4dXBQaGFzZTo6Zml4dXBUb1RoaXMpOgor ICAgICAgICAqIHRlc3RzL3N0cmVzcy90by10aGlzLWdsb2JhbC1vYmplY3QuanM6IEFkZGVkLgor ICAgICAgICAodGVzdCk6CisgICAgICAgICh0ZXN0Mik6CisgICAgICAgIChnZXQgZm9yKToKKwog MjAxNi0wNC0yMiAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4KIAogICAg ICAgICBbSlNDXSBJbnRlZ2VyIE11bHRpcGx5IG9mIGEgbnVtYmVyIGJ5IGl0c2VsZiBkb2VzIG5v dCBuZWVkIG5lZ2F0aXZlIHplcm8gc3VwcG9ydApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oCmluZGV4IGNhNzM0 M2M0MmVmNDhlOTUyNmE2MDY3ZjJlNzA0ZWYyZmQwM2IwOTEuLmQ0YTVlMmFkOWZhMDQ0OThmMGM3 NTBkOWJmODAyOGFhNDZiM2MxYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgKQEAgLTEyNyw2ICsxMjcs MzYgQEAgdm9pZCBBYnN0cmFjdEludGVycHJldGVyPEFic3RyYWN0U3RhdGVUeXBlPjo6dmVyaWZ5 RWRnZXMoTm9kZSogbm9kZSkKICAgICBERkdfTk9ERV9ET19UT19DSElMRFJFTihtX2dyYXBoLCBu b2RlLCB2ZXJpZnlFZGdlKTsKIH0KIAoraW5saW5lIGJvb2wgaXNUb1RoaXNBbklkZW50aXR5KGJv b2wgaXNTdHJpY3RNb2RlLCBBYnN0cmFjdFZhbHVlJiB2YWx1ZUZvck5vZGUpCit7CisgICAgLy8g V2UgbG9vayBhdCB0aGUgdHlwZSBmaXJzdCBzaW5jZSB0aGF0IHdpbGwgY292ZXIgbW9zdCBjYXNl cyBhbmQgZG9lcyBub3QgcmVxdWlyZSBpdGVyYXRpbmcgYWxsIHRoZSBzdHJ1Y3R1cmVzLgorICAg IGlmIChpc1N0cmljdE1vZGUpIHsKKyAgICAgICAgaWYgKHZhbHVlRm9yTm9kZS5tX3R5cGUgJiYg ISh2YWx1ZUZvck5vZGUubV90eXBlICYgU3BlY09iamVjdE90aGVyKSkKKyAgICAgICAgICAgIHJl dHVybiB0cnVlOworICAgIH0gZWxzZSB7CisgICAgICAgIGlmICh2YWx1ZUZvck5vZGUubV90eXBl ICYmICEodmFsdWVGb3JOb2RlLm1fdHlwZSAmICh+U3BlY09iamVjdCB8IFNwZWNPYmplY3RPdGhl cikpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisgICAgaWYgKChpc1N0cmlj dE1vZGUgfHwgKHZhbHVlRm9yTm9kZS5tX3R5cGUgJiYgISh2YWx1ZUZvck5vZGUubV90eXBlICYg flNwZWNPYmplY3QpKSkgJiYgdmFsdWVGb3JOb2RlLm1fc3RydWN0dXJlLmlzRmluaXRlKCkpIHsK KyAgICAgICAgYm9vbCBvdmVycmlkZXNUb1RoaXMgPSBmYWxzZTsKKyAgICAgICAgdmFsdWVGb3JO b2RlLm1fc3RydWN0dXJlLmZvckVhY2goWyZdKFN0cnVjdHVyZSogc3RydWN0dXJlKSB7CisgICAg ICAgICAgICBUeXBlSW5mbyB0eXBlID0gc3RydWN0dXJlLT50eXBlSW5mbygpOworICAgICAgICAg ICAgQVNTRVJUKHR5cGUuaXNPYmplY3QoKSB8fCB0eXBlLnR5cGUoKSA9PSBTdHJpbmdUeXBlIHx8 IHR5cGUudHlwZSgpID09IFN5bWJvbFR5cGUpOworICAgICAgICAgICAgaWYgKCFpc1N0cmljdE1v ZGUpCisgICAgICAgICAgICAgICAgQVNTRVJUKHR5cGUuaXNPYmplY3QoKSk7CisgICAgICAgICAg ICAvLyBXZSBkb24ndCBuZWVkIHRvIHdvcnJ5IGFib3V0IHN0cmluZ3Mvc3ltYm9scyBoZXJlIHNp bmNlIGVpdGhlcjoKKyAgICAgICAgICAgIC8vIDEpIFdlIGFyZSBpbiBzdHJpY3QgbW9kZSBhbmQg c3RyaW5ncy9zeW1ib2xzIGFyZSBub3Qgd3JhcHBlZAorICAgICAgICAgICAgLy8gMikgVGhlIEFJ IGhhcyBwcm92ZW4gdGhhdCB0aGUgdHlwZSBvZiB0aGlzIGlzIGEgc3VidHlwZSBvZiBvYmplY3QK KyAgICAgICAgICAgIGlmICh0eXBlLmlzT2JqZWN0KCkgJiYgdHlwZS5vdmVycmlkZXNUb1RoaXMo KSkKKyAgICAgICAgICAgICAgICBvdmVycmlkZXNUb1RoaXMgPSB0cnVlOworICAgICAgICB9KTsK KyAgICAgICAgcmV0dXJuIG92ZXJyaWRlc1RvVGhpczsKKyAgICB9CisKKyAgICByZXR1cm4gZmFs c2U7Cit9CisKIHRlbXBsYXRlPHR5cGVuYW1lIEFic3RyYWN0U3RhdGVUeXBlPgogYm9vbCBBYnN0 cmFjdEludGVycHJldGVyPEFic3RyYWN0U3RhdGVUeXBlPjo6ZXhlY3V0ZUVmZmVjdHModW5zaWdu ZWQgY2xvYmJlckxpbWl0LCBOb2RlKiBub2RlKQogewpAQCAtMTg0NywyMSArMTg3NywxNyBAQCBi b29sIEFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0ZVR5cGU+OjpleGVjdXRlRWZmZWN0 cyh1bnNpZ25lZCBjbG9iYmVyTGltaQogICAgIGNhc2UgVG9UaGlzOiB7CiAgICAgICAgIEFic3Ry YWN0VmFsdWUmIHNvdXJjZSA9IGZvck5vZGUobm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICBBYnN0 cmFjdFZhbHVlJiBkZXN0aW5hdGlvbiA9IGZvck5vZGUobm9kZSk7CisgICAgICAgIGJvb2wgc3Ry aWN0TW9kZSA9IG1fZ3JhcGguZXhlY3V0YWJsZUZvcihub2RlLT5vcmlnaW4uc2VtYW50aWMpLT5p c1N0cmljdE1vZGUoKTsKIAotICAgICAgICBpZiAoc291cmNlLm1fdHlwZSA9PSBTcGVjU3RyaW5n T2JqZWN0KSB7CisgICAgICAgIGlmIChpc1RvVGhpc0FuSWRlbnRpdHkoc3RyaWN0TW9kZSwgc291 cmNlKSkgewogICAgICAgICAgICAgbV9zdGF0ZS5zZXRGb3VuZENvbnN0YW50cyh0cnVlKTsKICAg ICAgICAgICAgIGRlc3RpbmF0aW9uID0gc291cmNlOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KIAotICAgICAgICBpZiAobV9ncmFwaC5leGVjdXRhYmxlRm9yKG5vZGUtPm9yaWdpbi5z ZW1hbnRpYyktPmlzU3RyaWN0TW9kZSgpKSB7Ci0gICAgICAgICAgICBpZiAoIShzb3VyY2UubV90 eXBlICYgfihTcGVjRnVsbE51bWJlciB8IFNwZWNCb29sZWFuIHwgU3BlY1N0cmluZyB8IFNwZWNT eW1ib2wpKSkgewotICAgICAgICAgICAgICAgIG1fc3RhdGUuc2V0Rm91bmRDb25zdGFudHModHJ1 ZSk7Ci0gICAgICAgICAgICAgICAgZGVzdGluYXRpb24gPSBzb3VyY2U7Ci0gICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICB9CisgICAgICAgIGlmIChzdHJpY3RNb2RlKQogICAgICAg ICAgICAgZGVzdGluYXRpb24ubWFrZUhlYXBUb3AoKTsKLSAgICAgICAgfSBlbHNlIHsKKyAgICAg ICAgZWxzZSB7CiAgICAgICAgICAgICBkZXN0aW5hdGlvbiA9IHNvdXJjZTsKICAgICAgICAgICAg IGRlc3RpbmF0aW9uLm1lcmdlKFNwZWNPYmplY3QpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NvbnN0YW50Rm9sZGluZ1BoYXNlLmNwcCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ29uc3RhbnRGb2xkaW5nUGhhc2UuY3BwCmluZGV4 IGM5ZGEzNTk5ZDk4MGMxYzMwNWQ5YjNmNDQwOTVhZGNjYjBlMmM5NDEuLjBjMjRhNWU1N2E2M2Qx Y2QzMWFmZGUyMTk0MmYzYmE4MTQ5ZTEwMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHQ29uc3RhbnRGb2xkaW5nUGhhc2UuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHQ29uc3RhbnRGb2xkaW5nUGhhc2UuY3BwCkBAIC01NTMsNiArNTUzLDE1 IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAKKyAg ICAgICAgICAgIGNhc2UgVG9UaGlzOiB7CisgICAgICAgICAgICAgICAgaWYgKCFpc1RvVGhpc0Fu SWRlbnRpdHkobV9ncmFwaC5leGVjdXRhYmxlRm9yKG5vZGUtPm9yaWdpbi5zZW1hbnRpYyktPmlz U3RyaWN0TW9kZSgpLCBtX3N0YXRlLmZvck5vZGUobm9kZS0+Y2hpbGQxKCkpKSkKKyAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICBub2RlLT5jb252ZXJ0VG9JZGVu dGl0eSgpOworICAgICAgICAgICAgICAgIGNoYW5nZWQgPSB0cnVlOworICAgICAgICAgICAgICAg IGJyZWFrOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICBjYXNlIENoZWNrOiB7CiAgICAg ICAgICAgICAgICAgYWxyZWFkeUhhbmRsZWQgPSB0cnVlOwogICAgICAgICAgICAgICAgIG1faW50 ZXJwcmV0ZXIuZXhlY3V0ZShpbmRleEluQmxvY2spOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHRml4dXBQaGFzZS5jcHAKaW5kZXggMjhiZjA0MGNhMTIzNzVmMjdmZjE4YmY0NTQ5ZTQ2 NDljMTRhODBhOS4uMGIzY2ZjMmEyNzg2MmEzODRkZWI0MzFkNjQ0ZDkwNWFhMWFiNWU0MCAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhhc2UuY3BwCkBAIC0xNzI1LDYg KzE3MjUsOSBAQCBwcml2YXRlOgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKKyAg ICAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGNvdmVyIG90aGVyIHVzZSBjYXNlcyBidXQgd2Ug ZG9uJ3QgaGF2ZSB1c2Uga2luZHMgZm9yIHRoZW0uIEl0J3Mgbm90IGNyaXRpY2FsLAorICAgICAg ICAvLyBob3dldmVyLCBzaW5jZSB3ZSBjb3ZlciBhbGwgdGhlIG1pc3NpbmcgY2FzZXMgaW4gY29u c3RhbnQgZm9sZGluZy4KKyAgICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1NzIxMwogICAgICAgICBpZiAobm9kZS0+Y2hpbGQxKCktPnNob3VsZFNwZWN1 bGF0ZVN0cmluZ09iamVjdCgpKSB7CiAgICAgICAgICAgICBmaXhFZGdlPFN0cmluZ09iamVjdFVz ZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgbm9kZS0+Y29udmVydFRvSWRlbnRpdHko KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvdG8tdGhp cy1nbG9iYWwtb2JqZWN0LmpzIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy90 by10aGlzLWdsb2JhbC1vYmplY3QuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDQ0OWRlMDA2ODZlZmUyYWQ1NzZk ZjM3NTgwMzBmMWYyMzM5NjExNAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS90ZXN0cy9zdHJlc3MvdG8tdGhpcy1nbG9iYWwtb2JqZWN0LmpzCkBAIC0wLDAgKzEsMjUg QEAKK2Z1bmN0aW9uIHRlc3QoKSB7CisgICAgcmV0dXJuIHRoaXMuZjsKK30KK25vSW5saW5lKHRl c3QpOworCitmdW5jdGlvbiB0ZXN0MigpIHsKKyAgICAidXNlIHN0cmljdCI7CisgICAgcmV0dXJu IHRoaXMuZjsKK30KK25vSW5saW5lKHRlc3QyKTsKKworZiA9IDQyOworCitsZXQgZ2V0ID0gZXZh bDsKK2xldCBnbG9iYWwgPSBnZXQoInRoaXMiKTsKKworZm9yICh2YXIgaSA9IDA7IGkgPCAxMDAw MDsgKytpKSB7CisgICAgbGV0IHJlc3VsdCA9IHRlc3QuY2FsbChnbG9iYWwpOworICAgIGlmIChy ZXN1bHQgIT09IDQyKQorICAgICAgICB0aHJvdyBuZXcgRXJyb3IoImJhZCB0aGlzIHZhbHVlOiAi ICsgcmVzdWx0KTsKKworICAgIHJlc3VsdCA9IHRlc3QyLmNhbGwoZ2xvYmFsKTsKKyAgICBpZiAo cmVzdWx0ICE9PSA0MikKKyAgICAgICAgdGhyb3cgbmV3IEVycm9yKCJiYWQgdGhpcyB2YWx1ZTog IiArIHJlc3VsdCk7Cit9Cg==