JavaScriptCore-903.tar.gz

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

diff --git a/runtime/JSCell.cpp b/runtime/JSCell.cpp
index 869fbfc883e0ab2bd0d0a859090a02e43c2a36cf..0606cd40886f3376d45cffb4361559c3989a7a55 100644 (file)
--- a/runtime/JSCell.cpp
+++ b/runtime/JSCell.cpp
@@ -76,6 +76,8 @@ extern const double Inf = NaNInf.doubles.Inf_Double;
  
 #endif // !(defined NAN && defined INFINITY)
 
  
 #endif // !(defined NAN && defined INFINITY)
 

+const ClassInfo JSCell::s_dummyCellInfo = { "DummyCell", 0, 0, 0 };
+

 bool JSCell::getUInt32(uint32_t&) const
 {
     return false;
 bool JSCell::getUInt32(uint32_t&) const
 {
     return false;


@@ -119,7 +121,7 @@ bool JSCell::getOwnPropertySlot(ExecState* exec, const Identifier& identifier, P
     // This is not a general purpose implementation of getOwnPropertySlot.
     // It should only be called by JSValue::get.
     // It calls getPropertySlot, not getOwnPropertySlot.
     // This is not a general purpose implementation of getOwnPropertySlot.
     // It should only be called by JSValue::get.
     // It calls getPropertySlot, not getOwnPropertySlot.

-    JSObject* object = toObject(exec);
+    JSObject* object = toObject(exec, exec->lexicalGlobalObject());

     slot.setBase(object);
     if (!object->getPropertySlot(exec, identifier, slot))
         slot.setUndefined();
     slot.setBase(object);
     if (!object->getPropertySlot(exec, identifier, slot))
         slot.setUndefined();


@@ -131,7 +133,7 @@ bool JSCell::getOwnPropertySlot(ExecState* exec, unsigned identifier, PropertySl
     // This is not a general purpose implementation of getOwnPropertySlot.
     // It should only be called by JSValue::get.
     // It calls getPropertySlot, not getOwnPropertySlot.
     // This is not a general purpose implementation of getOwnPropertySlot.
     // It should only be called by JSValue::get.
     // It calls getPropertySlot, not getOwnPropertySlot.

-    JSObject* object = toObject(exec);
+    JSObject* object = toObject(exec, exec->lexicalGlobalObject());

     slot.setBase(object);
     if (!object->getPropertySlot(exec, identifier, slot))
         slot.setUndefined();
     slot.setBase(object);
     if (!object->getPropertySlot(exec, identifier, slot))
         slot.setUndefined();


@@ -140,42 +142,27 @@ bool JSCell::getOwnPropertySlot(ExecState* exec, unsigned identifier, PropertySl
 
 void JSCell::put(ExecState* exec, const Identifier& identifier, JSValue value, PutPropertySlot& slot)
 {
 
 void JSCell::put(ExecState* exec, const Identifier& identifier, JSValue value, PutPropertySlot& slot)
 {

-    toObject(exec)->put(exec, identifier, value, slot);
+    toObject(exec, exec->lexicalGlobalObject())->put(exec, identifier, value, slot);

 }
 
 void JSCell::put(ExecState* exec, unsigned identifier, JSValue value)
 {
 }
 
 void JSCell::put(ExecState* exec, unsigned identifier, JSValue value)
 {

-    toObject(exec)->put(exec, identifier, value);
+    toObject(exec, exec->lexicalGlobalObject())->put(exec, identifier, value);

 }
 
 bool JSCell::deleteProperty(ExecState* exec, const Identifier& identifier)
 {
 }
 
 bool JSCell::deleteProperty(ExecState* exec, const Identifier& identifier)
 {

-    return toObject(exec)->deleteProperty(exec, identifier);
+    return toObject(exec, exec->lexicalGlobalObject())->deleteProperty(exec, identifier);

 }
 
 bool JSCell::deleteProperty(ExecState* exec, unsigned identifier)
 {
 }
 
 bool JSCell::deleteProperty(ExecState* exec, unsigned identifier)
 {

-    return toObject(exec)->deleteProperty(exec, identifier);
+    return toObject(exec, exec->lexicalGlobalObject())->deleteProperty(exec, identifier);

 }
 
 JSObject* JSCell::toThisObject(ExecState* exec) const
 {
 }
 
 JSObject* JSCell::toThisObject(ExecState* exec) const
 {

-    return toObject(exec);
-}
-
-UString JSCell::toThisString(ExecState* exec) const
-{
-    return toThisObject(exec)->toString(exec);
-}
-
-JSString* JSCell::toThisJSString(ExecState* exec)
-{
-    return jsString(exec, toThisString(exec));
-}
-
-const ClassInfo* JSCell::classInfo() const
-{
-    return 0;
+    return toObject(exec, exec->lexicalGlobalObject());

 }
 
 JSValue JSCell::getJSNumber()
 }
 
 JSValue JSCell::getJSNumber()


@@ -218,10 +205,25 @@ UString JSCell::toString(ExecState*) const
     return UString();
 }
 
     return UString();
 }
 

-JSObject* JSCell::toObject(ExecState*) const
+JSObject* JSCell::toObject(ExecState*, JSGlobalObject*) const

 {
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 {
     ASSERT_NOT_REACHED();
     return 0;
 }
 

+bool isZombie(const JSCell* cell)
+{
+#if ENABLE(JSC_ZOMBIES)
+    return cell && cell->isZombie();
+#else
+    UNUSED_PARAM(cell);
+    return false;
+#endif
+}
+
+void slowValidateCell(JSCell* cell)
+{
+    ASSERT_GC_OBJECT_LOOKS_VALID(cell);
+}
+

 } // namespace JSC
 } // namespace JSC