171330 2017-04-26 09:41:02 -0700 [JSC] fix RETURN_IF_EXCEPTION() placement in ownPropertyKeys() 2017-04-26 10:41:23 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 caitp caitp buildbot commit-queue joepeck keith_miller mark.lam msaboff saam ysuzuki oldest_to_newest 1301635 0 caitp 2017-04-26 09:41:02 -0700 [JSC] fix RETURN_IF_EXCEPTION() placement in ownPropertyKeys() 1301636 1 308259 caitp 2017-04-26 09:41:58 -0700 Created attachment 308259 Patch 1301646 2 308259 mark.lam 2017-04-26 09:56:27 -0700 Comment on attachment 308259 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308259&action=review r=me > Source/JavaScriptCore/ChangeLog:8 > + nit: please remove this extra blank line. 1301649 3 308262 caitp 2017-04-26 10:00:36 -0700 Created attachment 308262 Patch for landing 1301667 4 308262 commit-queue 2017-04-26 10:41:21 -0700 Comment on attachment 308262 Patch for landing Clearing flags on attachment: 308262 Committed r215810: <http://trac.webkit.org/changeset/215810> 1301668 5 commit-queue 2017-04-26 10:41:23 -0700 All reviewed patches have been landed. Closing bug. 308259 2017-04-26 09:41:58 -0700 2017-04-26 10:00:33 -0700 Patch bug-171330-20170426124157.patch text/plain 3757 caitp U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1ODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh MTgwZTA1MTNhMTI1MDQ4MWIyZjYxZDI3YTQ1NjRjNzRkMTY3MzVmLi5iYTIxNzFjZTI4MmYyZjg4 YzBiMGE3NDVmNTUzOWE5ZjVlOThjMDc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxOSBAQAogMjAxNy0wNC0yNiAgQ2FpdGxpbiBQb3R0ZXIgIDxjYWl0cEBpZ2FsaWEuY29t PgogCisgICAgICAgIFtKU0NdIGZpeCBSRVRVUk5fSUZfRVhDRVBUSU9OKCkgcGxhY2VtZW50IGlu IG93blByb3BlcnR5S2V5cygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzEzMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworCisgICAgICAgIEVuc3VyZSBSRVRVUk5fSUZfRVhDRVBUSU9OKCkgZm9sbG93aW5nIGludm9r YXRpb24gb2YgdGhlCisgICAgICAgIGZpbHRlclByb3BlcnR5SWZOZWVkZWQoKSBsYW1iZGEuCisK KyAgICAgICAgKiBydW50aW1lL09iamVjdENvbnN0cnVjdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6 b3duUHJvcGVydHlLZXlzKToKKworMjAxNy0wNC0yNiAgQ2FpdGxpbiBQb3R0ZXIgIDxjYWl0cEBp Z2FsaWEuY29tPgorCiAgICAgICAgIFtKU0NdIE9iamVjdC5rZXlzKCkgbXVzdCBkaXNjYXJkIHBy b3BlcnR5IG5hbWVzIHdpdGggbm8gUHJvcGVydHlEZXNjcmlwdG9yCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzEyOTEKIApkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0Q29uc3RydWN0b3IuY3BwIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0Q29uc3RydWN0b3IuY3BwCmluZGV4IGJlZmRh NGU5YzhjN2YwMTg5MWM4MjVlMGNkNWJiNjFjNzcyZTNhZDAuLjAwODg0ZjJiZDljZDUwYzBkM2Ri YmEwNzk1NjU2MDkyMWFhNDFlOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL09iamVjdENvbnN0cnVjdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9PYmplY3RDb25zdHJ1Y3Rvci5jcHAKQEAgLTc0OCwxMCArNzQ4LDkgQEAgSlNBcnJh eSogb3duUHJvcGVydHlLZXlzKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIG9iamVjdCwgUHJv cGVydHlOYW1lTW9kZSBwcm8KICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1Qcm9w ZXJ0aWVzOyBpKyspIHsKICAgICAgICAgICAgIGNvbnN0IGF1dG8mIGlkZW50aWZpZXIgPSBwcm9w ZXJ0aWVzW2ldOwogICAgICAgICAgICAgQVNTRVJUKCFpZGVudGlmaWVyLmlzU3ltYm9sKCkpOwot ICAgICAgICAgICAgaWYgKGZpbHRlclByb3BlcnR5SWZOZWVkZWQoaWRlbnRpZmllcikpIHsKKyAg ICAgICAgICAgIGlmIChmaWx0ZXJQcm9wZXJ0eUlmTmVlZGVkKGlkZW50aWZpZXIpKQogICAgICAg ICAgICAgICAgIGtleXMtPnB1c2goZXhlYywganNPd25lZFN0cmluZyhleGVjLCBpZGVudGlmaWVy LnN0cmluZygpKSk7Ci0gICAgICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg bnVsbHB0cik7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9O KHNjb3BlLCBudWxscHRyKTsKICAgICAgICAgfQogICAgICAgICBicmVhazsKICAgICB9CkBAIC03 NjEsOCArNzYwLDkgQEAgSlNBcnJheSogb3duUHJvcGVydHlLZXlzKEV4ZWNTdGF0ZSogZXhlYywg SlNPYmplY3QqIG9iamVjdCwgUHJvcGVydHlOYW1lTW9kZSBwcm8KICAgICAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBudW1Qcm9wZXJ0aWVzOyBpKyspIHsKICAgICAgICAgICAgIGNvbnN0IGF1 dG8mIGlkZW50aWZpZXIgPSBwcm9wZXJ0aWVzW2ldOwogICAgICAgICAgICAgQVNTRVJUKGlkZW50 aWZpZXIuaXNTeW1ib2woKSk7Ci0gICAgICAgICAgICBpZiAoIXZtLnByb3BlcnR5TmFtZXMtPmlz UHJpdmF0ZU5hbWUoaWRlbnRpZmllcikgJiYgZmlsdGVyUHJvcGVydHlJZk5lZWRlZChpZGVudGlm aWVyKSkgewotICAgICAgICAgICAgICAgIGtleXMtPnB1c2goZXhlYywgU3ltYm9sOjpjcmVhdGUo dm0sIHN0YXRpY19jYXN0PFN5bWJvbEltcGwmPigqaWRlbnRpZmllci5pbXBsKCkpKSk7CisgICAg ICAgICAgICBpZiAoIXZtLnByb3BlcnR5TmFtZXMtPmlzUHJpdmF0ZU5hbWUoaWRlbnRpZmllcikp IHsKKyAgICAgICAgICAgICAgICBpZiAoZmlsdGVyUHJvcGVydHlJZk5lZWRlZChpZGVudGlmaWVy KSkKKyAgICAgICAgICAgICAgICAgICAga2V5cy0+cHVzaChleGVjLCBTeW1ib2w6OmNyZWF0ZSh2 bSwgc3RhdGljX2Nhc3Q8U3ltYm9sSW1wbCY+KCppZGVudGlmaWVyLmltcGwoKSkpKTsKICAgICAg ICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBudWxscHRyKTsKICAgICAgICAg ICAgIH0KICAgICAgICAgfQpAQCAtNzc3LDE4ICs3NzcsMTggQEAgSlNBcnJheSogb3duUHJvcGVy dHlLZXlzKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIG9iamVjdCwgUHJvcGVydHlOYW1lTW9k ZSBwcm8KICAgICAgICAgICAgIGlmIChpZGVudGlmaWVyLmlzU3ltYm9sKCkpIHsKICAgICAgICAg ICAgICAgICBpZiAoIXZtLnByb3BlcnR5TmFtZXMtPmlzUHJpdmF0ZU5hbWUoaWRlbnRpZmllcikp CiAgICAgICAgICAgICAgICAgICAgIHByb3BlcnR5U3ltYm9scy5hcHBlbmQoaWRlbnRpZmllcik7 Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKGZpbHRlclByb3BlcnR5SWZOZWVkZWQoaWRlbnRpZmll cikpIHsKLSAgICAgICAgICAgICAgICBrZXlzLT5wdXNoKGV4ZWMsIGpzT3duZWRTdHJpbmcoZXhl YywgaWRlbnRpZmllci5zdHJpbmcoKSkpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgICAgICBpZiAoZmlsdGVyUHJvcGVydHlJZk5lZWRlZChpZGVudGlmaWVyKSkKKyAgICAgICAg ICAgICAgICAgICAga2V5cy0+cHVzaChleGVjLCBqc093bmVkU3RyaW5nKGV4ZWMsIGlkZW50aWZp ZXIuc3RyaW5nKCkpKTsKICAgICAgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3Bl LCBudWxscHRyKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIC8vIFRvIGVu c3VyZSB0aGUgb3JkZXIgZGVmaW5lZCBpbiB0aGUgc3BlYyAoOS4xLjEyKSwgd2UgYXBwZW5kIHN5 bWJvbHMgYXQgdGhlIGxhc3QgZWxlbWVudHMgb2Yga2V5cy4KICAgICAgICAgZm9yIChjb25zdCBh dXRvJiBpZGVudGlmaWVyIDogcHJvcGVydHlTeW1ib2xzKSB7Ci0gICAgICAgICAgICBpZiAoZmls dGVyUHJvcGVydHlJZk5lZWRlZChpZGVudGlmaWVyKSkgeworICAgICAgICAgICAgaWYgKGZpbHRl clByb3BlcnR5SWZOZWVkZWQoaWRlbnRpZmllcikpCiAgICAgICAgICAgICAgICAga2V5cy0+cHVz aChleGVjLCBTeW1ib2w6OmNyZWF0ZSh2bSwgc3RhdGljX2Nhc3Q8U3ltYm9sSW1wbCY+KCppZGVu dGlmaWVyLmltcGwoKSkpKTsKLSAgICAgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNj b3BlLCBudWxscHRyKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIG51bGxwdHIpOwogICAgICAgICB9CiAKICAgICAgICAgYnJlYWs7Cg== 308262 2017-04-26 10:00:36 -0700 2017-04-26 10:41:21 -0700 Patch for landing bug-171330-20170426130035.patch text/plain 3749 caitp U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1ODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh MTgwZTA1MTNhMTI1MDQ4MWIyZjYxZDI3YTQ1NjRjNzRkMTY3MzVmLi4wZTg0YzU2ZDJhMmQ5YWM4 Y2Y2NDVkMTUxOWZkMTFhNjIwNTJiOGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxOCBAQAogMjAxNy0wNC0yNiAgQ2FpdGxpbiBQb3R0ZXIgIDxjYWl0cEBpZ2FsaWEuY29t PgogCisgICAgICAgIFtKU0NdIGZpeCBSRVRVUk5fSUZfRVhDRVBUSU9OKCkgcGxhY2VtZW50IGlu IG93blByb3BlcnR5S2V5cygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzEzMzAKKworICAgICAgICBSZXZpZXdlZCBieSBNYXJrIExhbS4KKworICAg ICAgICBFbnN1cmUgUkVUVVJOX0lGX0VYQ0VQVElPTigpIGZvbGxvd2luZyBpbnZva2F0aW9uIG9m IHRoZQorICAgICAgICBmaWx0ZXJQcm9wZXJ0eUlmTmVlZGVkKCkgbGFtYmRhLgorCisgICAgICAg ICogcnVudGltZS9PYmplY3RDb25zdHJ1Y3Rvci5jcHA6CisgICAgICAgIChKU0M6Om93blByb3Bl cnR5S2V5cyk6CisKKzIwMTctMDQtMjYgIENhaXRsaW4gUG90dGVyICA8Y2FpdHBAaWdhbGlhLmNv bT4KKwogICAgICAgICBbSlNDXSBPYmplY3Qua2V5cygpIG11c3QgZGlzY2FyZCBwcm9wZXJ0eSBu YW1lcyB3aXRoIG5vIFByb3BlcnR5RGVzY3JpcHRvcgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxMjkxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL09iamVjdENvbnN0cnVjdG9yLmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL09iamVjdENvbnN0cnVjdG9yLmNwcAppbmRleCBiZWZkYTRlOWM4Yzdm MDE4OTFjODI1ZTBjZDViYjYxYzc3MmUzYWQwLi4wMDg4NGYyYmQ5Y2Q1MGMwZDNkYmJhMDc5NTY1 NjA5MjFhYTQxZTlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9P YmplY3RDb25zdHJ1Y3Rvci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv T2JqZWN0Q29uc3RydWN0b3IuY3BwCkBAIC03NDgsMTAgKzc0OCw5IEBAIEpTQXJyYXkqIG93blBy b3BlcnR5S2V5cyhFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiBvYmplY3QsIFByb3BlcnR5TmFt ZU1vZGUgcHJvCiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbnVtUHJvcGVydGllczsg aSsrKSB7CiAgICAgICAgICAgICBjb25zdCBhdXRvJiBpZGVudGlmaWVyID0gcHJvcGVydGllc1tp XTsKICAgICAgICAgICAgIEFTU0VSVCghaWRlbnRpZmllci5pc1N5bWJvbCgpKTsKLSAgICAgICAg ICAgIGlmIChmaWx0ZXJQcm9wZXJ0eUlmTmVlZGVkKGlkZW50aWZpZXIpKSB7CisgICAgICAgICAg ICBpZiAoZmlsdGVyUHJvcGVydHlJZk5lZWRlZChpZGVudGlmaWVyKSkKICAgICAgICAgICAgICAg ICBrZXlzLT5wdXNoKGV4ZWMsIGpzT3duZWRTdHJpbmcoZXhlYywgaWRlbnRpZmllci5zdHJpbmco KSkpOwotICAgICAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIG51bGxwdHIp OwotICAgICAgICAgICAgfQorICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg bnVsbHB0cik7CiAgICAgICAgIH0KICAgICAgICAgYnJlYWs7CiAgICAgfQpAQCAtNzYxLDggKzc2 MCw5IEBAIEpTQXJyYXkqIG93blByb3BlcnR5S2V5cyhFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0 KiBvYmplY3QsIFByb3BlcnR5TmFtZU1vZGUgcHJvCiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgbnVtUHJvcGVydGllczsgaSsrKSB7CiAgICAgICAgICAgICBjb25zdCBhdXRvJiBpZGVu dGlmaWVyID0gcHJvcGVydGllc1tpXTsKICAgICAgICAgICAgIEFTU0VSVChpZGVudGlmaWVyLmlz U3ltYm9sKCkpOwotICAgICAgICAgICAgaWYgKCF2bS5wcm9wZXJ0eU5hbWVzLT5pc1ByaXZhdGVO YW1lKGlkZW50aWZpZXIpICYmIGZpbHRlclByb3BlcnR5SWZOZWVkZWQoaWRlbnRpZmllcikpIHsK LSAgICAgICAgICAgICAgICBrZXlzLT5wdXNoKGV4ZWMsIFN5bWJvbDo6Y3JlYXRlKHZtLCBzdGF0 aWNfY2FzdDxTeW1ib2xJbXBsJj4oKmlkZW50aWZpZXIuaW1wbCgpKSkpOworICAgICAgICAgICAg aWYgKCF2bS5wcm9wZXJ0eU5hbWVzLT5pc1ByaXZhdGVOYW1lKGlkZW50aWZpZXIpKSB7CisgICAg ICAgICAgICAgICAgaWYgKGZpbHRlclByb3BlcnR5SWZOZWVkZWQoaWRlbnRpZmllcikpCisgICAg ICAgICAgICAgICAgICAgIGtleXMtPnB1c2goZXhlYywgU3ltYm9sOjpjcmVhdGUodm0sIHN0YXRp Y19jYXN0PFN5bWJvbEltcGwmPigqaWRlbnRpZmllci5pbXBsKCkpKSk7CiAgICAgICAgICAgICAg ICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgbnVsbHB0cik7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KQEAgLTc3NywxOCArNzc3LDE4IEBAIEpTQXJyYXkqIG93blByb3BlcnR5S2V5cyhF eGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiBvYmplY3QsIFByb3BlcnR5TmFtZU1vZGUgcHJvCiAg ICAgICAgICAgICBpZiAoaWRlbnRpZmllci5pc1N5bWJvbCgpKSB7CiAgICAgICAgICAgICAgICAg aWYgKCF2bS5wcm9wZXJ0eU5hbWVzLT5pc1ByaXZhdGVOYW1lKGlkZW50aWZpZXIpKQogICAgICAg ICAgICAgICAgICAgICBwcm9wZXJ0eVN5bWJvbHMuYXBwZW5kKGlkZW50aWZpZXIpOwotICAgICAg ICAgICAgfSBlbHNlIGlmIChmaWx0ZXJQcm9wZXJ0eUlmTmVlZGVkKGlkZW50aWZpZXIpKSB7Ci0g ICAgICAgICAgICAgICAga2V5cy0+cHVzaChleGVjLCBqc093bmVkU3RyaW5nKGV4ZWMsIGlkZW50 aWZpZXIuc3RyaW5nKCkpKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAg aWYgKGZpbHRlclByb3BlcnR5SWZOZWVkZWQoaWRlbnRpZmllcikpCisgICAgICAgICAgICAgICAg ICAgIGtleXMtPnB1c2goZXhlYywganNPd25lZFN0cmluZyhleGVjLCBpZGVudGlmaWVyLnN0cmlu ZygpKSk7CiAgICAgICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgbnVsbHB0 cik7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAgICAgICAvLyBUbyBlbnN1cmUgdGhl IG9yZGVyIGRlZmluZWQgaW4gdGhlIHNwZWMgKDkuMS4xMiksIHdlIGFwcGVuZCBzeW1ib2xzIGF0 IHRoZSBsYXN0IGVsZW1lbnRzIG9mIGtleXMuCiAgICAgICAgIGZvciAoY29uc3QgYXV0byYgaWRl bnRpZmllciA6IHByb3BlcnR5U3ltYm9scykgewotICAgICAgICAgICAgaWYgKGZpbHRlclByb3Bl cnR5SWZOZWVkZWQoaWRlbnRpZmllcikpIHsKKyAgICAgICAgICAgIGlmIChmaWx0ZXJQcm9wZXJ0 eUlmTmVlZGVkKGlkZW50aWZpZXIpKQogICAgICAgICAgICAgICAgIGtleXMtPnB1c2goZXhlYywg U3ltYm9sOjpjcmVhdGUodm0sIHN0YXRpY19jYXN0PFN5bWJvbEltcGwmPigqaWRlbnRpZmllci5p bXBsKCkpKSk7Ci0gICAgICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgbnVs bHB0cik7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNj b3BlLCBudWxscHRyKTsKICAgICAgICAgfQogCiAgICAgICAgIGJyZWFrOwo=