169136 2017-03-03 09:19:07 -0800 We should only check for traps that we're able to handle. 2017-03-03 09:48:13 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam commit-queue keith_miller msaboff saam oldest_to_newest 1283177 0 mark.lam 2017-03-03 09:19:07 -0800 The execute methods in interpreter were checking for the existence of any traps (without masking) and only handling a subset of those via a mask. This can result in a failed assertion on debug builds. 1283183 1 303326 mark.lam 2017-03-03 09:25:42 -0800 Created attachment 303326 proposed patch. 1283184 2 303326 msaboff 2017-03-03 09:32:03 -0800 Comment on attachment 303326 proposed patch. r=me 1283187 3 mark.lam 2017-03-03 09:48:13 -0800 Thanks for the review. Landed in r213367: <http://trac.webkit.org/r213367>. 303326 2017-03-03 09:25:42 -0800 2017-03-03 09:32:03 -0800 proposed patch. bug-169136.patch text/plain 5431 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjEzMzY2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDE3LTAzLTAzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBX ZSBzaG91bGQgb25seSBjaGVjayBmb3IgdHJhcHMgdGhhdCB3ZSdyZSBhYmxlIHRvIGhhbmRsZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTEzNgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBleGVj dXRlIG1ldGhvZHMgaW4gaW50ZXJwcmV0ZXIgd2VyZSBjaGVja2luZyBmb3IgdGhlIGV4aXN0ZW5j ZSBvZiBhbnkgdHJhcHMKKyAgICAgICAgKHdpdGhvdXQgbWFza2luZykgYW5kIG9ubHkgaGFuZGxp bmcgYSBzdWJzZXQgb2YgdGhvc2UgdmlhIGEgbWFzay4gIFRoaXMgY2FuCisgICAgICAgIHJlc3Vs dCBpbiBhIGZhaWxlZCBhc3NlcnRpb24gb24gZGVidWcgYnVpbGRzLgorCisgICAgICAgIFRoaXMg cGF0Y2ggZml4ZXMgdGhpcyBieSBhcHBseWluZyB0aGUgc2FtZSBtYXNrIGZvciBib3RoIHRoZSBu ZWVkVHJhcEhhbmRsaW5nKCkKKyAgICAgICAgY2hlY2sgYW5kIHRoZSBoYW5kbGVUcmFwcygpIGNh bGwuICBBbHNvIGFkZGVkIGEgZmV3IGFzc2VydGlvbnMuCisKKyAgICAgICAgKiBpbnRlcnByZXRl ci9JbnRlcnByZXRlci5jcHA6CisgICAgICAgIChKU0M6OkludGVycHJldGVyOjpleGVjdXRlUHJv Z3JhbSk6CisgICAgICAgIChKU0M6OkludGVycHJldGVyOjpleGVjdXRlQ2FsbCk6CisgICAgICAg IChKU0M6OkludGVycHJldGVyOjpleGVjdXRlQ29uc3RydWN0KToKKyAgICAgICAgKEpTQzo6SW50 ZXJwcmV0ZXI6OmV4ZWN1dGUpOgorICAgICAgICAqIGppdC9KSVRPcGVyYXRpb25zLmNwcDoKKyAg ICAgICAgKiBsbGludC9MTEludFNsb3dQYXRocy5jcHA6CisgICAgICAgIChKU0M6OkxMSW50OjpM TElOVF9TTE9XX1BBVEhfREVDTCk6CisKIDIwMTctMDMtMDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJlbW90ZSBJbnNwZWN0b3I6IE1vdmUg dXBkYXRlVGFyZ2V0TGlzdGluZygpIG1ldGhvZHMgdG8gUmVtb3RlSW5zcGVjdG9yLmNwcApJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIu Y3BwCShyZXZpc2lvbiAyMTMzNjUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0 ZXIvSW50ZXJwcmV0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NjAsOCArODYwLDggQEAgZmFp bGVkSlNPTlA6CiAgICAgICAgIGNvZGVCbG9jayA9IGpzQ2FzdDxQcm9ncmFtQ29kZUJsb2NrKj4o dGVtcENvZGVCbG9jayk7CiAgICAgfQogCi0gICAgaWYgKFVOTElLRUxZKHZtLm5lZWRUcmFwSGFu ZGxpbmcoKSkpIHsKLSAgICAgICAgVk1UcmFwczo6TWFzayBtYXNrKFZNVHJhcHM6Ok5lZWRUZXJt aW5hdGlvbiwgVk1UcmFwczo6TmVlZFdhdGNoZG9nQ2hlY2spOworICAgIFZNVHJhcHM6Ok1hc2sg bWFzayhWTVRyYXBzOjpOZWVkVGVybWluYXRpb24sIFZNVHJhcHM6Ok5lZWRXYXRjaGRvZ0NoZWNr KTsKKyAgICBpZiAoVU5MSUtFTFkodm0ubmVlZFRyYXBIYW5kbGluZyhtYXNrKSkpIHsKICAgICAg ICAgdm0uaGFuZGxlVHJhcHMoY2FsbEZyYW1lLCBtYXNrKTsKICAgICAgICAgUkVUVVJOX0lGX0VY Q0VQVElPTih0aHJvd1Njb3BlLCB0aHJvd1Njb3BlLmV4Y2VwdGlvbigpKTsKICAgICB9CkBAIC05 MjEsOCArOTIxLDggQEAgSlNWYWx1ZSBJbnRlcnByZXRlcjo6ZXhlY3V0ZUNhbGwoQ2FsbEZyYQog ICAgIH0gZWxzZQogICAgICAgICBuZXdDb2RlQmxvY2sgPSAwOwogCi0gICAgaWYgKFVOTElLRUxZ KHZtLm5lZWRUcmFwSGFuZGxpbmcoKSkpIHsKLSAgICAgICAgVk1UcmFwczo6TWFzayBtYXNrKFZN VHJhcHM6Ok5lZWRUZXJtaW5hdGlvbiwgVk1UcmFwczo6TmVlZFdhdGNoZG9nQ2hlY2spOworICAg IFZNVHJhcHM6Ok1hc2sgbWFzayhWTVRyYXBzOjpOZWVkVGVybWluYXRpb24sIFZNVHJhcHM6Ok5l ZWRXYXRjaGRvZ0NoZWNrKTsKKyAgICBpZiAoVU5MSUtFTFkodm0ubmVlZFRyYXBIYW5kbGluZyht YXNrKSkpIHsKICAgICAgICAgdm0uaGFuZGxlVHJhcHMoY2FsbEZyYW1lLCBtYXNrKTsKICAgICAg ICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB0aHJvd1Njb3BlLmV4Y2VwdGlvbigp KTsKICAgICB9CkBAIC05ODcsOCArOTg3LDggQEAgSlNPYmplY3QqIEludGVycHJldGVyOjpleGVj dXRlQ29uc3RydWN0KAogICAgIH0gZWxzZQogICAgICAgICBuZXdDb2RlQmxvY2sgPSAwOwogCi0g ICAgaWYgKFVOTElLRUxZKHZtLm5lZWRUcmFwSGFuZGxpbmcoKSkpIHsKLSAgICAgICAgVk1UcmFw czo6TWFzayBtYXNrKFZNVHJhcHM6Ok5lZWRUZXJtaW5hdGlvbiwgVk1UcmFwczo6TmVlZFdhdGNo ZG9nQ2hlY2spOworICAgIFZNVHJhcHM6Ok1hc2sgbWFzayhWTVRyYXBzOjpOZWVkVGVybWluYXRp b24sIFZNVHJhcHM6Ok5lZWRXYXRjaGRvZ0NoZWNrKTsKKyAgICBpZiAoVU5MSUtFTFkodm0ubmVl ZFRyYXBIYW5kbGluZyhtYXNrKSkpIHsKICAgICAgICAgdm0uaGFuZGxlVHJhcHMoY2FsbEZyYW1l LCBtYXNrKTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB0aHJvd1Nj b3BlLmV4Y2VwdGlvbigpKTsKICAgICB9CkBAIC0xMDUyLDggKzEwNTIsOCBAQCBKU1ZhbHVlIElu dGVycHJldGVyOjpleGVjdXRlKENhbGxGcmFtZUNsCiAKICAgICBTdGFja1N0YXRzOjpDaGVja1Bv aW50IHN0YWNrQ2hlY2tQb2ludDsKIAotICAgIGlmIChVTkxJS0VMWSh2bS5uZWVkVHJhcEhhbmRs aW5nKCkpKSB7Ci0gICAgICAgIFZNVHJhcHM6Ok1hc2sgbWFzayhWTVRyYXBzOjpOZWVkVGVybWlu YXRpb24sIFZNVHJhcHM6Ok5lZWRXYXRjaGRvZ0NoZWNrKTsKKyAgICBWTVRyYXBzOjpNYXNrIG1h c2soVk1UcmFwczo6TmVlZFRlcm1pbmF0aW9uLCBWTVRyYXBzOjpOZWVkV2F0Y2hkb2dDaGVjayk7 CisgICAgaWYgKFVOTElLRUxZKHZtLm5lZWRUcmFwSGFuZGxpbmcobWFzaykpKSB7CiAgICAgICAg IHZtLmhhbmRsZVRyYXBzKGNsb3N1cmUub2xkQ2FsbEZyYW1lLCBtYXNrKTsKICAgICAgICAgUkVU VVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB0aHJvd1Njb3BlLmV4Y2VwdGlvbigpKTsKICAg ICB9CkBAIC0xMTU2LDggKzExNTYsOCBAQCBKU1ZhbHVlIEludGVycHJldGVyOjpleGVjdXRlKEV2 YWxFeGVjdXRhCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoVU5MSUtFTFkodm0ubmVlZFRy YXBIYW5kbGluZygpKSkgewotICAgICAgICBWTVRyYXBzOjpNYXNrIG1hc2soVk1UcmFwczo6TmVl ZFRlcm1pbmF0aW9uLCBWTVRyYXBzOjpOZWVkV2F0Y2hkb2dDaGVjayk7CisgICAgVk1UcmFwczo6 TWFzayBtYXNrKFZNVHJhcHM6Ok5lZWRUZXJtaW5hdGlvbiwgVk1UcmFwczo6TmVlZFdhdGNoZG9n Q2hlY2spOworICAgIGlmIChVTkxJS0VMWSh2bS5uZWVkVHJhcEhhbmRsaW5nKG1hc2spKSkgewog ICAgICAgICB2bS5oYW5kbGVUcmFwcyhjYWxsRnJhbWUsIG1hc2spOwogICAgICAgICBSRVRVUk5f SUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHRocm93U2NvcGUuZXhjZXB0aW9uKCkpOwogICAgIH0K QEAgLTExOTgsOCArMTE5OCw4IEBAIEpTVmFsdWUgSW50ZXJwcmV0ZXI6OmV4ZWN1dGUoTW9kdWxl UHJvZ3IKICAgICAgICAgY29kZUJsb2NrID0ganNDYXN0PE1vZHVsZVByb2dyYW1Db2RlQmxvY2sq Pih0ZW1wQ29kZUJsb2NrKTsKICAgICB9CiAKLSAgICBpZiAoVU5MSUtFTFkodm0ubmVlZFRyYXBI YW5kbGluZygpKSkgewotICAgICAgICBWTVRyYXBzOjpNYXNrIG1hc2soVk1UcmFwczo6TmVlZFRl cm1pbmF0aW9uLCBWTVRyYXBzOjpOZWVkV2F0Y2hkb2dDaGVjayk7CisgICAgVk1UcmFwczo6TWFz ayBtYXNrKFZNVHJhcHM6Ok5lZWRUZXJtaW5hdGlvbiwgVk1UcmFwczo6TmVlZFdhdGNoZG9nQ2hl Y2spOworICAgIGlmIChVTkxJS0VMWSh2bS5uZWVkVHJhcEhhbmRsaW5nKG1hc2spKSkgewogICAg ICAgICB2bS5oYW5kbGVUcmFwcyhjYWxsRnJhbWUsIG1hc2spOwogICAgICAgICBSRVRVUk5fSUZf RVhDRVBUSU9OKHRocm93U2NvcGUsIHRocm93U2NvcGUuZXhjZXB0aW9uKCkpOwogICAgIH0KSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcAkocmV2aXNp b24gMjEzMzY1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTIxMiw2ICsxMjEyLDcgQEAgVW51c2VkUHRyIEpJVF9PUEVS QVRJT04gb3BlcmF0aW9uSGFuZGxlVAogewogICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7CiAgICAg TmF0aXZlQ2FsbEZyYW1lVHJhY2VyIHRyYWNlcigmdm0sIGV4ZWMpOworICAgIEFTU0VSVCh2bS5u ZWVkVHJhcEhhbmRsaW5nKCkpOwogICAgIHZtLmhhbmRsZVRyYXBzKGV4ZWMpOwogICAgIHJldHVy biBudWxscHRyOwogfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50U2xv d1BhdGhzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJ bnRTbG93UGF0aHMuY3BwCShyZXZpc2lvbiAyMTMzNjUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDk3LDYgKzE0 OTcsNyBAQCBMTElOVF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfdGhyb3cpCiBMTElOVF9TTE9X X1BBVEhfREVDTChzbG93X3BhdGhfaGFuZGxlX3RyYXBzKQogewogICAgIExMSU5UX0JFR0lOX05P X1NFVF9QQygpOworICAgIEFTU0VSVCh2bS5uZWVkVHJhcEhhbmRsaW5nKCkpOwogICAgIHZtLmhh bmRsZVRyYXBzKGV4ZWMpOwogICAgIExMSU5UX1JFVFVSTl9UV08odGhyb3dTY29wZS5leGNlcHRp b24oKSwgZXhlYyk7CiB9Cg==