Changeset 49726 in webkit for trunk/JavaScriptCore/runtime/Operations.h

Timestamp:

Oct 16, 2009, 7:31:42 PM (16 years ago)

Author:

[email protected]

Message:

Roll out r49717 as it broke the build.

File:

• trunk/JavaScriptCore/runtime/Operations.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/Operations.h

@@ -225 +225 @@
     }
 
-    inline size_t normalizePrototypeChain(CallFrame* callFrame, JSValue base, JSValue slotBase)
-    {
-        JSCell* cell = asCell(base);
+    inline size_t countPrototypeChainEntriesAndCheckForProxies(CallFrame* callFrame, JSValue baseValue, const PropertySlot& slot)
+    {
+        JSCell* cell = asCell(baseValue);
         size_t count = 0;
 
-        while (slotBase != cell) {
+        while (slot.slotBase() != cell) {
             JSValue v = cell->structure()->prototypeForLookup(callFrame);
 
-            // If we didn't find slotBase in base's prototype chain, then base
+            // If we didn't find slotBase in baseValue's prototype chain, then baseValue
             // must be a proxy for another object.
 
@@ -251 +251 @@
         ASSERT(count);
         return count;
-    }
-
-    inline size_t normalizePrototypeChain(CallFrame* callFrame, JSCell* base)
-    {
-        size_t count = 0;
-        while (1) {
-            JSValue v = base->structure()->prototypeForLookup(callFrame);
-            if (v.isNull())
-                return count;
-
-            base = asCell(v);
-
-            // Since we're accessing a prototype in a loop, it's a good bet that it
-            // should not be treated as a dictionary.
-            if (base->structure()->isDictionary())
-                asObject(base)->setStructure(Structure::fromDictionaryTransition(base->structure()));
-
-            ++count;
-        }
     }