Reviewers: Jakob,

Message:
rubberstamp please.

Description:
Reverting r9399.


Please review this at http://codereview.chromium.org/7989007/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files:
  M src/regexp.js
  A + test/mjsunit/bugs/bug-1217.js
  D test/mjsunit/regress/regress-1217.js


Index: test/mjsunit/regress/regress-1217.js
diff --git a/test/mjsunit/regress/regress-1217.js b/test/mjsunit/regress/regress-1217.js
deleted file mode 100644
index e6a03a457b7942d8eb2302aee6f061dc6089ac5a..0000000000000000000000000000000000000000
--- a/test/mjsunit/regress/regress-1217.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2011 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Check conformity to ECMA-262 15.10.6.
-// The class of RegExp's prototype is RegExp.
-
-var prototype_class = ({}).toString.call(RegExp.prototype);
-assertEquals("[object RegExp]", prototype_class);
\ No newline at end of file
Index: src/regexp.js
diff --git a/src/regexp.js b/src/regexp.js
index 9d36411a63109cd95c0d7b58b96f796059c10f13..38d4496153909f41d98ada01cd18ee5fa367fe63 100644
--- a/src/regexp.js
+++ b/src/regexp.js
@@ -408,9 +408,9 @@ var lastMatchInfoOverride = null;
 function SetUpRegExp() {
   %CheckIsBootstrapping();
   %FunctionSetInstanceClassName($RegExp, 'RegExp');
+  %FunctionSetPrototype($RegExp, new $Object());
   %SetProperty($RegExp.prototype, 'constructor', $RegExp, DONT_ENUM);
   %SetCode($RegExp, RegExpConstructor);
-  %FunctionSetPrototype($RegExp, new $RegExp());

   InstallFunctions($RegExp.prototype, DONT_ENUM, $Array(
     "exec", RegExpExec,
Index: test/mjsunit/bugs/bug-1217.js
diff --git a/test/mjsunit/regress/regress-1217.js b/test/mjsunit/bugs/bug-1217.js
similarity index 100%
rename from test/mjsunit/regress/regress-1217.js
rename to test/mjsunit/bugs/bug-1217.js


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to