Changeset 202770 in webkit

Timestamp:

Jul 1, 2016 7:20:39 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[JSC] RegExp.compile is not returning the regexp when it succeed
​https://bugs.webkit.org/show_bug.cgi?id=159381

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2016-07-01
Reviewed by Mark Lam.

Source/JavaScriptCore:

Spec:
-​https://tc39.github.io/ecma262/#sec-regexp.prototype.compile
-​https://tc39.github.io/ecma262/#sec-regexpinitialize

• runtime/RegExpPrototype.cpp:

(JSC::regExpProtoFuncCompile):

LayoutTests:

• js/regexp-compile-expected.txt:
• js/script-tests/regexp-compile.js:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/regexp-compile-expected.txt (modified) (1 diff)
• LayoutTests/js/script-tests/regexp-compile.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/RegExpPrototype.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-07-01  Benjamin Poulain  <bpoulain@apple.com>
+
+        [JSC] RegExp.compile is not returning the regexp when it succeed
+        https://bugs.webkit.org/show_bug.cgi?id=159381
+
+        Reviewed by Mark Lam.
+
+        * js/regexp-compile-expected.txt:
+        * js/script-tests/regexp-compile.js:
+
 2016-07-01  Zalan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/js/regexp-compile-expected.txt

@@ -24 +24 @@
 PASS re.lastIndex is 0
 PASS re.lastIndex is 1
+PASS regexpWithUndefinedCompiledToValid = new RegExp(undefined), regexpWithUndefinedCompiledToValid.compile('abc') is regexpWithUndefinedCompiledToValid
+PASS regexpValidPatternCompiledToValid = new RegExp('zyx'), regexpValidPatternCompiledToValid.compile('abc') is regexpValidPatternCompiledToValid
+PASS regexpWithValidCompiledToUndefined = new RegExp('abc'), regexpWithValidCompiledToUndefined.compile(undefined) is regexpWithValidCompiledToUndefined
 PASS successfullyParsed is true
 

trunk/LayoutTests/js/script-tests/regexp-compile.js

@@ -50 +50 @@
 re.exec("aaa");
 shouldBe("re.lastIndex", "1");
+
+// Compile returns the regexp itself.
+shouldBe("regexpWithUndefinedCompiledToValid = new RegExp(undefined), regexpWithUndefinedCompiledToValid.compile('abc')", "regexpWithUndefinedCompiledToValid");
+shouldBe("regexpValidPatternCompiledToValid = new RegExp('zyx'), regexpValidPatternCompiledToValid.compile('abc')", "regexpValidPatternCompiledToValid");
+shouldBe("regexpWithValidCompiledToUndefined = new RegExp('abc'), regexpWithValidCompiledToUndefined.compile(undefined)", "regexpWithValidCompiledToUndefined");

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-07-01  Benjamin Poulain  <bpoulain@apple.com>
+
+        [JSC] RegExp.compile is not returning the regexp when it succeed
+        https://bugs.webkit.org/show_bug.cgi?id=159381
+
+        Reviewed by Mark Lam.
+
+        Spec:
+        -https://tc39.github.io/ecma262/#sec-regexp.prototype.compile
+        -https://tc39.github.io/ecma262/#sec-regexpinitialize
+
+        * runtime/RegExpPrototype.cpp:
+        (JSC::regExpProtoFuncCompile):
+
 2016-07-01  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp

@@ -167 +167 @@
     asRegExpObject(thisValue)->setRegExp(exec->vm(), regExp);
     asRegExpObject(thisValue)->setLastIndex(exec, 0);
-    return JSValue::encode(jsUndefined());
+    return JSValue::encode(thisValue);
 }