Changeset 39525 in webkit for trunk/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

Dec 31, 2008, 2:17:05 AM (16 years ago)

Author:

[email protected]

Message:

2008-12-31 Cameron Zwarich <​[email protected]>

Reviewed by Oliver Hunt.

Bug 23054: Caching of global lookups occurs even when the global object has become a dictionary
<​https://bugs.webkit.org/show_bug.cgi?id=23054>
<rdar://problem/6469905>

JavaScriptCore:

• interpreter/Interpreter.cpp: (JSC::Interpreter::resolveGlobal): Do not cache lookup if the global object has transitioned to a dictionary. (JSC::Interpreter::cti_op_resolve_global): Do not cache lookup if the global object has transitioned to a dictionary.

LayoutTests:

• fast/js/pic/delete-global-object-expected.txt: Added.
• fast/js/pic/delete-global-object.html: Added.

File:

• trunk/JavaScriptCore/interpreter/Interpreter.cpp (modified) (2 diffs)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -391 +391 @@
     if (globalObject->getPropertySlot(callFrame, ident, slot)) {
         JSValue* result = slot.getValue(callFrame, ident);
-        if (slot.isCacheable()) {
+        if (slot.isCacheable() && !globalObject->structure()->isDictionary()) {
             if (vPC[4].u.structure)
                 vPC[4].u.structure->deref();
@@ -5328 +5328 @@
     if (globalObject->getPropertySlot(callFrame, ident, slot)) {
         JSValue* result = slot.getValue(callFrame, ident);
-        if (slot.isCacheable()) {
+        if (slot.isCacheable() && !globalObject->structure()->isDictionary()) {
             GlobalResolveInfo& globalResolveInfo = callFrame->codeBlock()->globalResolveInfo(globalResolveInfoIndex);
             if (globalResolveInfo.structure)