Changeset 84599 in webkit

Timestamp:

Apr 21, 2011 9:54:19 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-21 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r84583.
​http://trac.webkit.org/changeset/84583
​https://bugs.webkit.org/show_bug.cgi?id=59173

"broke
​http://trac.webkit.org/export/84593/trunk/LayoutTests/fast/js
/Object-create.html" (Requested by ggaren on #webkit).

• runtime/ObjectConstructor.cpp: (JSC::objectConstructorCreate):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/ObjectConstructor.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-04-21  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r84583.
+        http://trac.webkit.org/changeset/84583
+        https://bugs.webkit.org/show_bug.cgi?id=59173
+
+        "broke
+        http://trac.webkit.org/export/84593/trunk/LayoutTests/fast/js
+        /Object-create.html" (Requested by ggaren on #webkit).
+
+        * runtime/ObjectConstructor.cpp:
+        (JSC::objectConstructorCreate):
+
 2011-04-21  Maciej Stachowiak  <mjs@apple.com>
 

trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp

@@ -342 +342 @@
     if (!exec->argument(0).isObject() && !exec->argument(0).isNull())
         return throwVMError(exec, createTypeError(exec, "Object prototype may only be an Object or null."));
-    JSValue proto = exec->argument(0);
-    JSObject* newObject = proto.isObject() ? constructEmptyObject(exec, asObject(proto)->inheritorID(exec->globalData())) : constructEmptyObject(exec);
+    JSObject* newObject = constructEmptyObject(exec);
+    newObject->setPrototype(exec->globalData(), exec->argument(0));
     if (exec->argument(1).isUndefined())
         return JSValue::encode(newObject);