Changeset 84583 in webkit

Timestamp:

Apr 21, 2011 6:30:50 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-04-21 Oliver Hunt <​oliver@apple.com>

Reviewed by Geoffrey Garen.

Object.create creates uncachable objects
​https://bugs.webkit.org/show_bug.cgi?id=59164

Use the prototype object's inheritorID, as we
should always have done

• 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  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Object.create creates uncachable objects
+        https://bugs.webkit.org/show_bug.cgi?id=59164
+
+        Use the prototype object's inheritorID, as we
+        should always have done
+
+        * runtime/ObjectConstructor.cpp:
+        (JSC::objectConstructorCreate):
+
 2011-04-21  Oliver Hunt  <oliver@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."));
-    JSObject* newObject = constructEmptyObject(exec);
-    newObject->setPrototype(exec->globalData(), exec->argument(0));
+    JSValue proto = exec->argument(0);
+    JSObject* newObject = proto.isObject() ? constructEmptyObject(exec, asObject(proto)->inheritorID(exec->globalData())) : constructEmptyObject(exec);
     if (exec->argument(1).isUndefined())
         return JSValue::encode(newObject);