165012 2016-11-21 15:03:36 -0800 Fix exception scope verification failures in GenericArgumentsInlines.h. 2017-03-16 17:51:45 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 162351 1 mark.lam mark.lam fpizlo ggaren jfbastien keith_miller msaboff saam ysuzuki oldest_to_newest 1253295 0 mark.lam 2016-11-21 15:03:36 -0800 Patch coming. 1253296 1 295315 mark.lam 2016-11-21 15:06:36 -0800 Created attachment 295315 proposed patch. 1253298 2 295315 saam 2016-11-21 15:10:20 -0800 Comment on attachment 295315 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=295315&action=review > Source/JavaScriptCore/runtime/GenericArgumentsInlines.h:213 > + RETURN_IF_EXCEPTION(scope, false); I wonder if this should be an assertion instead of a return. Why would this fail? 1288870 3 295315 mark.lam 2017-03-16 17:38:44 -0700 Comment on attachment 295315 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=295315&action=review >> Source/JavaScriptCore/runtime/GenericArgumentsInlines.h:213 >> + RETURN_IF_EXCEPTION(scope, false); > > I wonder if this should be an assertion instead of a return. Why would this fail? I think you're right. As far as I can remember, the reason I added this check was because: 1. putDirectMayBeIndex() may call putDirectIndex() with mode PutDirectIndexLikePutDirect. 2. putDirectIndex() may call putDirectIndexBeyondVectorLength(). 3. putDirectIndexBeyondVectorLength() may call putDirectIndexBeyondVectorLengthWithArrayStorage(). 4. putDirectIndexBeyondVectorLengthWithArrayStorage() may throw if mode == PutDirectIndexShouldThrow. So, in our case here, we wouldn't expect an exception because the PutDirectIndexMode is never PutDirectIndexShouldThrow. I'll change this to an assert. 1288872 4 304729 mark.lam 2017-03-16 17:48:24 -0700 Created attachment 304729 Patch for landing. 1288876 5 mark.lam 2017-03-16 17:51:45 -0700 Thanks for the review. Landed in r214085: <http://trac.webkit.org/r214085>. 295315 2016-11-21 15:06:36 -0800 2017-03-16 17:48:24 -0700 proposed patch. bug-165012.patch text/plain 1759 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4OTUxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDE2LTExLTIxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggZXhjZXB0aW9uIHNjb3BlIHZlcmlmaWNhdGlvbiBmYWlsdXJlcyBpbiBHZW5lcmljQXJndW1l bnRzSW5saW5lcy5oLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTY1MDEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBydW50aW1lL0dlbmVyaWNBcmd1bWVudHNJbmxpbmVzLmg6CisgICAgICAgIChKU0M6 OkdlbmVyaWNBcmd1bWVudHM8VHlwZT46OmRlZmluZU93blByb3BlcnR5KToKKwogMjAxNi0xMS0y MSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGV4Y2VwdGlv biBzY29wZSB2ZXJpZmljYXRpb24gZmFpbHVyZXMgaW4gKkV4ZWN1dGFibGUuY3BwIGZpbGVzLgpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR2VuZXJpY0FyZ3VtZW50c0lubGlu ZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HZW5lcmlj QXJndW1lbnRzSW5saW5lcy5oCShyZXZpc2lvbiAyMDg5NTEpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9HZW5lcmljQXJndW1lbnRzSW5saW5lcy5oCSh3b3JraW5nIGNvcHkpCkBA IC0xODAsNiArMTgwLDcgQEAgYm9vbCBHZW5lcmljQXJndW1lbnRzPFR5cGU+OjpkZWZpbmVPd25Q cgogewogICAgIFR5cGUqIHRoaXNPYmplY3QgPSBqc0Nhc3Q8VHlwZSo+KG9iamVjdCk7CiAgICAg Vk0mIHZtID0gZXhlYy0+dm0oKTsKKyAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09Q RSh2bSk7CiAgICAgCiAgICAgaWYgKGlkZW50ID09IHZtLnByb3BlcnR5TmFtZXMtPmxlbmd0aAog ICAgICAgICB8fCBpZGVudCA9PSB2bS5wcm9wZXJ0eU5hbWVzLT5jYWxsZWUKQEAgLTIwOSwxMSAr MjEwLDEzIEBAIGJvb2wgR2VuZXJpY0FyZ3VtZW50czxUeXBlPjo6ZGVmaW5lT3duUHIKICAgICAg ICAgICAgIEpTVmFsdWUgdmFsdWUgPSB0aGlzT2JqZWN0LT5nZXRJbmRleFF1aWNrbHkoaW5kZXgp OwogICAgICAgICAgICAgQVNTRVJUKHZhbHVlKTsKICAgICAgICAgICAgIG9iamVjdC0+cHV0RGly ZWN0TWF5QmVJbmRleChleGVjLCBpZGVudCwgdmFsdWUpOworICAgICAgICAgICAgUkVUVVJOX0lG X0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOwogICAgICAgICAgICAgdGhpc09iamVjdC0+b3ZlcnJp ZGVBcmd1bWVudCh2bSwgaW5kZXgpOwogICAgICAgICB9CiAgICAgfQogICAgIAogICAgIC8vIE5v dyBqdXN0IGxldCB0aGUgbm9ybWFsIG9iamVjdCBtYWNoaW5lcnkgZG8gaXRzIHRoaW5nLgorICAg IHNjb3BlLnJlbGVhc2UoKTsKICAgICByZXR1cm4gQmFzZTo6ZGVmaW5lT3duUHJvcGVydHkob2Jq ZWN0LCBleGVjLCBpZGVudCwgZGVzY3JpcHRvciwgc2hvdWxkVGhyb3cpOwogfQogCg== 304729 2017-03-16 17:48:24 -0700 2017-03-16 17:48:24 -0700 Patch for landing. bug-165012.patch text/plain 1894 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjE0MDgzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDE3LTAzLTE2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggZXhjZXB0aW9uIHNjb3BlIHZlcmlmaWNhdGlvbiBmYWlsdXJlcyBpbiBHZW5lcmljQXJndW1l bnRzSW5saW5lcy5oLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTY1MDEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FhbSBCYXJhdGkuCisKKyAgICAg ICAgKiBydW50aW1lL0dlbmVyaWNBcmd1bWVudHNJbmxpbmVzLmg6CisgICAgICAgIChKU0M6Okdl bmVyaWNBcmd1bWVudHM8VHlwZT46OmRlZmluZU93blByb3BlcnR5KToKKwogMjAxNy0wMy0xNiAg TWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQXJyYXkgY29uY2F0IG9w ZXJhdGlvbiBzaG91bGQgY2hlY2sgZm9yIGxlbmd0aCBvdmVyZmxvd3MuCkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9HZW5lcmljQXJndW1lbnRzSW5saW5lcy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0dlbmVyaWNBcmd1bWVudHNJbmxp bmVzLmgJKHJldmlzaW9uIDIxNDA4MykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0dlbmVyaWNBcmd1bWVudHNJbmxpbmVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTIwMCw2ICsyMDAs NyBAQCBib29sIEdlbmVyaWNBcmd1bWVudHM8VHlwZT46OmRlZmluZU93blByCiB7CiAgICAgVHlw ZSogdGhpc09iamVjdCA9IGpzQ2FzdDxUeXBlKj4ob2JqZWN0KTsKICAgICBWTSYgdm0gPSBleGVj LT52bSgpOworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKICAgICAK ICAgICBpZiAoaWRlbnQgPT0gdm0ucHJvcGVydHlOYW1lcy0+bGVuZ3RoCiAgICAgICAgIHx8IGlk ZW50ID09IHZtLnByb3BlcnR5TmFtZXMtPmNhbGxlZQpAQCAtMjI2LDcgKzIyNyw4IEBAIGJvb2wg R2VuZXJpY0FyZ3VtZW50czxUeXBlPjo6ZGVmaW5lT3duUHIKICAgICAgICAgICAgICAgICAgICAg SlNWYWx1ZSB2YWx1ZSA9IHRoaXNPYmplY3QtPmdldEluZGV4UXVpY2tseShpbmRleCk7CiAgICAg ICAgICAgICAgICAgICAgIEFTU0VSVCh2YWx1ZSk7CiAgICAgICAgICAgICAgICAgICAgIG9iamVj dC0+cHV0RGlyZWN0TWF5QmVJbmRleChleGVjLCBpZGVudCwgdmFsdWUpOwotICAgICAgICAgICAg ICAgICAgICAKKyAgICAgICAgICAgICAgICAgICAgQVNTRVJUKCFzY29wZS5leGNlcHRpb24oKSk7 CisKICAgICAgICAgICAgICAgICAgICAgdGhpc09iamVjdC0+c2V0TW9kaWZpZWRBcmd1bWVudERl c2NyaXB0b3Iodm0sIGluZGV4KTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CkBA IC0yNTAsNiArMjUyLDcgQEAgYm9vbCBHZW5lcmljQXJndW1lbnRzPFR5cGU+OjpkZWZpbmVPd25Q cgogICAgIH0KIAogICAgIC8vIE5vdyBqdXN0IGxldCB0aGUgbm9ybWFsIG9iamVjdCBtYWNoaW5l cnkgZG8gaXRzIHRoaW5nLgorICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICByZXR1cm4gQmFzZTo6 ZGVmaW5lT3duUHJvcGVydHkob2JqZWN0LCBleGVjLCBpZGVudCwgZGVzY3JpcHRvciwgc2hvdWxk VGhyb3cpOwogfQogCg==