Changeset 41846 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Mar 19, 2009, 5:03:57 PM (16 years ago)

Author:

[email protected]

Message:

2009-03-19 Cameron Zwarich <​[email protected]>

Reviewed by Geoff Garen.

Bug 23771: REGRESSION (r36016): JSObjectHasProperty freezes on global class without kJSClassAttributeNoAutomaticPrototype
<​https://bugs.webkit.org/show_bug.cgi?id=23771>
<rdar://problem/6561016>

• API/tests/testapi.c: (main): Add a test for this bug.
• runtime/JSGlobalObject.cpp: (JSC::JSGlobalObject::resetPrototype): Don't set the prototype of the last object in the prototype chain to the object prototype when the object prototype is already the last object in the prototype chain.

File:

• trunk/JavaScriptCore/runtime/JSGlobalObject.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -342 +342 @@
 {
     setPrototype(prototype);
-    lastInPrototypeChain(this)->setPrototype(d()->objectPrototype);
+
+    JSObject* oldLastInPrototypeChain = lastInPrototypeChain(this);
+    JSObject* objectPrototype = d()->objectPrototype;
+    if (oldLastInPrototypeChain != objectPrototype)
+        oldLastInPrototypeChain->setPrototype(objectPrototype);
 }