Changeset 199144 in webkit for trunk/Source/JavaScriptCore/builtins

Timestamp:

Apr 6, 2016, 8:17:58 PM (9 years ago)

Author:

[email protected]

Message:

String.prototype.match() should be calling internal function RegExpCreate.
​https://bugs.webkit.org/show_bug.cgi?id=156318

Reviewed by Filip Pizlo.

RegExpCreate is not the same as the RegExp constructor. The current implementation
invokes new @RegExp which calls the constructor. This results in failures in
es6/Proxy_internal_get_calls_String.prototype.match.js, and
es6/Proxy_internal_get_calls_String.prototype.search.js due to observable side
effects.

This patch fixes this by factoring out the part of the RegExp constructor that
makes the RegExpCreate function, and changing String's match and search to call
RegExpCreate instead in accordance with the ES6 spec.

• builtins/StringPrototype.js:

(match):
(search):

• runtime/CommonIdentifiers.h:
• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::init):

• runtime/RegExpConstructor.cpp:

(JSC::toFlags):
(JSC::regExpCreate):
(JSC::constructRegExp):
(JSC::esSpecRegExpCreate):
(JSC::constructWithRegExpConstructor):

• runtime/RegExpConstructor.h:

(JSC::isRegExp):

File:

• trunk/Source/JavaScriptCore/builtins/StringPrototype.js (modified) (3 diffs)

trunk/Source/JavaScriptCore/builtins/StringPrototype.js

@@ -2 +2 @@
  * Copyright (C) 2015 Andy VanWagoner <[email protected]>.
  * Copyright (C) 2016 Yusuke Suzuki <[email protected]>
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42 +43 @@
 
     let thisString = @toString(this);
-    let createdRegExp = new @RegExp(regexp, @undefined);
+    let createdRegExp = @regExpCreate(regexp, @undefined);
     return createdRegExp[@symbolMatch](thisString);
 }
@@ -63 +64 @@
 
     var thisString = @toString(this);
-    var createdRegExp = new @RegExp(regexp, @undefined);
+    var createdRegExp = @regExpCreate(regexp, @undefined);
     return createdRegExp[@symbolSearch](thisString);
 }