JavaScriptCore-1218.33.tar.gz

[apple/javascriptcore.git] / runtime / Lookup.cpp

diff --git a/runtime/Lookup.cpp b/runtime/Lookup.cpp
index 8359ff7f6602aa7acc4ddfb5f4117a24038f065e..030aef5a563bc9950dc2fd913b1f403df91ee41c 100644 (file)
--- a/runtime/Lookup.cpp
+++ b/runtime/Lookup.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2008 Apple Inc. All rights reserved.
+ *  Copyright (C) 2008, 2012 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -20,12 +20,13 @@
 #include "config.h"
 #include "Lookup.h"
 
+#include "Executable.h"
 #include "JSFunction.h"
-#include "PrototypeFunction.h"
+#include "Operations.h"
 
 namespace JSC {
 
-void HashTable::createTable(JSGlobalData* globalData) const
+void HashTable::createTable(VM* vm) const
 {
     ASSERT(!table);
     int linkIndex = compactHashSizeMask + 1;
@@ -33,8 +34,8 @@ void HashTable::createTable(JSGlobalData* globalData) const
     for (int i = 0; i < compactSize; ++i)
         entries[i].setKey(0);
     for (int i = 0; values[i].key; ++i) {
-        UString::Rep* identifier = Identifier::add(globalData, values[i].key).releaseRef();
-        int hashIndex = identifier->computedHash() & compactHashSizeMask;
+        StringImpl* identifier = Identifier::add(vm, values[i].key).leakRef();
+        int hashIndex = identifier->existingHash() & compactHashSizeMask;
         HashEntry* entry = &entries[hashIndex];
 
         if (entry->key()) {
@@ -46,7 +47,7 @@ void HashTable::createTable(JSGlobalData* globalData) const
             entry = entry->next();
         }
 
-        entry->initialize(identifier, values[i].attributes, values[i].value1, values[i].value2);
+        entry->initialize(identifier, values[i].attributes, values[i].value1, values[i].value2, values[i].intrinsic);
     }
     table = entries;
 }
@@ -56,7 +57,7 @@ void HashTable::deleteTable() const
     if (table) {
         int max = compactSize;
         for (int i = 0; i != max; ++i) {
-            if (UString::Rep* key = table[i].key())
+            if (StringImpl* key = table[i].key())
                 key->deref();
         }
         delete [] table;
@@ -64,19 +65,27 @@ void HashTable::deleteTable() const
     }
 }
 
-void setUpStaticFunctionSlot(ExecState* exec, const HashEntry* entry, JSObject* thisObj, const Identifier& propertyName, PropertySlot& slot)
+bool setUpStaticFunctionSlot(ExecState* exec, const HashEntry* entry, JSObject* thisObj, PropertyName propertyName, PropertySlot& slot)
 {
+    ASSERT(thisObj->globalObject());
     ASSERT(entry->attributes() & Function);
-    JSValue* location = thisObj->getDirectLocation(propertyName);
+    PropertyOffset offset = thisObj->getDirectOffset(exec->vm(), propertyName);
 
-    if (!location) {
-        InternalFunction* function = new (exec) NativeFunctionWrapper(exec, exec->lexicalGlobalObject()->prototypeFunctionStructure(), entry->functionLength(), propertyName, entry->function());
-
-        thisObj->putDirectFunction(propertyName, function, entry->attributes());
-        location = thisObj->getDirectLocation(propertyName);
+    if (!isValidOffset(offset)) {
+        // If a property is ever deleted from an object with a static table, then we reify
+        // all static functions at that time - after this we shouldn't be re-adding anything.
+        if (thisObj->staticFunctionsReified())
+            return false;
+    
+        thisObj->putDirectNativeFunction(
+            exec, thisObj->globalObject(), propertyName, entry->functionLength(),
+            entry->function(), entry->intrinsic(), entry->attributes());
+        offset = thisObj->getDirectOffset(exec->vm(), propertyName);
+        ASSERT(isValidOffset(offset));
     }
 
-    slot.setValueSlot(thisObj, location, thisObj->offsetForLocation(location));
+    slot.setValue(thisObj, thisObj->getDirect(offset), offset);
+    return true;
 }
 
 } // namespace JSC