95717 2012-09-04 00:48:28 -0700 DFG GetByVal for JSArrays shouldn't OSR exit every time that the index is out of bound 2012-09-04 18:35:46 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 95788 1 fpizlo fpizlo barraclough ggaren mhahnenberg msaboff oliver thorton webkit.review.bot oldest_to_newest 710864 0 fpizlo 2012-09-04 00:48:28 -0700 If profiling tells us that the access may be out of bounds, then we shouldn't speculate that it's in bounds. 710867 1 161981 fpizlo 2012-09-04 00:54:32 -0700 Created attachment 161981 the patch 711445 2 fpizlo 2012-09-04 14:17:17 -0700 Landed in http://trac.webkit.org/changeset/127503 711507 3 thorton 2012-09-04 15:29:41 -0700 This seems to have caused some failures in fast/js tests; see http://build.webkit.org/results/Apple%20MountainLion%20Release%20WK1%20(Tests)/r127507%20(567)/results.html Per pizlo, I'm going to roll it out. 711509 4 webkit.review.bot 2012-09-04 15:29:49 -0700 Re-opened since this is blocked by 95788 711648 5 fpizlo 2012-09-04 18:35:46 -0700 Relanded with fixes in http://trac.webkit.org/changeset/127536 161981 2012-09-04 00:54:32 -0700 2012-09-04 09:24:24 -0700 the patch getbyvaloob_patch_1.diff text/plain 13442 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTI3NDQyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDEyLTA5LTA0ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIEdldEJ5VmFsIGZvciBKU0FycmF5cyBzaG91bGRuJ3QgT1NSIGV4aXQgZXZlcnkgdGltZSB0 aGF0IHRoZSBpbmRleCBpcyBvdXQgb2YgYm91bmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NzE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTWFrZSBHZXRCeVZhbCBmb3IgSlNBcnJheU91dE9mQm91bmRz IGRvIG1lYW5pbmdmdWwgdGhpbmdzLiBUaGUgcHJvZmlsaW5nIHdhcyBhbHJlYWR5CisgICAgICAg IHRoZXJlIHNvIHdlIHNob3VsZCBqdXN0IHVzZSBpdCEKKworICAgICAgICAqIGJ5dGVjb2RlL0RG R0V4aXRQcm9maWxlLmg6CisgICAgICAgIChKU0M6OkRGRzo6ZXhpdEtpbmRUb1N0cmluZyk6Cisg ICAgICAgICogZGZnL0RGR0Fic3RyYWN0U3RhdGUuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkFi c3RyYWN0U3RhdGU6OmV4ZWN1dGUpOgorICAgICAgICAqIGRmZy9ERkdPcGVyYXRpb25zLmNwcDoK KyAgICAgICAgKiBkZmcvREZHT3BlcmF0aW9ucy5oOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxh dGl2ZUpJVC5oOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjYWxsT3BlcmF0 aW9uKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHA6CisgICAgICAg IChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUpOgorICAgICAgICAqIGRmZy9ERkdT cGVjdWxhdGl2ZUpJVDY0LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6 Y29tcGlsZSk6CisKIDIwMTItMDktMDMgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQnVpbGQgZml4IGZvciBFTkFCTEUoQ0xBU1NJ Q19JTlRFUlBSRVRFUikgYWZ0ZXIgcjEyNzM5My4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9ERkdFeGl0UHJvZmlsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9ERkdFeGl0UHJvZmlsZS5oCShyZXZpc2lvbiAxMjczNTcpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvREZHRXhpdFByb2ZpbGUuaAkod29ya2luZyBj b3B5KQpAQCAtNTgsNiArNTgsOCBAQCBpbmxpbmUgY29uc3QgY2hhciogZXhpdEtpbmRUb1N0cmlu ZyhFeGl0CiAgICAgICAgIHJldHVybiAiT3ZlcmZsb3ciOwogICAgIGNhc2UgTmVnYXRpdmVaZXJv OgogICAgICAgICByZXR1cm4gIk5lZ2F0aXZlWmVybyI7CisgICAgY2FzZSBPdXRPZkJvdW5kczoK KyAgICAgICAgcmV0dXJuICJPdXRPZkJvdW5kcyI7CiAgICAgY2FzZSBJbmFkZXF1YXRlQ292ZXJh Z2U6CiAgICAgICAgIHJldHVybiAiSW5hZGVxdWF0ZUNvdmVyYWdlIjsKICAgICBjYXNlIEFyZ3Vt ZW50c0VzY2FwZWQ6CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0 U3RhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJz dHJhY3RTdGF0ZS5jcHAJKHJldmlzaW9uIDEyNzM1NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHQWJzdHJhY3RTdGF0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg1OCwxMCArODU4 LDEyIEBAIGJvb2wgQWJzdHJhY3RTdGF0ZTo6ZXhlY3V0ZSh1bnNpZ25lZCBpbmQKICAgICAgICAg ICAgIGZvck5vZGUobm9kZUluZGV4KS5tYWtlVG9wKCk7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgY2FzZSBBcnJheTo6SlNBcnJheToKKyAgICAgICAgICAgIGZvck5vZGUobm9kZS5jaGls ZDIoKSkuZmlsdGVyKFNwZWNJbnQzMik7CisgICAgICAgICAgICBmb3JOb2RlKG5vZGVJbmRleCku bWFrZVRvcCgpOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQXJyYXk6OkpTQXJy YXlPdXRPZkJvdW5kczoKLSAgICAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgaGF2ZSBtb3Jl IGNvbnNlcnZhdGl2ZSBoYW5kbGluZyBvZiB0aGUgb3V0LW9mLWJvdW5kcwotICAgICAgICAgICAg Ly8gY2FzZS4KICAgICAgICAgICAgIGZvck5vZGUobm9kZS5jaGlsZDIoKSkuZmlsdGVyKFNwZWNJ bnQzMik7CisgICAgICAgICAgICBjbG9iYmVyV29ybGQobm9kZS5jb2RlT3JpZ2luLCBpbmRleElu QmxvY2spOwogICAgICAgICAgICAgZm9yTm9kZShub2RlSW5kZXgpLm1ha2VUb3AoKTsKICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEFycmF5OjpJbnQ4QXJyYXk6CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAJKHJldmlzaW9uIDEyNzM1 NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQwOSw2ICs0MDksMTUgQEAgRW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElP TiBvcGVyYXRpb25HZQogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoSlNWYWx1ZShiYXNlKS5n ZXQoZXhlYywgaWRlbnQpKTsKIH0KIAorRW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiBvcGVy YXRpb25HZXRCeVZhbEFycmF5SW50KEV4ZWNTdGF0ZSogZXhlYywgSlNBcnJheSogYmFzZSwgaW50 MzJfdCBpbmRleCkKK3sKKyAgICBKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEgPSAmZXhlYy0+Z2xv YmFsRGF0YSgpOworICAgIE5hdGl2ZUNhbGxGcmFtZVRyYWNlciB0cmFjZXIoZ2xvYmFsRGF0YSwg ZXhlYyk7CisKKyAgICAvLyBVc2UgdGhpcyBzaW5jZSB3ZSBrbm93IHRoYXQgdGhlIHZhbHVlIGlz IG91dCBvZiBib3VuZHMuCisgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShKU1ZhbHVlKGJhc2Up LmdldChleGVjLCBpbmRleCkpOworfQorCiBFbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OIG9w ZXJhdGlvbkdldEJ5SWQoRXhlY1N0YXRlKiBleGVjLCBFbmNvZGVkSlNWYWx1ZSBiYXNlLCBJZGVu dGlmaWVyKiBwcm9wZXJ0eU5hbWUpCiB7CiAgICAgSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhID0g JmV4ZWMtPmdsb2JhbERhdGEoKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH T3BlcmF0aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH T3BlcmF0aW9ucy5oCShyZXZpc2lvbiAxMjczNTcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR09wZXJhdGlvbnMuaAkod29ya2luZyBjb3B5KQpAQCAtNjIsNiArNjIsNyBAQCBleHRl cm4gIkMiIHsKICovCiB0eXBlZGVmIEVuY29kZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gKCpKX0RG R09wZXJhdGlvbl9FKShFeGVjU3RhdGUqKTsKIHR5cGVkZWYgRW5jb2RlZEpTVmFsdWUgREZHX09Q RVJBVElPTiAoKkpfREZHT3BlcmF0aW9uX0VBKShFeGVjU3RhdGUqLCBKU0FycmF5Kik7Cit0eXBl ZGVmIEVuY29kZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gKCpKX0RGR09wZXJhdGlvbl9FQVopKEV4 ZWNTdGF0ZSosIEpTQXJyYXkqLCBpbnQzMl90KTsKIHR5cGVkZWYgRW5jb2RlZEpTVmFsdWUgREZH X09QRVJBVElPTiAoKkpfREZHT3BlcmF0aW9uX0VDQykoRXhlY1N0YXRlKiwgSlNDZWxsKiwgSlND ZWxsKik7CiB0eXBlZGVmIEVuY29kZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gKCpKX0RGR09wZXJh dGlvbl9FQ0kpKEV4ZWNTdGF0ZSosIEpTQ2VsbCosIElkZW50aWZpZXIqKTsKIHR5cGVkZWYgRW5j b2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiAoKkpfREZHT3BlcmF0aW9uX0VDSikoRXhlY1N0YXRl KiwgSlNDZWxsKiwgRW5jb2RlZEpTVmFsdWUpOwpAQCAtMTE2LDYgKzExNyw3IEBAIEVuY29kZWRK U1ZhbHVlIERGR19PUEVSQVRJT04gb3BlcmF0aW9uVmEKIEVuY29kZWRKU1ZhbHVlIERGR19PUEVS QVRJT04gb3BlcmF0aW9uVmFsdWVBZGROb3ROdW1iZXIoRXhlY1N0YXRlKiwgRW5jb2RlZEpTVmFs dWUgZW5jb2RlZE9wMSwgRW5jb2RlZEpTVmFsdWUgZW5jb2RlZE9wMikgV1RGX0lOVEVSTkFMOwog RW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiBvcGVyYXRpb25HZXRCeVZhbChFeGVjU3RhdGUq LCBFbmNvZGVkSlNWYWx1ZSBlbmNvZGVkQmFzZSwgRW5jb2RlZEpTVmFsdWUgZW5jb2RlZFByb3Bl cnR5KSBXVEZfSU5URVJOQUw7CiBFbmNvZGVkSlNWYWx1ZSBERkdfT1BFUkFUSU9OIG9wZXJhdGlv bkdldEJ5VmFsQ2VsbChFeGVjU3RhdGUqLCBKU0NlbGwqLCBFbmNvZGVkSlNWYWx1ZSBlbmNvZGVk UHJvcGVydHkpIFdURl9JTlRFUk5BTDsKK0VuY29kZWRKU1ZhbHVlIERGR19PUEVSQVRJT04gb3Bl cmF0aW9uR2V0QnlWYWxBcnJheUludChFeGVjU3RhdGUqLCBKU0FycmF5KiwgaW50MzJfdCkgV1RG X0lOVEVSTkFMOwogRW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiBvcGVyYXRpb25HZXRCeUlk KEV4ZWNTdGF0ZSosIEVuY29kZWRKU1ZhbHVlLCBJZGVudGlmaWVyKikgV1RGX0lOVEVSTkFMOwog RW5jb2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiBvcGVyYXRpb25HZXRCeUlkQnVpbGRMaXN0KEV4 ZWNTdGF0ZSosIEVuY29kZWRKU1ZhbHVlLCBJZGVudGlmaWVyKikgV1RGX0lOVEVSTkFMOwogRW5j b2RlZEpTVmFsdWUgREZHX09QRVJBVElPTiBvcGVyYXRpb25HZXRCeUlkUHJvdG9CdWlsZExpc3Qo RXhlY1N0YXRlKiwgRW5jb2RlZEpTVmFsdWUsIElkZW50aWZpZXIqKSBXVEZfSU5URVJOQUw7Cklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVK SVQzMl82NC5jcHAJKHJldmlzaW9uIDEyNzM1NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MTcsOCAr MjUxNyw3IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSYgbm9kZSkKICAgICAg ICAgICAgIGpzVmFsdWVSZXN1bHQocmVzdWx0VGFnLmdwcigpLCByZXN1bHRQYXlsb2FkLmdwcigp LCBtX2NvbXBpbGVJbmRleCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQotICAgICAg ICBjYXNlIEFycmF5OjpKU0FycmF5OgotICAgICAgICBjYXNlIEFycmF5OjpKU0FycmF5T3V0T2ZC b3VuZHM6IHsKKyAgICAgICAgY2FzZSBBcnJheTo6SlNBcnJheTogewogICAgICAgICAgICAgU3Bl Y3VsYXRlU3RyaWN0SW50MzJPcGVyYW5kIHByb3BlcnR5KHRoaXMsIG5vZGUuY2hpbGQyKCkpOwog ICAgICAgICAgICAgU3RvcmFnZU9wZXJhbmQgc3RvcmFnZSh0aGlzLCBub2RlLmNoaWxkMygpKTsK ICAgICAgICAgICAgIEdQUlJlZyBwcm9wZXJ0eVJlZyA9IHByb3BlcnR5LmdwcigpOwpAQCAtMjUz MywxOSArMjUzMiw1OSBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUmIG5vZGUp CiAgICAgICAgICAgICAgICAgU3BlY3VsYXRlQ2VsbE9wZXJhbmQgYmFzZSh0aGlzLCBub2RlLmNo aWxkMSgpKTsKICAgICAgICAgICAgICAgICBHUFJSZWcgYmFzZVJlZyA9IGJhc2UuZ3ByKCk7CiAg ICAgICAgICAgICAgICAgLy8gV2UndmUgYWxyZWFkeSBzcGVjdWxhdGVkIHRoYXQgaXQncyBzb21l IGtpbmQgb2YgYXJyYXksIGF0IHRoaXMgcG9pbnQuCi0gICAgICAgICAgICAgICAgc3BlY3VsYXRp b25DaGVjayhVbmNvdW50YWJsZSwgSlNWYWx1ZVJlZ3MoKSwgTm9Ob2RlLCBtX2ppdC5icmFuY2gz MihNYWNyb0Fzc2VtYmxlcjo6QWJvdmVPckVxdWFsLCBwcm9wZXJ0eVJlZywgTWFjcm9Bc3NlbWJs ZXI6OkFkZHJlc3MoYmFzZVJlZywgSlNBcnJheTo6dmVjdG9yTGVuZ3RoT2Zmc2V0KCkpKSk7Cisg ICAgICAgICAgICAgICAgc3BlY3VsYXRpb25DaGVjayhPdXRPZkJvdW5kcywgSlNWYWx1ZVJlZ3Mo KSwgTm9Ob2RlLCBtX2ppdC5icmFuY2gzMihNYWNyb0Fzc2VtYmxlcjo6QWJvdmVPckVxdWFsLCBw cm9wZXJ0eVJlZywgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoYmFzZVJlZywgSlNBcnJheTo6dmVj dG9yTGVuZ3RoT2Zmc2V0KCkpKSk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIEdQUlRl bXBvcmFyeSByZXN1bHRUYWcodGhpcyk7CiAgICAgICAgICAgICBHUFJUZW1wb3JhcnkgcmVzdWx0 UGF5bG9hZCh0aGlzKTsKIAogICAgICAgICAgICAgbV9qaXQubG9hZDMyKE1hY3JvQXNzZW1ibGVy OjpCYXNlSW5kZXgoc3RvcmFnZVJlZywgcHJvcGVydHlSZWcsIE1hY3JvQXNzZW1ibGVyOjpUaW1l c0VpZ2h0LCBPQkpFQ1RfT0ZGU0VUT0YoQXJyYXlTdG9yYWdlLCBtX3ZlY3RvclswXSkgKyBPQkpF Q1RfT0ZGU0VUT0YoSlNWYWx1ZSwgdS5hc0JpdHMudGFnKSksIHJlc3VsdFRhZy5ncHIoKSk7Ci0g ICAgICAgICAgICBzcGVjdWxhdGlvbkNoZWNrKFVuY291bnRhYmxlLCBKU1ZhbHVlUmVncygpLCBO b05vZGUsIG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpFcXVhbCwgcmVzdWx0VGFnLmdw cigpLCBUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6RW1wdHlWYWx1ZVRhZykpKTsKKyAgICAgICAgICAg IHNwZWN1bGF0aW9uQ2hlY2soT3V0T2ZCb3VuZHMsIEpTVmFsdWVSZWdzKCksIE5vTm9kZSwgbV9q aXQuYnJhbmNoMzIoTWFjcm9Bc3NlbWJsZXI6OkVxdWFsLCByZXN1bHRUYWcuZ3ByKCksIFRydXN0 ZWRJbW0zMihKU1ZhbHVlOjpFbXB0eVZhbHVlVGFnKSkpOwogICAgICAgICAgICAgbV9qaXQubG9h ZDMyKE1hY3JvQXNzZW1ibGVyOjpCYXNlSW5kZXgoc3RvcmFnZVJlZywgcHJvcGVydHlSZWcsIE1h Y3JvQXNzZW1ibGVyOjpUaW1lc0VpZ2h0LCBPQkpFQ1RfT0ZGU0VUT0YoQXJyYXlTdG9yYWdlLCBt X3ZlY3RvclswXSkgKyBPQkpFQ1RfT0ZGU0VUT0YoSlNWYWx1ZSwgdS5hc0JpdHMucGF5bG9hZCkp LCByZXN1bHRQYXlsb2FkLmdwcigpKTsKLQorICAgICAgICAgICAgCiAgICAgICAgICAgICBqc1Zh bHVlUmVzdWx0KHJlc3VsdFRhZy5ncHIoKSwgcmVzdWx0UGF5bG9hZC5ncHIoKSwgbV9jb21waWxl SW5kZXgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KKyAgICAgICAgY2FzZSBBcnJh eTo6SlNBcnJheU91dE9mQm91bmRzOiB7CisgICAgICAgICAgICBTcGVjdWxhdGVDZWxsT3BlcmFu ZCBiYXNlKHRoaXMsIG5vZGUuY2hpbGQxKCkpOworICAgICAgICAgICAgU3BlY3VsYXRlU3RyaWN0 SW50MzJPcGVyYW5kIHByb3BlcnR5KHRoaXMsIG5vZGUuY2hpbGQyKCkpOworICAgICAgICAgICAg U3RvcmFnZU9wZXJhbmQgc3RvcmFnZSh0aGlzLCBub2RlLmNoaWxkMygpKTsKKyAgICAgICAgICAg IEdQUlJlZyBwcm9wZXJ0eVJlZyA9IHByb3BlcnR5LmdwcigpOworICAgICAgICAgICAgR1BSUmVn IHN0b3JhZ2VSZWcgPSBzdG9yYWdlLmdwcigpOworCisgICAgICAgICAgICBpZiAoIW1fY29tcGls ZU9rYXkpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBHUFJUZW1wb3Jh cnkgcmVzdWx0VGFnKHRoaXMpOworICAgICAgICAgICAgR1BSVGVtcG9yYXJ5IHJlc3VsdFBheWxv YWQodGhpcyk7CisgICAgICAgICAgICBHUFJSZWcgcmVzdWx0VGFnUmVnID0gcmVzdWx0VGFnLmdw cigpOworICAgICAgICAgICAgR1BSUmVnIHJlc3VsdFBheWxvYWRSZWcgPSByZXN1bHRQYXlsb2Fk LmdwcigpOworCisgICAgICAgICAgICAvLyBDaGVjayB0aGF0IGJhc2UgaXMgYW4gYXJyYXksIGFu ZCB0aGF0IHByb3BlcnR5IGlzIGNvbnRhaW5lZCB3aXRoaW4gbV92ZWN0b3IgKDwgbV92ZWN0b3JM ZW5ndGgpLgorICAgICAgICAgICAgLy8gSWYgd2UgaGF2ZSBwcmVkaWN0ZWQgdGhlIGJhc2UgdG8g YmUgdHlwZSBhcnJheSwgd2UgY2FuIHNraXAgdGhlIGNoZWNrLgorICAgICAgICAgICAgR1BSUmVn IGJhc2VSZWcgPSBiYXNlLmdwcigpOworICAgICAgICAgICAgLy8gV2UndmUgYWxyZWFkeSBzcGVj dWxhdGVkIHRoYXQgaXQncyBzb21lIGtpbmQgb2YgYXJyYXksIGF0IHRoaXMgcG9pbnQuCisgICAg ICAgICAgICBKSVRDb21waWxlcjo6SnVtcCBvdXRPZkJvdW5kcyA9IG1faml0LmJyYW5jaDMyKAor ICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpBYm92ZU9yRXF1YWwsIHByb3BlcnR5UmVn LAorICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKGJhc2VSZWcsIEpTQXJy YXk6OnZlY3Rvckxlbmd0aE9mZnNldCgpKSk7CisKKyAgICAgICAgICAgIG1faml0LmxvYWQzMihN YWNyb0Fzc2VtYmxlcjo6QmFzZUluZGV4KHN0b3JhZ2VSZWcsIHByb3BlcnR5UmVnLCBNYWNyb0Fz c2VtYmxlcjo6VGltZXNFaWdodCwgT0JKRUNUX09GRlNFVE9GKEFycmF5U3RvcmFnZSwgbV92ZWN0 b3JbMF0pICsgT0JKRUNUX09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRzLnRhZykpLCByZXN1bHRU YWdSZWcpOworICAgICAgICAgICAgSklUQ29tcGlsZXI6Okp1bXAgaG9sZSA9IG1faml0LmJyYW5j aDMyKAorICAgICAgICAgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpFcXVhbCwgcmVzdWx0VGFnLmdw cigpLCBUcnVzdGVkSW1tMzIoSlNWYWx1ZTo6RW1wdHlWYWx1ZVRhZykpOworICAgICAgICAgICAg bV9qaXQubG9hZDMyKE1hY3JvQXNzZW1ibGVyOjpCYXNlSW5kZXgoc3RvcmFnZVJlZywgcHJvcGVy dHlSZWcsIE1hY3JvQXNzZW1ibGVyOjpUaW1lc0VpZ2h0LCBPQkpFQ1RfT0ZGU0VUT0YoQXJyYXlT dG9yYWdlLCBtX3ZlY3RvclswXSkgKyBPQkpFQ1RfT0ZGU0VUT0YoSlNWYWx1ZSwgdS5hc0JpdHMu cGF5bG9hZCkpLCByZXN1bHRQYXlsb2FkUmVnKTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAg SklUQ29tcGlsZXI6Okp1bXBMaXN0IHNsb3dDYXNlczsKKyAgICAgICAgICAgIHNsb3dDYXNlcy5h cHBlbmQob3V0T2ZCb3VuZHMpOworICAgICAgICAgICAgc2xvd0Nhc2VzLmFwcGVuZChob2xlKTsK KyAgICAgICAgICAgIGFkZFNsb3dQYXRoR2VuZXJhdG9yKAorICAgICAgICAgICAgICAgIHNsb3dQ YXRoQ2FsbCgKKyAgICAgICAgICAgICAgICAgICAgc2xvd0Nhc2VzLCB0aGlzLCBvcGVyYXRpb25H ZXRCeVZhbEFycmF5SW50LAorICAgICAgICAgICAgICAgICAgICBKU1ZhbHVlUmVncyhyZXN1bHRU YWdSZWcsIHJlc3VsdFBheWxvYWRSZWcpLAorICAgICAgICAgICAgICAgICAgICBiYXNlUmVnLCBw cm9wZXJ0eVJlZykpOworCisgICAgICAgICAgICBqc1ZhbHVlUmVzdWx0KHJlc3VsdFRhZ1JlZywg cmVzdWx0UGF5bG9hZFJlZywgbV9jb21waWxlSW5kZXgpOworICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgIH0KICAgICAgICAgY2FzZSBBcnJheTo6U3RyaW5nOgogICAgICAgICAgICAgY29tcGls ZUdldEJ5VmFsT25TdHJpbmcobm9kZSk7CiAgICAgICAgICAgICBicmVhazsKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAkocmV2 aXNpb24gMTI3MzU3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2 ZUpJVDY0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjU2MywxMSArMjU2MywyNCBAQCB2b2lkIFNw ZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUmIG5vZGUpCiAgICAgICAgICAgICAvLyBXZSB3aWxs IGhhdmUgYWxyZWFkeSBzcGVjdWxhdGVkIHRoYXQgdGhlIGJhc2UgaXMgc29tZSBraW5kIG9mIGFy cmF5LAogICAgICAgICAgICAgLy8gYXQgdGhpcyBwb2ludC4KICAgICAgICAgICAgIAotICAgICAg ICAgICAgc3BlY3VsYXRpb25DaGVjayhVbmNvdW50YWJsZSwgSlNWYWx1ZVJlZ3MoKSwgTm9Ob2Rl LCBtX2ppdC5icmFuY2gzMihNYWNyb0Fzc2VtYmxlcjo6QWJvdmVPckVxdWFsLCBwcm9wZXJ0eVJl ZywgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3MoYmFzZVJlZywgSlNBcnJheTo6dmVjdG9yTGVuZ3Ro T2Zmc2V0KCkpKSk7CisgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6SnVtcCBvdXRPZkJvdW5k cyA9IG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpBYm92ZU9yRXF1YWwsIHByb3BlcnR5 UmVnLCBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhiYXNlUmVnLCBKU0FycmF5Ojp2ZWN0b3JMZW5n dGhPZmZzZXQoKSkpOworICAgICAgICAgICAgaWYgKG5vZGUuYXJyYXlNb2RlKCkgPT0gQXJyYXk6 OkpTQXJyYXkpCisgICAgICAgICAgICAgICAgc3BlY3VsYXRpb25DaGVjayhPdXRPZkJvdW5kcywg SlNWYWx1ZVJlZ3MoKSwgTm9Ob2RlLCBvdXRPZkJvdW5kcyk7CiAgICAgICAgICAgICAKICAgICAg ICAgICAgIEdQUlRlbXBvcmFyeSByZXN1bHQodGhpcyk7CiAgICAgICAgICAgICBtX2ppdC5sb2Fk UHRyKE1hY3JvQXNzZW1ibGVyOjpCYXNlSW5kZXgoc3RvcmFnZVJlZywgcHJvcGVydHlSZWcsIE1h Y3JvQXNzZW1ibGVyOjpTY2FsZVB0ciwgT0JKRUNUX09GRlNFVE9GKEFycmF5U3RvcmFnZSwgbV92 ZWN0b3JbMF0pKSwgcmVzdWx0LmdwcigpKTsKLSAgICAgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2so VW5jb3VudGFibGUsIEpTVmFsdWVSZWdzKCksIE5vTm9kZSwgbV9qaXQuYnJhbmNoVGVzdFB0cihN YWNyb0Fzc2VtYmxlcjo6WmVybywgcmVzdWx0LmdwcigpKSk7CisgICAgICAgICAgICBNYWNyb0Fz c2VtYmxlcjo6SnVtcCBob2xlID0gbV9qaXQuYnJhbmNoVGVzdFB0cihNYWNyb0Fzc2VtYmxlcjo6 WmVybywgcmVzdWx0LmdwcigpKTsKKyAgICAgICAgICAgIGlmIChub2RlLmFycmF5TW9kZSgpID09 IEFycmF5OjpKU0FycmF5KQorICAgICAgICAgICAgICAgIHNwZWN1bGF0aW9uQ2hlY2soT3V0T2ZC b3VuZHMsIEpTVmFsdWVSZWdzKCksIE5vTm9kZSwgaG9sZSk7CisgICAgICAgICAgICBlbHNlIHsK KyAgICAgICAgICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6SnVtcExpc3Qgc2xvd0Nhc2VzOworICAg ICAgICAgICAgICAgIHNsb3dDYXNlcy5hcHBlbmQob3V0T2ZCb3VuZHMpOworICAgICAgICAgICAg ICAgIHNsb3dDYXNlcy5hcHBlbmQoaG9sZSk7CisgICAgICAgICAgICAgICAgYWRkU2xvd1BhdGhH ZW5lcmF0b3IoCisgICAgICAgICAgICAgICAgICAgIHNsb3dQYXRoQ2FsbCgKKyAgICAgICAgICAg ICAgICAgICAgICAgIHNsb3dDYXNlcywgdGhpcywgb3BlcmF0aW9uR2V0QnlWYWxBcnJheUludCwK KyAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdC5ncHIoKSwgYmFzZVJlZywgcHJvcGVydHlS ZWcpKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIAogICAgICAgICAgICAganNWYWx1ZVJl c3VsdChyZXN1bHQuZ3ByKCksIG1fY29tcGlsZUluZGV4KTsKICAgICAgICAgICAgIGJyZWFrOwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAko cmV2aXNpb24gMTI3MzU3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxh dGl2ZUpJVC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTk4LDYgKzExOTgsMTEgQEAgcHVibGljOgog ICAgICAgICBtX2ppdC5zZXR1cEFyZ3VtZW50c1dpdGhFeGVjU3RhdGUoYXJnMSk7CiAgICAgICAg IHJldHVybiBhcHBlbmRDYWxsV2l0aEV4Y2VwdGlvbkNoZWNrU2V0UmVzdWx0KG9wZXJhdGlvbiwg cmVzdWx0KTsKICAgICB9CisgICAgSklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihKX0RG R09wZXJhdGlvbl9FQVogb3BlcmF0aW9uLCBHUFJSZWcgcmVzdWx0LCBHUFJSZWcgYXJnMSwgR1BS UmVnIGFyZzIpCisgICAgeworICAgICAgICBtX2ppdC5zZXR1cEFyZ3VtZW50c1dpdGhFeGVjU3Rh dGUoYXJnMSwgYXJnMik7CisgICAgICAgIHJldHVybiBhcHBlbmRDYWxsV2l0aEV4Y2VwdGlvbkNo ZWNrU2V0UmVzdWx0KG9wZXJhdGlvbiwgcmVzdWx0KTsKKyAgICB9CiAgICAgSklUQ29tcGlsZXI6 OkNhbGwgY2FsbE9wZXJhdGlvbihKX0RGR09wZXJhdGlvbl9FU3Qgb3BlcmF0aW9uLCBHUFJSZWcg cmVzdWx0LCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKICAgICB7CiAgICAgICAgIG1faml0LnNldHVw QXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShUcnVzdGVkSW1tUHRyKHN0cnVjdHVyZSkpOwpAQCAtMTQ4 MSw2ICsxNDg2LDExIEBAIHB1YmxpYzoKICAgICAgICAgbV9qaXQuc2V0dXBBcmd1bWVudHNXaXRo RXhlY1N0YXRlKGFyZzEpOwogICAgICAgICByZXR1cm4gYXBwZW5kQ2FsbFdpdGhFeGNlcHRpb25D aGVja1NldFJlc3VsdChvcGVyYXRpb24sIHJlc3VsdFBheWxvYWQsIHJlc3VsdFRhZyk7CiAgICAg fQorICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oSl9ERkdPcGVyYXRpb25fRUFa IG9wZXJhdGlvbiwgR1BSUmVnIHJlc3VsdFRhZywgR1BSUmVnIHJlc3VsdFBheWxvYWQsIEdQUlJl ZyBhcmcxLCBHUFJSZWcgYXJnMikKKyAgICB7CisgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRz V2l0aEV4ZWNTdGF0ZShhcmcxLCBhcmcyKTsKKyAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxXaXRo RXhjZXB0aW9uQ2hlY2tTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHRQYXlsb2FkLCByZXN1bHRU YWcpOworICAgIH0KICAgICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKEpfREZHT3Bl cmF0aW9uX0VTdCBvcGVyYXRpb24sIEdQUlJlZyByZXN1bHRUYWcsIEdQUlJlZyByZXN1bHRQYXls b2FkLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKICAgICB7CiAgICAgICAgIG1faml0LnNldHVwQXJn dW1lbnRzV2l0aEV4ZWNTdGF0ZShUcnVzdGVkSW1tUHRyKHN0cnVjdHVyZSkpOwo=