155332 2016-03-10 15:29:03 -0800 [ES6] RegExp sticky flag should be ignored in String.match when global flag is given 2016-03-10 15:48:46 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 msaboff msaboff commit-queue keith_miller mark.lam saam oldest_to_newest 1173396 0 msaboff 2016-03-10 15:29:03 -0800 In change set r197869, logic was added to handle String.match(re) when the RegExp has both the global and sticky flags set. In the ES6 spec, section 21.2.5.6 step 6 that describes operation when the global flag is set doesn't reference the sticky flag or any operational changes due to the sticky flag. When the global flag is not set, step 5 of the same section says that the operation is the same s RegExpExec, which does have sticky dependent behavior. Therefore, the logic that handles when both the sticky and global flags are set should be removed. 1173397 1 273637 msaboff 2016-03-10 15:33:22 -0800 Created attachment 273637 Patch 1173399 2 273637 saam 2016-03-10 15:37:19 -0800 Comment on attachment 273637 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=273637&action=review > Source/JavaScriptCore/runtime/StringPrototype.cpp:1057 > + if (!global && (sticky = regExp->sticky())) { I think this is easier to read if the sticky isn't assigned in the "if" 1173403 3 msaboff 2016-03-10 15:48:46 -0800 Committed r197963: <http://trac.webkit.org/changeset/197963> 273637 2016-03-10 15:33:22 -0800 2016-03-10 15:37:19 -0800 Patch 155332.patch text/plain 2875 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk3OTYxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBA CisyMDE2LTAzLTEwICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIFtFUzZdIFJlZ0V4cCBzdGlja3kgZmxhZyBzaG91bGQgYmUgaWdub3JlZCBpbiBTdHJpbmcu bWF0Y2ggd2hlbiBnbG9iYWwgZmxhZyBpcyBnaXZlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1MzMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCBsb2dpYyBmcm9tIHN0cmluZ1Byb3RvRnVu Y01hdGNoIHRoYXQgaGFuZGxlcyB0aGUgY2FzZSB3aGVyZSBib3RoIGdsb2JhbCBhbmQgc3RpY2t5 IGZsYWdzIGFyZSBzZXQuCisKKyAgICAgICAgKiBydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHA6 CisgICAgICAgIChKU0M6OnN0cmluZ1Byb3RvRnVuY01hdGNoKToKKwogMjAxNi0wMy0xMCAgU2Fh bSBiYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBbRVM2XSBNYWtlIFRvUHJv cGVydHlEZXNjcmlwdG9yIHNwZWMgY29tcGxpYW50CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAJKHJldmlzaW9uIDE5Nzk0OCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEwNTQsNyArMTA1NCw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NU X0NBTEwgc3RyaW5nUHJvdG8KICAgICAgICAgICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkK ICAgICAgICAgICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOwog ICAgICAgICB9Ci0gICAgICAgIGlmICgoc3RpY2t5ID0gcmVnRXhwLT5zdGlja3koKSkpIHsKKyAg ICAgICAgaWYgKCFnbG9iYWwgJiYgKHN0aWNreSA9IHJlZ0V4cC0+c3RpY2t5KCkpKSB7CiAgICAg ICAgICAgICBKU1ZhbHVlIGpzTGFzdEluZGV4ID0gcmVnRXhwT2JqZWN0LT5nZXRMYXN0SW5kZXgo KTsKICAgICAgICAgICAgIHVuc2lnbmVkIGxhc3RJbmRleDsKICAgICAgICAgICAgIGlmIChMSUtF TFkoanNMYXN0SW5kZXguaXNVSW50MzIoKSkpIHsKQEAgLTExMDMsNyArMTEwMyw2IEBAIEVuY29k ZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgc3RyaW5nUHJvdG8KIAogICAgIC8vIHJldHVybiBhcnJh eSBvZiBtYXRjaGVzCiAgICAgTWFya2VkQXJndW1lbnRCdWZmZXIgbGlzdDsKLSAgICBzaXplX3Qg ZW5kID0gMDsKICAgICB3aGlsZSAocmVzdWx0KSB7CiAgICAgICAgIC8vIFdlIGRlZmVuZCBvdXJz ZWx2ZXMgZnJvbSBjcmF6eS4KICAgICAgICAgY29uc3Qgc2l6ZV90IG1heGltdW1SZWFzb25hYmxl TWF0Y2hTaXplID0gMTAwMDAwMDAwMDsKQEAgLTExMTIsMzAgKzExMTEsMjAgQEAgRW5jb2RlZEpT VmFsdWUgSlNDX0hPU1RfQ0FMTCBzdHJpbmdQcm90bwogICAgICAgICAgICAgcmV0dXJuIEpTVmFs dWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKICAgICAgICAgfQogICAgICAgICAKLSAgICAgICAg ZW5kID0gcmVzdWx0LmVuZDsKKyAgICAgICAgc2l6ZV90IGVuZCA9IHJlc3VsdC5lbmQ7CiAgICAg ICAgIHNpemVfdCBsZW5ndGggPSBlbmQgLSByZXN1bHQuc3RhcnQ7CiAgICAgICAgIGxpc3QuYXBw ZW5kKGpzU3Vic3RyaW5nKGV4ZWMsIHMsIHJlc3VsdC5zdGFydCwgbGVuZ3RoKSk7CiAgICAgICAg IGlmICghbGVuZ3RoKQogICAgICAgICAgICAgKytlbmQ7Ci0gICAgICAgIAotICAgICAgICBpZiAo Z2xvYmFsKQotICAgICAgICAgICAgcmVzdWx0ID0gcmVnRXhwQ29uc3RydWN0b3ItPnBlcmZvcm1N YXRjaCgqdm0sIHJlZ0V4cCwgc3RyaW5nLCBzLCBlbmQpOwotICAgICAgICBlbHNlCi0gICAgICAg ICAgICByZXN1bHQgPSBNYXRjaFJlc3VsdCgpOworICAgICAgICByZXN1bHQgPSByZWdFeHBDb25z dHJ1Y3Rvci0+cGVyZm9ybU1hdGNoKCp2bSwgcmVnRXhwLCBzdHJpbmcsIHMsIGVuZCk7CiAgICAg fQogICAgIGlmIChsaXN0LmlzRW1wdHkoKSkgewogICAgICAgICAvLyBpZiB0aGVyZSBhcmUgbm8g bWF0Y2hlcyBhdCBhbGwsIGl0J3MgaW1wb3J0YW50IHRvIHJldHVybgogICAgICAgICAvLyBOdWxs IGluc3RlYWQgb2YgYW4gZW1wdHkgYXJyYXksIGJlY2F1c2UgdGhpcyBtYXRjaGVzCiAgICAgICAg IC8vIG90aGVyIGJyb3dzZXJzIGFuZCBiZWNhdXNlIE51bGwgaXMgYSBmYWxzZSB2YWx1ZS4KLSAg ICAgICAgaWYgKHN0aWNreSkKLSAgICAgICAgICAgIHJlZ0V4cE9iamVjdC0+c2V0TGFzdEluZGV4 KGV4ZWMsIDApOwotICAgICAgICAKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc051 bGwoKSk7CiAgICAgfQotICAgIAotICAgIGlmIChzdGlja3kpCi0gICAgICAgIHJlZ0V4cE9iamVj dC0+c2V0TGFzdEluZGV4KGV4ZWMsIGVuZCk7Ci0gICAgCisKICAgICByZXR1cm4gSlNWYWx1ZTo6 ZW5jb2RlKGNvbnN0cnVjdEFycmF5KGV4ZWMsIHN0YXRpY19jYXN0PEFycmF5QWxsb2NhdGlvblBy b2ZpbGUqPigwKSwgbGlzdCkpOwogfQogCg==