226368 2021-05-28 01:12:56 -0700 The jsc shell should not continue executing after a termination has been received. 2021-05-28 09:58:48 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1764708 0 mark.lam 2021-05-28 01:12:56 -0700 rdar://78013374 1764711 1 429996 mark.lam 2021-05-28 01:21:42 -0700 Created attachment 429996 proposed patch. Let's try this on the EWS first. 1764805 2 429996 mark.lam 2021-05-28 09:46:19 -0700 Comment on attachment 429996 proposed patch. Thanks for the review. Landing now. 1764810 3 ews-feeder 2021-05-28 09:58:46 -0700 Committed r278206 (238249@main): <https://commits.webkit.org/238249@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429996. 429996 2021-05-28 01:21:42 -0700 2021-05-28 09:58:47 -0700 proposed patch. bug-226368.patch text/plain 5173 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjc4MTkyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBA CisyMDIxLTA1LTI4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBU aGUganNjIHNoZWxsIHNob3VsZCBub3QgY29udGludWUgZXhlY3V0aW5nIGFmdGVyIGEgdGVybWlu YXRpb24gaGFzIGJlZW4gcmVjZWl2ZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjYzNjgKKyAgICAgICAgcmRhcjovLzc4MDEzMzc0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBtYWtl cyB0aGUganNjIHNoZWxsIGZvcmJpZCBleGVjdXRpb24gaW4gYWxsIHRoZSBwbGFjZXMgdGhhdCBp dCBoYXMKKyAgICAgICAgY2F1Z2h0IGFuZCBzZWVuIGEgVGVybWluYXRpb25FeGNlcHRpb24uCisK KyAgICAgICAgKiBqc2MuY3BwOgorICAgICAgICAoSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKToK KyAgICAgICAgKGNoZWNrRXhjZXB0aW9uKToKKyAgICAgICAgKHJ1bldpdGhPcHRpb25zKToKKyAg ICAgICAgKHJ1bkludGVyYWN0aXZlKToKKwogMjAyMS0wNS0yNyAgUm9iaW4gTW9yaXNzZXQgIDxy bW9yaXNzZXRAYXBwbGUuY29tPgogCiAgICAgICAgIEFpckFsbG9jYXRlU3RhY2tCeUdyYXBoQ29s b3Jpbmcgc2hvdWxkIHVzZSB0aGUgb3B0aW1pemVkIGludGVyZmVyZW5jZSBncmFwaHMgZnJvbSBB aXJBbGxvY2F0ZVJlZ2lzdGVyc0J5R3JhcGhDb2xvcmluZwpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2pzYy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5j cHAJKHJldmlzaW9uIDI3ODE2NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xNTE5LDYgKzE1MTksOCBAQCBKU0NfREVGSU5FX0hPU1RfRlVOQ1RJ T04oZnVuY3Rpb25SdW4sIChKCiAgICAgc3RvcFdhdGNoLnN0b3AoKTsKIAogICAgIGlmIChleGNl cHRpb24pIHsKKyAgICAgICAgaWYgKHZtLmlzVGVybWluYXRpb25FeGNlcHRpb24oZXhjZXB0aW9u LmdldCgpKSkKKyAgICAgICAgICAgIHZtLnNldEV4ZWN1dGlvbkZvcmJpZGRlbigpOwogICAgICAg ICB0aHJvd0V4Y2VwdGlvbihyZWFsbSwgc2NvcGUsIGV4Y2VwdGlvbik7CiAgICAgICAgIHJldHVy biBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiAgICAgfQpAQCAtMTU0OCw2ICsxNTUw LDggQEAgSlNDX0RFRklORV9IT1NUX0ZVTkNUSU9OKGZ1bmN0aW9uUnVuU3RyaQogICAgIGV2YWx1 YXRlKHJlYWxtLCBqc2NTb3VyY2Uoc291cmNlLCBjYWxsRnJhbWUtPmNhbGxlclNvdXJjZU9yaWdp bih2bSkpLCBKU1ZhbHVlKCksIGV4Y2VwdGlvbik7CiAKICAgICBpZiAoZXhjZXB0aW9uKSB7Cisg ICAgICAgIGlmICh2bS5pc1Rlcm1pbmF0aW9uRXhjZXB0aW9uKGV4Y2VwdGlvbi5nZXQoKSkpCisg ICAgICAgICAgICB2bS5zZXRFeGVjdXRpb25Gb3JiaWRkZW4oKTsKICAgICAgICAgc2NvcGUudGhy b3dFeGNlcHRpb24ocmVhbG0sIGV4Y2VwdGlvbik7CiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjpl bmNvZGUoanNVbmRlZmluZWQoKSk7CiAgICAgfQpAQCAtMTU3OSw4ICsxNTgzLDExIEBAIEpTQ19E RUZJTkVfSE9TVF9GVU5DVElPTihmdW5jdGlvbkxvYWQsICgKIAogICAgIE5ha2VkUHRyPEV4Y2Vw dGlvbj4gZXZhbHVhdGlvbkV4Y2VwdGlvbjsKICAgICBKU1ZhbHVlIHJlc3VsdCA9IGV2YWx1YXRl KGdsb2JhbE9iamVjdCwganNjU291cmNlKHNjcmlwdCwgU291cmNlT3JpZ2luIHsgcGF0aCB9LCBm aWxlTmFtZSksIEpTVmFsdWUoKSwgZXZhbHVhdGlvbkV4Y2VwdGlvbik7Ci0gICAgaWYgKGV2YWx1 YXRpb25FeGNlcHRpb24pCisgICAgaWYgKGV2YWx1YXRpb25FeGNlcHRpb24pIHsKKyAgICAgICAg aWYgKHZtLmlzVGVybWluYXRpb25FeGNlcHRpb24oZXZhbHVhdGlvbkV4Y2VwdGlvbi5nZXQoKSkp CisgICAgICAgICAgICB2bS5zZXRFeGVjdXRpb25Gb3JiaWRkZW4oKTsKICAgICAgICAgdGhyb3dF eGNlcHRpb24oZ2xvYmFsT2JqZWN0LCBzY29wZSwgZXZhbHVhdGlvbkV4Y2VwdGlvbik7CisgICAg fQogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKIH0KIApAQCAtMTU5NCw4ICsx NjAxLDExIEBAIEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTihmdW5jdGlvbkxvYWRTdHIKIAogICAg IE5ha2VkUHRyPEV4Y2VwdGlvbj4gZXZhbHVhdGlvbkV4Y2VwdGlvbjsKICAgICBKU1ZhbHVlIHJl c3VsdCA9IGV2YWx1YXRlKGdsb2JhbE9iamVjdCwganNjU291cmNlKHNvdXJjZUNvZGUsIGNhbGxG cmFtZS0+Y2FsbGVyU291cmNlT3JpZ2luKHZtKSksIEpTVmFsdWUoKSwgZXZhbHVhdGlvbkV4Y2Vw dGlvbik7Ci0gICAgaWYgKGV2YWx1YXRpb25FeGNlcHRpb24pCisgICAgaWYgKGV2YWx1YXRpb25F eGNlcHRpb24pIHsKKyAgICAgICAgaWYgKHZtLmlzVGVybWluYXRpb25FeGNlcHRpb24oZXZhbHVh dGlvbkV4Y2VwdGlvbi5nZXQoKSkpCisgICAgICAgICAgICB2bS5zZXRFeGVjdXRpb25Gb3JiaWRk ZW4oKTsKICAgICAgICAgdGhyb3dFeGNlcHRpb24oZ2xvYmFsT2JqZWN0LCBzY29wZSwgZXZhbHVh dGlvbkV4Y2VwdGlvbik7CisgICAgfQogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0 KTsKIH0KIApAQCAtMTkyNCw4ICsxOTM0LDExIEBAIEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTihm dW5jdGlvbkRvbGxhckUKIAogICAgIE5ha2VkUHRyPEV4Y2VwdGlvbj4gZXZhbHVhdGlvbkV4Y2Vw dGlvbjsKICAgICBKU1ZhbHVlIHJlc3VsdCA9IGV2YWx1YXRlKHJlYWxtLCBqc2NTb3VyY2Uoc291 cmNlQ29kZSwgY2FsbEZyYW1lLT5jYWxsZXJTb3VyY2VPcmlnaW4odm0pKSwgSlNWYWx1ZSgpLCBl dmFsdWF0aW9uRXhjZXB0aW9uKTsKLSAgICBpZiAoZXZhbHVhdGlvbkV4Y2VwdGlvbikKKyAgICBp ZiAoZXZhbHVhdGlvbkV4Y2VwdGlvbikgeworICAgICAgICBpZiAodm0uaXNUZXJtaW5hdGlvbkV4 Y2VwdGlvbihldmFsdWF0aW9uRXhjZXB0aW9uLmdldCgpKSkKKyAgICAgICAgICAgIHZtLnNldEV4 ZWN1dGlvbkZvcmJpZGRlbigpOwogICAgICAgICB0aHJvd0V4Y2VwdGlvbihnbG9iYWxPYmplY3Qs IHNjb3BlLCBldmFsdWF0aW9uRXhjZXB0aW9uKTsKKyAgICB9CiAgICAgcmV0dXJuIEpTVmFsdWU6 OmVuY29kZShyZXN1bHQpOwogfQogCkBAIC0yOTYxLDkgKzI5NzQsMTIgQEAgc3RhdGljIHZvaWQg Y2hlY2tFeGNlcHRpb24oR2xvYmFsT2JqZWN0KgogICAgICAgICByZXR1cm4gdmFsdWVDZWxsID09 IHRlcm1pbmF0aW9uRXJyb3I7CiAgICAgfTsKIAotICAgIGlmIChvcHRpb25zLm1fdHJlYXRXYXRj aGRvZ0V4Y2VwdGlvbkFzU3VjY2VzcyAmJiBpc1Rlcm1pbmF0aW9uRXhjZXB0aW9uKHZhbHVlKSkg ewotICAgICAgICBBU1NFUlQoaGFzRXhjZXB0aW9uKTsKLSAgICAgICAgcmV0dXJuOworICAgIGlm IChpc1Rlcm1pbmF0aW9uRXhjZXB0aW9uKHZhbHVlKSkgeworICAgICAgICB2bS5zZXRFeGVjdXRp b25Gb3JiaWRkZW4oKTsKKyAgICAgICAgaWYgKG9wdGlvbnMubV90cmVhdFdhdGNoZG9nRXhjZXB0 aW9uQXNTdWNjZXNzKSB7CisgICAgICAgICAgICBBU1NFUlQoaGFzRXhjZXB0aW9uKTsKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQogICAgIH0KIAogICAgIGlmICghb3B0aW9ucy5tX3Vu Y2F1Z2h0RXhjZXB0aW9uTmFtZSB8fCAhaXNMYXN0RmlsZSkgewpAQCAtMzA1MCwxMSArMzA2Niw4 IEBAIHN0YXRpYyB2b2lkIHJ1bldpdGhPcHRpb25zKEdsb2JhbE9iamVjdCoKICAgICAgICAgICAg IE5ha2VkUHRyPEV4Y2VwdGlvbj4gZXZhbHVhdGlvbkV4Y2VwdGlvbjsKICAgICAgICAgICAgIEpT VmFsdWUgcmV0dXJuVmFsdWUgPSBldmFsdWF0ZShnbG9iYWxPYmplY3QsIGpzY1NvdXJjZShzY3Jp cHRCdWZmZXIsIHNvdXJjZU9yaWdpbiAsIGZpbGVOYW1lKSwgSlNWYWx1ZSgpLCBldmFsdWF0aW9u RXhjZXB0aW9uKTsKICAgICAgICAgICAgIHNjb3BlLmFzc2VydE5vRXhjZXB0aW9uKCk7Ci0gICAg ICAgICAgICBpZiAoZXZhbHVhdGlvbkV4Y2VwdGlvbikgewotICAgICAgICAgICAgICAgIGlmICh2 bS5pc1Rlcm1pbmF0aW9uRXhjZXB0aW9uKGV2YWx1YXRpb25FeGNlcHRpb24uZ2V0KCkpKQotICAg ICAgICAgICAgICAgICAgICB2bS5zZXRFeGVjdXRpb25Gb3JiaWRkZW4oKTsKKyAgICAgICAgICAg IGlmIChldmFsdWF0aW9uRXhjZXB0aW9uKQogICAgICAgICAgICAgICAgIHJldHVyblZhbHVlID0g ZXZhbHVhdGlvbkV4Y2VwdGlvbi0+dmFsdWUoKTsKLSAgICAgICAgICAgIH0KICAgICAgICAgICAg IGNoZWNrRXhjZXB0aW9uKGdsb2JhbE9iamVjdCwgaXNMYXN0RmlsZSwgZXZhbHVhdGlvbkV4Y2Vw dGlvbiwgcmV0dXJuVmFsdWUsIG9wdGlvbnMsIHN1Y2Nlc3MpOwogICAgICAgICB9CiAKQEAgLTMx MjUsNiArMzEzOCw5IEBAIHN0YXRpYyB2b2lkIHJ1bkludGVyYWN0aXZlKEdsb2JhbE9iamVjdCoK ICAgICAgICAgTmFrZWRQdHI8RXhjZXB0aW9uPiBldmFsdWF0aW9uRXhjZXB0aW9uOwogICAgICAg ICBKU1ZhbHVlIHJldHVyblZhbHVlID0gZXZhbHVhdGUoZ2xvYmFsT2JqZWN0LCBqc2NTb3VyY2Uo bGluZSwgc291cmNlT3JpZ2luLCBzb3VyY2VPcmlnaW4uc3RyaW5nKCkpLCBKU1ZhbHVlKCksIGV2 YWx1YXRpb25FeGNlcHRpb24pOwogI2VuZGlmCisgICAgICAgIGlmICh2bS5pc1Rlcm1pbmF0aW9u RXhjZXB0aW9uKGV2YWx1YXRpb25FeGNlcHRpb24uZ2V0KCkpKQorICAgICAgICAgICAgdm0uc2V0 RXhlY3V0aW9uRm9yYmlkZGVuKCk7CisKICAgICAgICAgRXhwZWN0ZWQ8Q1N0cmluZywgVVRGOENv bnZlcnNpb25FcnJvcj4gdXRmODsKICAgICAgICAgaWYgKGV2YWx1YXRpb25FeGNlcHRpb24pIHsK ICAgICAgICAgICAgIGZwdXRzKCJFeGNlcHRpb246ICIsIHN0ZG91dCk7Cg==