165046 2016-11-23 09:24:04 -0800 Fix exception scope verification failures in runtime/Operations.cpp/h. 2016-11-28 15:24:47 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 162351 165035 1 mark.lam mark.lam fpizlo ggaren jfbastien keith_miller msaboff saam ysuzuki oldest_to_newest 1253498 0 mark.lam 2016-11-23 09:24:04 -0800 Patch coming. 1253500 1 295370 mark.lam 2016-11-23 09:34:41 -0800 Created attachment 295370 proposed patch. 1254001 2 295370 saam 2016-11-28 14:15:53 -0800 Comment on attachment 295370 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=295370&action=review > Source/JavaScriptCore/runtime/Operations.cpp:54 > + auto p2String = p2.toString(callFrame); I think it's helpful to have types here. > Source/JavaScriptCore/runtime/Operations.cpp:61 > + auto p1String = p1.toString(callFrame); ditto 1254046 3 295370 mark.lam 2016-11-28 15:20:37 -0800 Comment on attachment 295370 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=295370&action=review >> Source/JavaScriptCore/runtime/Operations.cpp:54 >> + auto p2String = p2.toString(callFrame); > > I think it's helpful to have types here. Fixed. >> Source/JavaScriptCore/runtime/Operations.cpp:61 >> + auto p1String = p1.toString(callFrame); > > ditto Fixed. 1254047 4 mark.lam 2016-11-28 15:24:47 -0800 Thanks for the review. Landed in r209030: <http://trac.webkit.org/r209030>. 295370 2016-11-23 09:34:41 -0800 2016-11-28 15:17:10 -0800 proposed patch. bug-165046.patch text/plain 6608 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4OTcwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDE2LTExLTIzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggZXhjZXB0aW9uIHNjb3BlIHZlcmlmaWNhdGlvbiBmYWlsdXJlcyBpbiBydW50aW1lL09wZXJh dGlvbnMuY3BwL2guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNjUwNDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBbHNvIHN3aXRjaGVkIHRvIHVzaW5nIHJldHVybmluZyB7IH0gaW5zdGVhZCBvZiBKU1Zh bHVlKCkuCisKKyAgICAgICAgKiBydW50aW1lL09wZXJhdGlvbnMuY3BwOgorICAgICAgICAoSlND Ojpqc0FkZFNsb3dDYXNlKToKKyAgICAgICAgKEpTQzo6anNJc09iamVjdFR5cGVPck51bGwpOgor ICAgICAgICAqIHJ1bnRpbWUvT3BlcmF0aW9ucy5oOgorICAgICAgICAoSlNDOjpqc1N0cmluZ0Zy b21SZWdpc3RlckFycmF5KToKKyAgICAgICAgKEpTQzo6anNTdHJpbmdGcm9tQXJndW1lbnRzKToK KyAgICAgICAgKEpTQzo6anNMZXNzKToKKyAgICAgICAgKEpTQzo6anNMZXNzRXEpOgorCiAyMDE2 LTExLTIzICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBS ZW1vdmUgRU5BQkxFX0FTU0VNQkxFUl9XWF9FWENMVVNJVkUgY29kZQpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvT3BlcmF0aW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3BlcmF0aW9ucy5jcHAJKHJldmlzaW9uIDIwODk2OCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wZXJhdGlvbnMuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00NiwxNyArNDYsMjggQEAgTkVWRVJfSU5MSU5FIEpTVmFsdWUganNBZGRTbG93 Q2FzZShDYWxsRgogICAgIFZNJiB2bSA9IGNhbGxGcmFtZS0+dm0oKTsKICAgICBhdXRvIHNjb3Bl ID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CiAgICAgSlNWYWx1ZSBwMSA9IHYxLnRvUHJpbWl0 aXZlKGNhbGxGcmFtZSk7Ci0gICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1ZSgp KTsKKyAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOwogICAgIEpTVmFsdWUgcDIg PSB2Mi50b1ByaW1pdGl2ZShjYWxsRnJhbWUpOwotICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2Nv cGUsIEpTVmFsdWUoKSk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKIAot ICAgIGlmIChwMS5pc1N0cmluZygpKQotICAgICAgICByZXR1cm4ganNTdHJpbmcoY2FsbEZyYW1l LCBhc1N0cmluZyhwMSksIHAyLnRvU3RyaW5nKGNhbGxGcmFtZSkpOworICAgIGlmIChwMS5pc1N0 cmluZygpKSB7CisgICAgICAgIGF1dG8gcDJTdHJpbmcgPSBwMi50b1N0cmluZyhjYWxsRnJhbWUp OworICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOworICAgICAgICBzY29w ZS5yZWxlYXNlKCk7CisgICAgICAgIHJldHVybiBqc1N0cmluZyhjYWxsRnJhbWUsIGFzU3RyaW5n KHAxKSwgcDJTdHJpbmcpOworICAgIH0KIAotICAgIGlmIChwMi5pc1N0cmluZygpKQotICAgICAg ICByZXR1cm4ganNTdHJpbmcoY2FsbEZyYW1lLCBwMS50b1N0cmluZyhjYWxsRnJhbWUpLCBhc1N0 cmluZyhwMikpOworICAgIGlmIChwMi5pc1N0cmluZygpKSB7CisgICAgICAgIGF1dG8gcDFTdHJp bmcgPSBwMS50b1N0cmluZyhjYWxsRnJhbWUpOworICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9O KHNjb3BlLCB7IH0pOworICAgICAgICBzY29wZS5yZWxlYXNlKCk7CisgICAgICAgIHJldHVybiBq c1N0cmluZyhjYWxsRnJhbWUsIHAxU3RyaW5nLCBhc1N0cmluZyhwMikpOworICAgIH0KIAotICAg IHJldHVybiBqc051bWJlcihwMS50b051bWJlcihjYWxsRnJhbWUpICsgcDIudG9OdW1iZXIoY2Fs bEZyYW1lKSk7CisgICAgZG91YmxlIHAxTnVtYmVyID0gcDEudG9OdW1iZXIoY2FsbEZyYW1lKTsK KyAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOworICAgIHNjb3BlLnJlbGVhc2Uo KTsKKyAgICByZXR1cm4ganNOdW1iZXIocDFOdW1iZXIgKyBwMi50b051bWJlcihjYWxsRnJhbWUp KTsKIH0KIAogSlNWYWx1ZSBqc1R5cGVTdHJpbmdGb3JWYWx1ZShWTSYgdm0sIEpTR2xvYmFsT2Jq ZWN0KiBnbG9iYWxPYmplY3QsIEpTVmFsdWUgdikKQEAgLTk2LDYgKzEwNyw3IEBAIEpTVmFsdWUg anNUeXBlU3RyaW5nRm9yVmFsdWUoQ2FsbEZyYW1lKiAKIAogYm9vbCBqc0lzT2JqZWN0VHlwZU9y TnVsbChDYWxsRnJhbWUqIGNhbGxGcmFtZSwgSlNWYWx1ZSB2KQogeworICAgIFZNJiB2bSA9IGNh bGxGcmFtZS0+dm0oKTsKICAgICBpZiAoIXYuaXNDZWxsKCkpCiAgICAgICAgIHJldHVybiB2Lmlz TnVsbCgpOwogCkBAIC0xMDMsMTEgKzExNSwxMSBAQCBib29sIGpzSXNPYmplY3RUeXBlT3JOdWxs KENhbGxGcmFtZSogY2FsCiAgICAgaWYgKHR5cGUgPT0gU3RyaW5nVHlwZSB8fCB0eXBlID09IFN5 bWJvbFR5cGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAodHlwZSA+PSBPYmplY3RU eXBlKSB7Ci0gICAgICAgIGlmIChhc09iamVjdCh2KS0+c3RydWN0dXJlKGNhbGxGcmFtZS0+dm0o KSktPm1hc3F1ZXJhZGVzQXNVbmRlZmluZWQoY2FsbEZyYW1lLT5sZXhpY2FsR2xvYmFsT2JqZWN0 KCkpKQorICAgICAgICBpZiAoYXNPYmplY3QodiktPnN0cnVjdHVyZSh2bSktPm1hc3F1ZXJhZGVz QXNVbmRlZmluZWQoY2FsbEZyYW1lLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCkpKQogICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBDYWxsRGF0YSBjYWxsRGF0YTsKICAgICAgICAgSlNP YmplY3QqIG9iamVjdCA9IGFzT2JqZWN0KHYpOwotICAgICAgICBpZiAob2JqZWN0LT5tZXRob2RU YWJsZShjYWxsRnJhbWUtPnZtKCkpLT5nZXRDYWxsRGF0YShvYmplY3QsIGNhbGxEYXRhKSAhPSBD YWxsVHlwZTo6Tm9uZSkKKyAgICAgICAgaWYgKG9iamVjdC0+bWV0aG9kVGFibGUodm0pLT5nZXRD YWxsRGF0YShvYmplY3QsIGNhbGxEYXRhKSAhPSBDYWxsVHlwZTo6Tm9uZSkKICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICB9CiAgICAgcmV0dXJuIHRydWU7CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9PcGVyYXRpb25zLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvT3BlcmF0aW9ucy5oCShyZXZpc2lvbiAyMDg5NjgpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcGVyYXRpb25zLmgJKHdvcmtpbmcgY29weSkK QEAgLTEyNiw3ICsxMjYsOSBAQCBBTFdBWVNfSU5MSU5FIEpTVmFsdWUganNTdHJpbmdGcm9tUmVn aXN0CiAKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY291bnQ7ICsraSkgewogICAgICAg ICBKU1ZhbHVlIHYgPSBzdHJpbmdzWy1zdGF0aWNfY2FzdDxpbnQ+KGkpXS5qc1ZhbHVlKCk7Ci0g ICAgICAgIGlmICghcm9wZUJ1aWxkZXIuYXBwZW5kKHYudG9TdHJpbmcoZXhlYykpKQorICAgICAg ICBKU1N0cmluZyogc3RyaW5nID0gdi50b1N0cmluZyhleGVjKTsKKyAgICAgICAgUkVUVVJOX0lG X0VYQ0VQVElPTihzY29wZSwgeyB9KTsKKyAgICAgICAgaWYgKCFyb3BlQnVpbGRlci5hcHBlbmQo c3RyaW5nKSkKICAgICAgICAgICAgIHJldHVybiB0aHJvd091dE9mTWVtb3J5RXJyb3IoZXhlYywg c2NvcGUpOwogICAgIH0KIApAQCAtMTM4LDExICsxNDAsMTUgQEAgQUxXQVlTX0lOTElORSBKU1Zh bHVlIGpzU3RyaW5nRnJvbUFyZ3VtZQogICAgIFZNKiB2bSA9ICZleGVjLT52bSgpOwogICAgIGF1 dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKCp2bSk7CiAgICAgSlNSb3BlU3RyaW5nOjpS b3BlQnVpbGRlciByb3BlQnVpbGRlcigqdm0pOwotICAgIHJvcGVCdWlsZGVyLmFwcGVuZCh0aGlz VmFsdWUudG9TdHJpbmcoZXhlYykpOworICAgIEpTU3RyaW5nKiBzdHIgPSB0aGlzVmFsdWUudG9T dHJpbmcoZXhlYyk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKKyAgICBy b3BlQnVpbGRlci5hcHBlbmQoc3RyKTsKIAogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBl eGVjLT5hcmd1bWVudENvdW50KCk7ICsraSkgewogICAgICAgICBKU1ZhbHVlIHYgPSBleGVjLT5h cmd1bWVudChpKTsKLSAgICAgICAgaWYgKCFyb3BlQnVpbGRlci5hcHBlbmQodi50b1N0cmluZyhl eGVjKSkpCisgICAgICAgIEpTU3RyaW5nKiBzdHIgPSB2LnRvU3RyaW5nKGV4ZWMpOworICAgICAg ICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOworICAgICAgICBpZiAoVU5MSUtFTFko IXJvcGVCdWlsZGVyLmFwcGVuZChzdHIpKSkKICAgICAgICAgICAgIHJldHVybiB0aHJvd091dE9m TWVtb3J5RXJyb3IoZXhlYywgc2NvcGUpOwogICAgIH0KIApAQCAtMTU1LDYgKzE2MSw5IEBAIEFM V0FZU19JTkxJTkUgSlNWYWx1ZSBqc1N0cmluZ0Zyb21Bcmd1bWUKIHRlbXBsYXRlPGJvb2wgbGVm dEZpcnN0PgogQUxXQVlTX0lOTElORSBib29sIGpzTGVzcyhDYWxsRnJhbWUqIGNhbGxGcmFtZSwg SlNWYWx1ZSB2MSwgSlNWYWx1ZSB2MikKIHsKKyAgICBWTSYgdm0gPSBjYWxsRnJhbWUtPnZtKCk7 CisgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOworCiAgICAgaWYgKHYx LmlzSW50MzIoKSAmJiB2Mi5pc0ludDMyKCkpCiAgICAgICAgIHJldHVybiB2MS5hc0ludDMyKCkg PCB2Mi5hc0ludDMyKCk7CiAKQEAgLTE3MiwxMSArMTgxLDE0IEBAIEFMV0FZU19JTkxJTkUgYm9v bCBqc0xlc3MoQ2FsbEZyYW1lKiBjYWwKICAgICBib29sIHdhc05vdFN0cmluZzI7CiAgICAgaWYg KGxlZnRGaXJzdCkgewogICAgICAgICB3YXNOb3RTdHJpbmcxID0gdjEuZ2V0UHJpbWl0aXZlTnVt YmVyKGNhbGxGcmFtZSwgbjEsIHAxKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29w ZSwgZmFsc2UpOwogICAgICAgICB3YXNOb3RTdHJpbmcyID0gdjIuZ2V0UHJpbWl0aXZlTnVtYmVy KGNhbGxGcmFtZSwgbjIsIHAyKTsKICAgICB9IGVsc2UgewogICAgICAgICB3YXNOb3RTdHJpbmcy ID0gdjIuZ2V0UHJpbWl0aXZlTnVtYmVyKGNhbGxGcmFtZSwgbjIsIHAyKTsKKyAgICAgICAgUkVU VVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOwogICAgICAgICB3YXNOb3RTdHJpbmcxID0g djEuZ2V0UHJpbWl0aXZlTnVtYmVyKGNhbGxGcmFtZSwgbjEsIHAxKTsKICAgICB9CisgICAgUkVU VVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOwogCiAgICAgaWYgKHdhc05vdFN0cmluZzEg fCB3YXNOb3RTdHJpbmcyKQogICAgICAgICByZXR1cm4gbjEgPCBuMjsKQEAgLTE4OSw2ICsyMDEs OSBAQCBBTFdBWVNfSU5MSU5FIGJvb2wganNMZXNzKENhbGxGcmFtZSogY2FsCiB0ZW1wbGF0ZTxi b29sIGxlZnRGaXJzdD4KIEFMV0FZU19JTkxJTkUgYm9vbCBqc0xlc3NFcShDYWxsRnJhbWUqIGNh bGxGcmFtZSwgSlNWYWx1ZSB2MSwgSlNWYWx1ZSB2MikKIHsKKyAgICBWTSYgdm0gPSBjYWxsRnJh bWUtPnZtKCk7CisgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOworCiAg ICAgaWYgKHYxLmlzSW50MzIoKSAmJiB2Mi5pc0ludDMyKCkpCiAgICAgICAgIHJldHVybiB2MS5h c0ludDMyKCkgPD0gdjIuYXNJbnQzMigpOwogCkBAIC0yMDYsMTEgKzIyMSwxNCBAQCBBTFdBWVNf SU5MSU5FIGJvb2wganNMZXNzRXEoQ2FsbEZyYW1lKiBjCiAgICAgYm9vbCB3YXNOb3RTdHJpbmcy OwogICAgIGlmIChsZWZ0Rmlyc3QpIHsKICAgICAgICAgd2FzTm90U3RyaW5nMSA9IHYxLmdldFBy aW1pdGl2ZU51bWJlcihjYWxsRnJhbWUsIG4xLCBwMSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIGZhbHNlKTsKICAgICAgICAgd2FzTm90U3RyaW5nMiA9IHYyLmdldFByaW1p dGl2ZU51bWJlcihjYWxsRnJhbWUsIG4yLCBwMik7CiAgICAgfSBlbHNlIHsKICAgICAgICAgd2Fz Tm90U3RyaW5nMiA9IHYyLmdldFByaW1pdGl2ZU51bWJlcihjYWxsRnJhbWUsIG4yLCBwMik7Cisg ICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGZhbHNlKTsKICAgICAgICAgd2FzTm90 U3RyaW5nMSA9IHYxLmdldFByaW1pdGl2ZU51bWJlcihjYWxsRnJhbWUsIG4xLCBwMSk7CiAgICAg fQorICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGZhbHNlKTsKIAogICAgIGlmICh3YXNO b3RTdHJpbmcxIHwgd2FzTm90U3RyaW5nMikKICAgICAgICAgcmV0dXJuIG4xIDw9IG4yOwo=