199541 2019-07-05 20:06:16 -0700 switch(String) needs to check for exceptions when resolving the string 2019-07-06 06:34:53 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff msaboff ews-watchlist keith_miller mark.lam saam tzagallo webkit-bug-importer oldest_to_newest 1550604 0 msaboff 2019-07-05 20:06:16 -0700 A String value for a switch statement may be an unresolved rope and could throw an exception during resolution. Switch statement processing needs to handle the exception. 1550605 1 msaboff 2019-07-05 20:06:33 -0700 <rdar://problem/52669115> 1550606 2 373560 msaboff 2019-07-05 20:12:17 -0700 Created attachment 373560 Patch 1550608 3 373560 mark.lam 2019-07-05 20:58:57 -0700 Comment on attachment 373560 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373560&action=review r=me with throwScope declaration fix. > Source/JavaScriptCore/dfg/DFGOperations.cpp:2478 > nit: can you remove this empty line? > Source/JavaScriptCore/jit/JITOperations.cpp:2320 > + auto throwScope = DECLARE_THROW_SCOPE(vm); You should declare this at the top of the function at the earliest possible location. This is the recommended best practice unless there's a really good reason not to. 1550626 4 msaboff 2019-07-06 06:33:40 -0700 (In reply to Mark Lam from comment #3) > Comment on attachment 373560 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373560&action=review > > r=me with throwScope declaration fix. > > > Source/JavaScriptCore/dfg/DFGOperations.cpp:2478 > > > > nit: can you remove this empty line? > > > Source/JavaScriptCore/jit/JITOperations.cpp:2320 > > + auto throwScope = DECLARE_THROW_SCOPE(vm); > > You should declare this at the top of the function at the earliest possible > location. This is the recommended best practice unless there's a really > good reason not to. I made these changes. 1550627 5 msaboff 2019-07-06 06:34:53 -0700 Committed r247194: <https://trac.webkit.org/changeset/247194> 373560 2019-07-05 20:12:17 -0700 2019-07-05 20:58:57 -0700 Patch 199541.patch text/plain 6232 msaboff SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDcxOTApCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE3IEBACisyMDE5LTA3LTA1ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBw bGUuY29tPgorCisgICAgICAgIHN3aXRjaChTdHJpbmcpIG5lZWRzIHRvIGNoZWNrIGZvciBleGNl cHRpb25zIHdoZW4gcmVzb2x2aW5nIHRoZSBzdHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTU0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE5ldyB0ZXN0cy4KKworICAgICAgICAqIHN0cmVzcy9z d2l0Y2gtc3RyaW5nLW9vbS5qczogQWRkZWQuCisgICAgICAgICh0ZXN0KToKKyAgICAgICAgKHRl c3RMb3dlclRpZXJzKToKKyAgICAgICAgKHRlc3RGVEwpOgorCiAyMDE5LTA3LTA1ICBNYXJrIExh bSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBBcmd1bWVudHNFbGltaW5hdGlvblBo YXNlOjplbGltaW5hdGVDYW5kaWRhdGVzVGhhdEludGVyZmVyZSgpIHNob3VsZCBub3QgZGVjcmVt ZW50IG5vZGVJbmRleCBwYXNzIHplcm8uCkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9zd2l0Y2gtc3Ry aW5nLW9vbS5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKU1Rlc3RzL3N0cmVzcy9zd2l0Y2gtc3RyaW5nLW9v bS5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9zd2l0Y2gtc3RyaW5nLW9vbS5q cwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDUyIEBACisvL0AgcmVxdWlyZU9wdGlvbnMoIi0t aml0UG9saWN5U2NhbGU9MCIsICItLXVzZUNvbmN1cnJlbnRKSVQ9MCIpCisvLyBUaGlzIHRlc3Rz IHRoYXQgd2hlbiBhIHN3aXRjaChTdHJpbmcpIGNvbnZlcnRzIHRoZSBTdHJpbmcgYXJndW1lbnQs IGl0IHByb3Blcmx5IGhhbmRsZXMgT09NCisKK2Z1bmN0aW9uIHRlc3QoY3JlYXRlT09NU3RyaW5n KQoreworICAgIHZhciBzdHIgPSBTdHJpbmcuZnJvbUNoYXJDb2RlKDM2NSk7CisgICAgaWYgKGNy ZWF0ZU9PTVN0cmluZykKKyAgICAgICAgc3RyID0gc3RyLnBhZEVuZCgyMTQ3NDgzNjQ0LCAnMTIz Jyk7CisKKyAgICBzd2l0Y2ggKHN0cikgeworICAgIGNhc2UgIm9uZSI6CisgICAgICAgIHRocm93 ICJDYXNlIFwib25lXCIsIGRob3VsZG4ndCBnZXQgaGVyZSI7CisgICAgICAgIGJyZWFrOworICAg IGNhc2UgInR3byI6IAorICAgICAgICB0aHJvdyAiQ2FzZSBcInR3b1wiLCBzaG91bGRuJ3QgZ2V0 IGhlcmUiOworICAgICAgICBicmVhazsKKyAgICBjYXNlICJ0aHJlZSI6CisgICAgICAgIHRocm93 ICJDYXNlIFwidGhyZWVcIiwgc2hvdWxkbid0IGdldCBoZXJlIjsKKyAgICAgICAgYnJlYWs7Cisg ICAgZGVmYXVsdDoKKyAgICAgICAgaWYgKGNyZWF0ZU9PTVN0cmluZykKKyAgICAgICAgICAgIHRo cm93ICJEZWZhdWx0IGNhc2UsIHNob3VsZG4ndCBnZXQgaGVyZSI7CisgICAgICAgIGJyZWFrOwor ICAgIH0KK30KKworZnVuY3Rpb24gdGVzdExvd2VyVGllcnMoKQoreworICAgIGZvciAobGV0IGkg PSAwOyBpIDwgMjAwOyBpKyspIHsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgIHRlc3QodHJ1 ZSk7CisgICAgICAgIH0gY2F0Y2goZSkgeworICAgICAgICAgICAgaWYgKGUgIT0gIkVycm9yOiBP dXQgb2YgbWVtb3J5IikKKyAgICAgICAgICAgICAgICB0aHJvdyAiVW5leHBlY3RlIGVycm9yOiBc IiIgKyBlICsgIlwiIjsKKyAgICAgICAgfQorICAgIH0KK30KKworZnVuY3Rpb24gdGVzdEZUTCgp Cit7CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCAxMDAwOyBpKyspIHsKKyAgICAgICAgdHJ5IHsK KyAgICAgICAgICAgIHRlc3QoaSA+PSA1MCk7CisgICAgICAgIH0gY2F0Y2goZSkgeworICAgICAg ICAgICAgaWYgKGUgIT0gIkVycm9yOiBPdXQgb2YgbWVtb3J5IikKKyAgICAgICAgICAgICAgICB0 aHJvdyAiVW5leHBlY3RlIGVycm9yOiBcIiIgKyBlICsgIlwiIjsKKyAgICAgICAgfQorICAgIH0K K30KKwordGVzdExvd2VyVGllcnMoKTsKK3Rlc3RGVEwoKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwkocmV2aXNpb24gMjQ3MTkwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA3LTA1ICBNaWNoYWVs IFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIHN3aXRjaChTdHJpbmcpIG5l ZWRzIHRvIGNoZWNrIGZvciBleGNlcHRpb25zIHdoZW4gcmVzb2x2aW5nIHRoZSBzdHJpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTU0MQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGV4Y2Vw dGlvbiBjaGVja3MgZm9yIHJlc29sdmVkIFN0cmluZ3MgaW4gc3dpdGNoIHByb2Nlc3NpbmcgZm9y IGFsbCB0aWVycy4KKworICAgICAgICAqIGRmZy9ERkdPcGVyYXRpb25zLmNwcDoKKyAgICAgICAg KiBqaXQvSklUT3BlcmF0aW9ucy5jcHA6CisgICAgICAgICogbGxpbnQvTExJbnRTbG93UGF0aHMu Y3BwOgorICAgICAgICAoSlNDOjpMTEludDo6TExJTlRfU0xPV19QQVRIX0RFQ0wpOgorCiAyMDE5 LTA3LTA1ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBBcmd1bWVu dHNFbGltaW5hdGlvblBoYXNlOjplbGltaW5hdGVDYW5kaWRhdGVzVGhhdEludGVyZmVyZSgpIHNo b3VsZCBub3QgZGVjcmVtZW50IG5vZGVJbmRleCBwYXNzIHplcm8uCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlvbnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAJKHJldmlzaW9uIDI0NzE5MCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTI0NjIsOCArMjQ2MiwxMyBAQCBjaGFyKiBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblN3 aXRjaFN0cmluCiB7CiAgICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKICAgICBOYXRpdmVDYWxsRnJh bWVUcmFjZXIgdHJhY2VyKCZ2bSwgZXhlYyk7CisgICAgYXV0byB0aHJvd1Njb3BlID0gREVDTEFS RV9USFJPV19TQ09QRSh2bSk7CisKKyAgICBTdHJpbmdJbXBsKiBzdHJJbXBsID0gc3RyaW5nLT52 YWx1ZShleGVjKS5pbXBsKCk7CiAKLSAgICByZXR1cm4gZXhlYy0+Y29kZUJsb2NrKCktPnN0cmlu Z1N3aXRjaEp1bXBUYWJsZSh0YWJsZUluZGV4KS5jdGlGb3JWYWx1ZShzdHJpbmctPnZhbHVlKGV4 ZWMpLmltcGwoKSkuZXhlY3V0YWJsZUFkZHJlc3M8Y2hhcio+KCk7CisgICAgUkVUVVJOX0lGX0VY Q0VQVElPTih0aHJvd1Njb3BlLCBudWxscHRyKTsKKworICAgIHJldHVybiBleGVjLT5jb2RlQmxv Y2soKS0+c3RyaW5nU3dpdGNoSnVtcFRhYmxlKHRhYmxlSW5kZXgpLmN0aUZvclZhbHVlKHN0cklt cGwpLmV4ZWN1dGFibGVBZGRyZXNzPGNoYXIqPigpOwogfQogCiBpbnQzMl90IEpJVF9PUEVSQVRJ T04gb3BlcmF0aW9uU3dpdGNoU3RyaW5nQW5kR2V0QnJhbmNoT2Zmc2V0KEV4ZWNTdGF0ZSogZXhl Yywgc2l6ZV90IHRhYmxlSW5kZXgsIEpTU3RyaW5nKiBzdHJpbmcpCkBAIC0yNDcxLDcgKzI0NzYs MTMgQEAgaW50MzJfdCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblN3aXRjaFN0cgogICAgIFZNJiB2 bSA9IGV4ZWMtPnZtKCk7CiAgICAgTmF0aXZlQ2FsbEZyYW1lVHJhY2VyIHRyYWNlcigmdm0sIGV4 ZWMpOwogCi0gICAgcmV0dXJuIGV4ZWMtPmNvZGVCbG9jaygpLT5zdHJpbmdTd2l0Y2hKdW1wVGFi bGUodGFibGVJbmRleCkub2Zmc2V0Rm9yVmFsdWUoc3RyaW5nLT52YWx1ZShleGVjKS5pbXBsKCks IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50MzJfdD46Om1pbigpKTsKKyAgICBhdXRvIHRocm93U2Nv cGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKKworICAgIFN0cmluZ0ltcGwqIHN0ckltcGwg PSBzdHJpbmctPnZhbHVlKGV4ZWMpLmltcGwoKTsKKworICAgIFJFVFVSTl9JRl9FWENFUFRJT04o dGhyb3dTY29wZSwgMCk7CisKKyAgICByZXR1cm4gZXhlYy0+Y29kZUJsb2NrKCktPnN0cmluZ1N3 aXRjaEp1bXBUYWJsZSh0YWJsZUluZGV4KS5vZmZzZXRGb3JWYWx1ZShzdHJJbXBsLCBzdGQ6Om51 bWVyaWNfbGltaXRzPGludDMyX3Q+OjptaW4oKSk7CiB9CiAKIHVpbnRwdHJfdCBKSVRfT1BFUkFU SU9OIG9wZXJhdGlvbkNvbXBhcmVTdHJpbmdJbXBsTGVzcyhTdHJpbmdJbXBsKiBhLCBTdHJpbmdJ bXBsKiBiKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMu Y3BwCShyZXZpc2lvbiAyNDcxOTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9w ZXJhdGlvbnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzE3LDcgKzIzMTcsMTIgQEAgY2hhciog SklUX09QRVJBVElPTiBvcGVyYXRpb25Td2l0Y2hTdHJpbgogICAgIFN0cmluZ0p1bXBUYWJsZSYg anVtcFRhYmxlID0gY29kZUJsb2NrLT5zdHJpbmdTd2l0Y2hKdW1wVGFibGUodGFibGVJbmRleCk7 CiAKICAgICBpZiAoa2V5LmlzU3RyaW5nKCkpIHsKKyAgICAgICAgYXV0byB0aHJvd1Njb3BlID0g REVDTEFSRV9USFJPV19TQ09QRSh2bSk7CisKICAgICAgICAgU3RyaW5nSW1wbCogdmFsdWUgPSBh c1N0cmluZyhrZXkpLT52YWx1ZShleGVjKS5pbXBsKCk7CisKKyAgICAgICAgUkVUVVJOX0lGX0VY Q0VQVElPTih0aHJvd1Njb3BlLCBudWxscHRyKTsKKwogICAgICAgICByZXN1bHQgPSBqdW1wVGFi bGUuY3RpRm9yVmFsdWUodmFsdWUpLmV4ZWN1dGFibGVBZGRyZXNzKCk7CiAgICAgfSBlbHNlCiAg ICAgICAgIHJlc3VsdCA9IGp1bXBUYWJsZS5jdGlEZWZhdWx0LmV4ZWN1dGFibGVBZGRyZXNzKCk7 CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5j cHAJKHJldmlzaW9uIDI0NzE5MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTElu dFNsb3dQYXRocy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMTcsOCArMTMxNywxMyBAQCBMTElO VF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfc3dpdGNoX3N0CiAgICAgaWYgKCFzY3J1dGluZWUu aXNTdHJpbmcoKSkKICAgICAgICAgSlVNUF9UTyhkZWZhdWx0T2Zmc2V0KTsKICAgICBlbHNlIHsK KyAgICAgICAgU3RyaW5nSW1wbCogc2NydXRpbmVlU3RyaW5nSW1wbCA9IGFzU3RyaW5nKHNjcnV0 aW5lZSktPnZhbHVlKGV4ZWMpLmltcGwoKTsKKworICAgICAgICBMTElOVF9DSEVDS19FWENFUFRJ T04oKTsKKwogICAgICAgICBDb2RlQmxvY2sqIGNvZGVCbG9jayA9IGV4ZWMtPmNvZGVCbG9jaygp OwotICAgICAgICBKVU1QX1RPKGNvZGVCbG9jay0+c3RyaW5nU3dpdGNoSnVtcFRhYmxlKGJ5dGVj b2RlLm1fdGFibGVJbmRleCkub2Zmc2V0Rm9yVmFsdWUoYXNTdHJpbmcoc2NydXRpbmVlKS0+dmFs dWUoZXhlYykuaW1wbCgpLCBkZWZhdWx0T2Zmc2V0KSk7CisKKyAgICAgICAgSlVNUF9UTyhjb2Rl QmxvY2stPnN0cmluZ1N3aXRjaEp1bXBUYWJsZShieXRlY29kZS5tX3RhYmxlSW5kZXgpLm9mZnNl dEZvclZhbHVlKHNjcnV0aW5lZVN0cmluZ0ltcGwsIGRlZmF1bHRPZmZzZXQpKTsKICAgICB9CiAg ICAgTExJTlRfRU5EKCk7CiB9Cg==