JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / runtime / Operations.h

diff --git a/runtime/Operations.h b/runtime/Operations.h
index bd45c225a00b5c974dc472f774548d416fe1b784..ac47c8f9cd7b4b27099344f8dedc528354f66913 100644 (file)
--- a/runtime/Operations.h
+++ b/runtime/Operations.h
@@ -31,7 +31,7 @@ namespace JSC {
 NEVER_INLINE JSValue jsAddSlowCase(CallFrame*, JSValue, JSValue);
 JSValue jsTypeStringForValue(CallFrame*, JSValue);
 JSValue jsTypeStringForValue(VM&, JSGlobalObject*, JSValue);
 NEVER_INLINE JSValue jsAddSlowCase(CallFrame*, JSValue, JSValue);
 JSValue jsTypeStringForValue(CallFrame*, JSValue);
 JSValue jsTypeStringForValue(VM&, JSGlobalObject*, JSValue);

-bool jsIsObjectType(CallFrame*, JSValue);
+bool jsIsObjectTypeOrNull(CallFrame*, JSValue);

 bool jsIsFunctionType(JSValue);
 
 ALWAYS_INLINE JSValue jsString(ExecState* exec, JSString* s1, JSString* s2)
 bool jsIsFunctionType(JSValue);
 
 ALWAYS_INLINE JSValue jsString(ExecState* exec, JSString* s1, JSString* s2)


@@ -194,65 +194,65 @@ ALWAYS_INLINE JSValue jsAdd(CallFrame* callFrame, JSValue v1, JSValue v2)
 
 #define InvalidPrototypeChain (std::numeric_limits<size_t>::max())
 
 
 #define InvalidPrototypeChain (std::numeric_limits<size_t>::max())
 

-inline size_t normalizePrototypeChainForChainAccess(CallFrame* callFrame, JSValue base, JSValue slotBase, const Identifier& propertyName, PropertyOffset& slotOffset)
+inline size_t normalizePrototypeChainForChainAccess(CallFrame* callFrame, Structure* structure, JSValue slotBase, const Identifier& propertyName, PropertyOffset& slotOffset)

 {
     VM& vm = callFrame->vm();
 {
     VM& vm = callFrame->vm();

-    JSCell* cell = base.asCell();

     size_t count = 0;
         
     size_t count = 0;
         

-    while (!slotBase || slotBase != cell) {
-        if (cell->isProxy())
+    while (1) {
+        if (structure->isProxy())

             return InvalidPrototypeChain;
 
             return InvalidPrototypeChain;
 

-        const TypeInfo& typeInfo = cell->structure()->typeInfo();
+        const TypeInfo& typeInfo = structure->typeInfo();

         if (typeInfo.hasImpureGetOwnPropertySlot() && !typeInfo.newImpurePropertyFiresWatchpoints())
             return InvalidPrototypeChain;
             
         if (typeInfo.hasImpureGetOwnPropertySlot() && !typeInfo.newImpurePropertyFiresWatchpoints())
             return InvalidPrototypeChain;
             

-        JSValue v = cell->structure()->prototypeForLookup(callFrame);
+        JSValue v = structure->prototypeForLookup(callFrame);

 
 

-        // If we didn't find slotBase in base's prototype chain, then base
+        // If we didn't find slotBase in the base's prototype chain, then the base

         // must be a proxy for another object.
 
         if (v.isNull()) {
             if (!slotBase)
         // must be a proxy for another object.
 
         if (v.isNull()) {
             if (!slotBase)

-                return count;
+                break;

             return InvalidPrototypeChain;
         }
 
             return InvalidPrototypeChain;
         }
 

-        cell = v.asCell();
-
+        JSCell* cell = v.asCell();
+        structure = cell->structure(vm);

         // Since we're accessing a prototype in a loop, it's a good bet that it
         // should not be treated as a dictionary.
         // Since we're accessing a prototype in a loop, it's a good bet that it
         // should not be treated as a dictionary.

-        if (cell->structure(vm)->isDictionary()) {
-            asObject(cell)->flattenDictionaryObject(callFrame->vm());
+        if (structure->isDictionary()) {
+            structure->flattenDictionaryStructure(vm, asObject(cell));

             if (slotBase == cell)
             if (slotBase == cell)

-                slotOffset = cell->structure(vm)->get(callFrame->vm(), propertyName); 
+                slotOffset = structure->get(vm, propertyName); 

         }
         }

-            

         ++count;
         ++count;

+
+        if (slotBase == cell)
+            break;

     }
         
     return count;
 }
 
     }
         
     return count;
 }
 

-inline size_t normalizePrototypeChain(CallFrame* callFrame, JSCell* base)
+inline size_t normalizePrototypeChain(CallFrame* callFrame, Structure* structure)

 {
     VM& vm = callFrame->vm();
     size_t count = 0;
     while (1) {
 {
     VM& vm = callFrame->vm();
     size_t count = 0;
     while (1) {

-        if (base->isProxy())
+        if (structure->isProxy())

             return InvalidPrototypeChain;
             return InvalidPrototypeChain;

-            
-        JSValue v = base->structure(vm)->prototypeForLookup(callFrame);
+        JSValue v = structure->prototypeForLookup(callFrame);

         if (v.isNull())
             return count;
 
         if (v.isNull())
             return count;
 

-        base = v.asCell();
-
+        JSCell* base = v.asCell();
+        structure = base->structure(vm);

         // Since we're accessing a prototype in a loop, it's a good bet that it
         // should not be treated as a dictionary.
         // 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(vm)->isDictionary())
-            asObject(base)->flattenDictionaryObject(callFrame->vm());
+        if (structure->isDictionary())
+            structure->flattenDictionaryStructure(vm, asObject(base));

 
         ++count;
     }
 
         ++count;
     }