Changeset 89946 in webkit

Timestamp:

Jun 28, 2011, 11:35:37 AM (15 years ago)

Author:

barraclough@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=55040
RegExp constructor returns the argument regexp instead of a new object

Reviewed by Oliver Hunt.

Per 15.10.3.1, our current behaviour is correct if called as a function,
but incorrect when called as a constructor.

Source/JavaScriptCore:

• runtime/RegExpConstructor.cpp:

(JSC::constructRegExp):
(JSC::constructWithRegExpConstructor):

• runtime/RegExpConstructor.h:

LayoutTests:

• fast/regex/constructor-expected.txt: Added.
• fast/regex/constructor.html: Added.
• fast/regex/script-tests/constructor.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regex/constructor-expected.txt (added)
• LayoutTests/fast/regex/constructor.html (added)
• LayoutTests/fast/regex/script-tests/constructor.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/RegExpConstructor.cpp (modified) (3 diffs)
• Source/JavaScriptCore/runtime/RegExpConstructor.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-28  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=55040
+        RegExp constructor returns the argument regexp instead of a new object
+
+        Per 15.10.3.1, our current behaviour is correct if called as a function,
+        but incorrect when called as a constructor.
+
+        * fast/regex/constructor-expected.txt: Added.
+        * fast/regex/constructor.html: Added.
+        * fast/regex/script-tests/constructor.js: Added.
+
 2011-06-28  Jessie Berlin  <jberlin@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-06-28  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=55040
+        RegExp constructor returns the argument regexp instead of a new object
+
+        Per 15.10.3.1, our current behaviour is correct if called as a function,
+        but incorrect when called as a constructor.
+
+        * runtime/RegExpConstructor.cpp:
+        (JSC::constructRegExp):
+        (JSC::constructWithRegExpConstructor):
+        * runtime/RegExpConstructor.h:
+
 2011-06-28  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp

@@ -294 +294 @@
 
 // ECMA 15.10.4
-JSObject* constructRegExp(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args)
+JSObject* constructRegExp(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, bool callAsConstructor)
 {
     JSValue arg0 = args.at(0);
@@ -302 +302 @@
         if (!arg1.isUndefined())
             return throwError(exec, createTypeError(exec, "Cannot supply flags when constructing one RegExp from another."));
+        // If called as a function, this just returns the first argument (see 15.10.3.1).
+        if (callAsConstructor) {
+            RegExp* regExp = static_cast<RegExpObject*>(asObject(arg0))->regExp();
+            return new (exec) RegExpObject(globalObject, globalObject->regExpStructure(), regExp);
+        }
         return asObject(arg0);
     }
@@ -327 +332 @@
 {
     ArgList args(exec);
-    return JSValue::encode(constructRegExp(exec, asInternalFunction(exec->callee())->globalObject(), args));
+    return JSValue::encode(constructRegExp(exec, asInternalFunction(exec->callee())->globalObject(), args, true));
 }
 

trunk/Source/JavaScriptCore/runtime/RegExpConstructor.h

@@ -97 +97 @@
     RegExpConstructor* asRegExpConstructor(JSValue);
 
-    JSObject* constructRegExp(ExecState*, JSGlobalObject*, const ArgList&);
+    JSObject* constructRegExp(ExecState*, JSGlobalObject*, const ArgList&, bool callAsConstructor = false);
 
     inline RegExpConstructor* asRegExpConstructor(JSValue value)