JavaScriptCore-7600.1.4.9.tar.gz

[apple/javascriptcore.git] / API / JSObjectRef.cpp

diff --git a/API/JSObjectRef.cpp b/API/JSObjectRef.cpp
index 2df010a5189f7c6ed2c9aef9c18e31f37089543b..b67c40b5081a914dee732fdcf5e1bc1cde0b31d3 100644 (file)
--- a/API/JSObjectRef.cpp
+++ b/API/JSObjectRef.cpp
@@ -11,17 +11,17 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *

- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR

  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  */
 
 #include "config.h"
  */
 
 #include "config.h"


@@ -29,12 +29,15 @@
 #include "JSObjectRefPrivate.h"
 
 #include "APICast.h"
 #include "JSObjectRefPrivate.h"
 
 #include "APICast.h"

+#include "ButterflyInlines.h"

 #include "CodeBlock.h"
 #include "CodeBlock.h"

+#include "CopiedSpaceInlines.h"

 #include "DateConstructor.h"
 #include "ErrorConstructor.h"
 #include "FunctionConstructor.h"
 #include "Identifier.h"
 #include "InitializeThreading.h"
 #include "DateConstructor.h"
 #include "ErrorConstructor.h"
 #include "FunctionConstructor.h"
 #include "Identifier.h"
 #include "InitializeThreading.h"

+#include "JSAPIWrapperObject.h"

 #include "JSArray.h"
 #include "JSCallbackConstructor.h"
 #include "JSCallbackFunction.h"
 #include "JSArray.h"
 #include "JSCallbackConstructor.h"
 #include "JSCallbackFunction.h"


@@ -46,10 +49,16 @@
 #include "JSRetainPtr.h"
 #include "JSString.h"
 #include "JSValueRef.h"
 #include "JSRetainPtr.h"
 #include "JSString.h"
 #include "JSValueRef.h"

+#include "ObjectConstructor.h"

 #include "ObjectPrototype.h"
 #include "ObjectPrototype.h"

+#include "JSCInlines.h"

 #include "PropertyNameArray.h"
 #include "RegExpConstructor.h"
 
 #include "PropertyNameArray.h"
 #include "RegExpConstructor.h"
 

+#if ENABLE(REMOTE_INSPECTOR)
+#include "JSGlobalObjectInspectorController.h"
+#endif
+

 using namespace JSC;
 
 JSClassRef JSClassCreate(const JSClassDefinition* definition)
 using namespace JSC;
 
 JSClassRef JSClassCreate(const JSClassDefinition* definition)


@@ -75,60 +84,78 @@ void JSClassRelease(JSClassRef jsClass)
 
 JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef jsClass, void* data)
 {
 
 JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef jsClass, void* data)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     if (!jsClass)
         return toRef(constructEmptyObject(exec));
 
 
     if (!jsClass)
         return toRef(constructEmptyObject(exec));
 

-    JSCallbackObject<JSObjectWithGlobalObject>* object = new (exec) JSCallbackObject<JSObjectWithGlobalObject>(exec, exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->callbackObjectStructure(), jsClass, data);
+    JSCallbackObject<JSDestructibleObject>* object = JSCallbackObject<JSDestructibleObject>::create(exec, exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->callbackObjectStructure(), jsClass, data);

     if (JSObject* prototype = jsClass->prototype(exec))
     if (JSObject* prototype = jsClass->prototype(exec))

-        object->setPrototype(exec->globalData(), prototype);
+        object->setPrototype(exec->vm(), prototype);

 
     return toRef(object);
 }
 
 JSObjectRef JSObjectMakeFunctionWithCallback(JSContextRef ctx, JSStringRef name, JSObjectCallAsFunctionCallback callAsFunction)
 {
 
     return toRef(object);
 }
 
 JSObjectRef JSObjectMakeFunctionWithCallback(JSContextRef ctx, JSStringRef name, JSObjectCallAsFunctionCallback callAsFunction)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
-
-    Identifier nameID = name ? name->identifier(&exec->globalData()) : Identifier(exec, "anonymous");
-    
-    return toRef(new (exec) JSCallbackFunction(exec, exec->lexicalGlobalObject(), callAsFunction, nameID));
+    JSLockHolder locker(exec);
+    return toRef(JSCallbackFunction::create(exec->vm(), exec->lexicalGlobalObject(), callAsFunction, name ? name->string() : ASCIILiteral("anonymous")));

 }
 
 JSObjectRef JSObjectMakeConstructor(JSContextRef ctx, JSClassRef jsClass, JSObjectCallAsConstructorCallback callAsConstructor)
 {
 }
 
 JSObjectRef JSObjectMakeConstructor(JSContextRef ctx, JSClassRef jsClass, JSObjectCallAsConstructorCallback callAsConstructor)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue jsPrototype = jsClass ? jsClass->prototype(exec) : 0;
     if (!jsPrototype)
         jsPrototype = exec->lexicalGlobalObject()->objectPrototype();
 
 
     JSValue jsPrototype = jsClass ? jsClass->prototype(exec) : 0;
     if (!jsPrototype)
         jsPrototype = exec->lexicalGlobalObject()->objectPrototype();
 

-    JSCallbackConstructor* constructor = new (exec) JSCallbackConstructor(exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->callbackConstructorStructure(), jsClass, callAsConstructor);
-    constructor->putDirect(exec->globalData(), exec->propertyNames().prototype, jsPrototype, DontEnum | DontDelete | ReadOnly);
+    JSCallbackConstructor* constructor = JSCallbackConstructor::create(exec, exec->lexicalGlobalObject(), exec->lexicalGlobalObject()->callbackConstructorStructure(), jsClass, callAsConstructor);
+    constructor->putDirect(exec->vm(), exec->propertyNames().prototype, jsPrototype, DontEnum | DontDelete | ReadOnly);

     return toRef(constructor);
 }
 
 JSObjectRef JSObjectMakeFunction(JSContextRef ctx, JSStringRef name, unsigned parameterCount, const JSStringRef parameterNames[], JSStringRef body, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     return toRef(constructor);
 }
 
 JSObjectRef JSObjectMakeFunction(JSContextRef ctx, JSStringRef name, unsigned parameterCount, const JSStringRef parameterNames[], JSStringRef body, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
 

-    Identifier nameID = name ? name->identifier(&exec->globalData()) : Identifier(exec, "anonymous");
+    startingLineNumber = std::max(1, startingLineNumber);
+    Identifier nameID = name ? name->identifier(&exec->vm()) : Identifier(exec, "anonymous");

     
     MarkedArgumentBuffer args;
     for (unsigned i = 0; i < parameterCount; i++)
     
     MarkedArgumentBuffer args;
     for (unsigned i = 0; i < parameterCount; i++)

-        args.append(jsString(exec, parameterNames[i]->ustring()));
-    args.append(jsString(exec, body->ustring()));
+        args.append(jsString(exec, parameterNames[i]->string()));
+    args.append(jsString(exec, body->string()));

 
 

-    JSObject* result = constructFunction(exec, exec->lexicalGlobalObject(), args, nameID, sourceURL->ustring(), startingLineNumber);
+    JSObject* result = constructFunction(exec, exec->lexicalGlobalObject(), args, nameID, sourceURL->string(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));

     if (exec->hadException()) {
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

         result = 0;
     }
     return toRef(result);
         result = 0;
     }
     return toRef(result);


@@ -136,8 +163,12 @@ JSObjectRef JSObjectMakeFunction(JSContextRef ctx, JSStringRef name, unsigned pa
 
 JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
 
 JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSObject* result;
     if (argumentCount) {
 
     JSObject* result;
     if (argumentCount) {


@@ -145,14 +176,18 @@ JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSVa
         for (size_t i = 0; i < argumentCount; ++i)
             argList.append(toJS(exec, arguments[i]));
 
         for (size_t i = 0; i < argumentCount; ++i)
             argList.append(toJS(exec, arguments[i]));
 

-        result = constructArray(exec, argList);
+        result = constructArray(exec, static_cast<ArrayAllocationProfile*>(0), argList);

     } else
     } else

-        result = constructEmptyArray(exec);
+        result = constructEmptyArray(exec, 0);

 
     if (exec->hadException()) {
 
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

         result = 0;
     }
 
         result = 0;
     }
 


@@ -161,8 +196,12 @@ JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSVa
 
 JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
 
 JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     MarkedArgumentBuffer argList;
     for (size_t i = 0; i < argumentCount; ++i)
 
     MarkedArgumentBuffer argList;
     for (size_t i = 0; i < argumentCount; ++i)


@@ -170,9 +209,13 @@ JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSVal
 
     JSObject* result = constructDate(exec, exec->lexicalGlobalObject(), argList);
     if (exec->hadException()) {
 
     JSObject* result = constructDate(exec, exec->lexicalGlobalObject(), argList);
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

         result = 0;
     }
 
         result = 0;
     }
 


@@ -181,17 +224,25 @@ JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSVal
 
 JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
 
 JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSValue message = argumentCount ? toJS(exec, arguments[0]) : jsUndefined();
     Structure* errorStructure = exec->lexicalGlobalObject()->errorStructure();
     JSObject* result = ErrorInstance::create(exec, errorStructure, message);
 
     if (exec->hadException()) {
 
     JSValue message = argumentCount ? toJS(exec, arguments[0]) : jsUndefined();
     Structure* errorStructure = exec->lexicalGlobalObject()->errorStructure();
     JSObject* result = ErrorInstance::create(exec, errorStructure, message);
 
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

         result = 0;
     }
 
         result = 0;
     }
 


@@ -200,8 +251,12 @@ JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSVa
 
 JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
 
 JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     MarkedArgumentBuffer argList;
     for (size_t i = 0; i < argumentCount; ++i)
 
     MarkedArgumentBuffer argList;
     for (size_t i = 0; i < argumentCount; ++i)


@@ -209,9 +264,13 @@ JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSV
 
     JSObject* result = constructRegExp(exec, exec->lexicalGlobalObject(),  argList);
     if (exec->hadException()) {
 
     JSObject* result = constructRegExp(exec, exec->lexicalGlobalObject(),  argList);
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

         result = 0;
     }
     
         result = 0;
     }
     


@@ -220,8 +279,12 @@ JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSV
 
 JSValueRef JSObjectGetPrototype(JSContextRef ctx, JSObjectRef object)
 {
 
 JSValueRef JSObjectGetPrototype(JSContextRef ctx, JSObjectRef object)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSObject* jsObject = toJS(object);
     return toRef(exec, jsObject->prototype());
 
     JSObject* jsObject = toJS(object);
     return toRef(exec, jsObject->prototype());


@@ -229,76 +292,109 @@ JSValueRef JSObjectGetPrototype(JSContextRef ctx, JSObjectRef object)
 
 void JSObjectSetPrototype(JSContextRef ctx, JSObjectRef object, JSValueRef value)
 {
 
 void JSObjectSetPrototype(JSContextRef ctx, JSObjectRef object, JSValueRef value)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSObject* jsObject = toJS(object);
     JSValue jsValue = toJS(exec, value);
 
 
     JSObject* jsObject = toJS(object);
     JSValue jsValue = toJS(exec, value);
 

-    jsObject->setPrototypeWithCycleCheck(exec->globalData(), jsValue.isObject() ? jsValue : jsNull());
+    jsObject->setPrototypeWithCycleCheck(exec, jsValue.isObject() ? jsValue : jsNull());

 }
 
 bool JSObjectHasProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
 {
 }
 
 bool JSObjectHasProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSObject* jsObject = toJS(object);
     
 
     JSObject* jsObject = toJS(object);
     

-    return jsObject->hasProperty(exec, propertyName->identifier(&exec->globalData()));
+    return jsObject->hasProperty(exec, propertyName->identifier(&exec->vm()));

 }
 
 JSValueRef JSObjectGetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {
 }
 
 JSValueRef JSObjectGetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSObject* jsObject = toJS(object);
 
 
     JSObject* jsObject = toJS(object);
 

-    JSValue jsValue = jsObject->get(exec, propertyName->identifier(&exec->globalData()));
+    JSValue jsValue = jsObject->get(exec, propertyName->identifier(&exec->vm()));

     if (exec->hadException()) {
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

     }
     return toRef(exec, jsValue);
 }
 
 void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSPropertyAttributes attributes, JSValueRef* exception)
 {
     }
     return toRef(exec, jsValue);
 }
 
 void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSPropertyAttributes attributes, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSObject* jsObject = toJS(object);
 
     JSObject* jsObject = toJS(object);

-    Identifier name(propertyName->identifier(&exec->globalData()));
+    Identifier name(propertyName->identifier(&exec->vm()));

     JSValue jsValue = toJS(exec, value);
 
     JSValue jsValue = toJS(exec, value);
 

-    if (attributes && !jsObject->hasProperty(exec, name))
-        jsObject->putWithAttributes(exec, name, jsValue, attributes);
-    else {
-        PutPropertySlot slot;
-        jsObject->put(exec, name, jsValue, slot);
+    if (attributes && !jsObject->hasProperty(exec, name)) {
+        PropertyDescriptor desc(jsValue, attributes);
+        jsObject->methodTable()->defineOwnProperty(jsObject, exec, name, desc, false);
+    } else {
+        PutPropertySlot slot(jsObject);
+        jsObject->methodTable()->put(jsObject, exec, name, jsValue, slot);

     }
 
     if (exec->hadException()) {
     }
 
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

     }
 }
 
 JSValueRef JSObjectGetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned propertyIndex, JSValueRef* exception)
 {
     }
 }
 
 JSValueRef JSObjectGetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned propertyIndex, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSObject* jsObject = toJS(object);
 
     JSValue jsValue = jsObject->get(exec, propertyIndex);
     if (exec->hadException()) {
 
     JSObject* jsObject = toJS(object);
 
     JSValue jsValue = jsObject->get(exec, propertyIndex);
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

     }
     return toRef(exec, jsValue);
 }
     }
     return toRef(exec, jsValue);
 }


@@ -306,60 +402,94 @@ JSValueRef JSObjectGetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsi
 
 void JSObjectSetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned propertyIndex, JSValueRef value, JSValueRef* exception)
 {
 
 void JSObjectSetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned propertyIndex, JSValueRef value, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSObject* jsObject = toJS(object);
     JSValue jsValue = toJS(exec, value);
     
 
     JSObject* jsObject = toJS(object);
     JSValue jsValue = toJS(exec, value);
     

-    jsObject->put(exec, propertyIndex, jsValue);
+    jsObject->methodTable()->putByIndex(jsObject, exec, propertyIndex, jsValue, false);

     if (exec->hadException()) {
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

     }
 }
 
 bool JSObjectDeleteProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {
     }
 }
 
 bool JSObjectDeleteProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
     JSObject* jsObject = toJS(object);
 
 
     JSObject* jsObject = toJS(object);
 

-    bool result = jsObject->deleteProperty(exec, propertyName->identifier(&exec->globalData()));
+    bool result = jsObject->methodTable()->deleteProperty(jsObject, exec, propertyName->identifier(&exec->vm()));

     if (exec->hadException()) {
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

     }
     return result;
 }
 
 void* JSObjectGetPrivate(JSObjectRef object)
 {
     }
     return result;
 }
 
 void* JSObjectGetPrivate(JSObjectRef object)
 {

-    JSObject* jsObject = toJS(object);
-    
-    if (jsObject->inherits(&JSCallbackObject<JSGlobalObject>::s_info))
-        return static_cast<JSCallbackObject<JSGlobalObject>*>(jsObject)->getPrivate();
-    if (jsObject->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info))
-        return static_cast<JSCallbackObject<JSObjectWithGlobalObject>*>(jsObject)->getPrivate();
+    JSObject* jsObject = uncheckedToJS(object);
+
+    // Get wrapped object if proxied
+    if (jsObject->inherits(JSProxy::info()))
+        jsObject = jsCast<JSProxy*>(jsObject)->target();
+
+    if (jsObject->inherits(JSCallbackObject<JSGlobalObject>::info()))
+        return jsCast<JSCallbackObject<JSGlobalObject>*>(jsObject)->getPrivate();
+    if (jsObject->inherits(JSCallbackObject<JSDestructibleObject>::info()))
+        return jsCast<JSCallbackObject<JSDestructibleObject>*>(jsObject)->getPrivate();
+#if JSC_OBJC_API_ENABLED
+    if (jsObject->inherits(JSCallbackObject<JSAPIWrapperObject>::info()))
+        return jsCast<JSCallbackObject<JSAPIWrapperObject>*>(jsObject)->getPrivate();
+#endif

     
     return 0;
 }
 
 bool JSObjectSetPrivate(JSObjectRef object, void* data)
 {
     
     return 0;
 }
 
 bool JSObjectSetPrivate(JSObjectRef object, void* data)
 {

-    JSObject* jsObject = toJS(object);
-    
-    if (jsObject->inherits(&JSCallbackObject<JSGlobalObject>::s_info)) {
-        static_cast<JSCallbackObject<JSGlobalObject>*>(jsObject)->setPrivate(data);
+    JSObject* jsObject = uncheckedToJS(object);
+
+    // Get wrapped object if proxied
+    if (jsObject->inherits(JSProxy::info()))
+        jsObject = jsCast<JSProxy*>(jsObject)->target();
+
+    if (jsObject->inherits(JSCallbackObject<JSGlobalObject>::info())) {
+        jsCast<JSCallbackObject<JSGlobalObject>*>(jsObject)->setPrivate(data);
+        return true;
+    }
+    if (jsObject->inherits(JSCallbackObject<JSDestructibleObject>::info())) {
+        jsCast<JSCallbackObject<JSDestructibleObject>*>(jsObject)->setPrivate(data);

         return true;
     }
         return true;
     }

-    if (jsObject->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info)) {
-        static_cast<JSCallbackObject<JSObjectWithGlobalObject>*>(jsObject)->setPrivate(data);
+#if JSC_OBJC_API_ENABLED
+    if (jsObject->inherits(JSCallbackObject<JSAPIWrapperObject>::info())) {
+        jsCast<JSCallbackObject<JSAPIWrapperObject>*>(jsObject)->setPrivate(data);

         return true;
     }
         return true;
     }

+#endif

         
     return false;
 }
         
     return false;
 }


@@ -367,62 +497,85 @@ bool JSObjectSetPrivate(JSObjectRef object, void* data)
 JSValueRef JSObjectGetPrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
 {
     ExecState* exec = toJS(ctx);
 JSValueRef JSObjectGetPrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
 {
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

     JSObject* jsObject = toJS(object);
     JSValue result;
     JSObject* jsObject = toJS(object);
     JSValue result;

-    Identifier name(propertyName->identifier(&exec->globalData()));
-    if (jsObject->inherits(&JSCallbackObject<JSGlobalObject>::s_info))
-        result = static_cast<JSCallbackObject<JSGlobalObject>*>(jsObject)->getPrivateProperty(name);
-    else if (jsObject->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info))
-        result = static_cast<JSCallbackObject<JSObjectWithGlobalObject>*>(jsObject)->getPrivateProperty(name);
+    Identifier name(propertyName->identifier(&exec->vm()));
+    if (jsObject->inherits(JSCallbackObject<JSGlobalObject>::info()))
+        result = jsCast<JSCallbackObject<JSGlobalObject>*>(jsObject)->getPrivateProperty(name);
+    else if (jsObject->inherits(JSCallbackObject<JSDestructibleObject>::info()))
+        result = jsCast<JSCallbackObject<JSDestructibleObject>*>(jsObject)->getPrivateProperty(name);
+#if JSC_OBJC_API_ENABLED
+    else if (jsObject->inherits(JSCallbackObject<JSAPIWrapperObject>::info()))
+        result = jsCast<JSCallbackObject<JSAPIWrapperObject>*>(jsObject)->getPrivateProperty(name);
+#endif

     return toRef(exec, result);
 }
 
 bool JSObjectSetPrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value)
 {
     ExecState* exec = toJS(ctx);
     return toRef(exec, result);
 }
 
 bool JSObjectSetPrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value)
 {
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

     JSObject* jsObject = toJS(object);
     JSValue jsValue = value ? toJS(exec, value) : JSValue();
     JSObject* jsObject = toJS(object);
     JSValue jsValue = value ? toJS(exec, value) : JSValue();

-    Identifier name(propertyName->identifier(&exec->globalData()));
-    if (jsObject->inherits(&JSCallbackObject<JSGlobalObject>::s_info)) {
-        static_cast<JSCallbackObject<JSGlobalObject>*>(jsObject)->setPrivateProperty(exec->globalData(), name, jsValue);
+    Identifier name(propertyName->identifier(&exec->vm()));
+    if (jsObject->inherits(JSCallbackObject<JSGlobalObject>::info())) {
+        jsCast<JSCallbackObject<JSGlobalObject>*>(jsObject)->setPrivateProperty(exec->vm(), name, jsValue);
+        return true;
+    }
+    if (jsObject->inherits(JSCallbackObject<JSDestructibleObject>::info())) {
+        jsCast<JSCallbackObject<JSDestructibleObject>*>(jsObject)->setPrivateProperty(exec->vm(), name, jsValue);

         return true;
     }
         return true;
     }

-    if (jsObject->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info)) {
-        static_cast<JSCallbackObject<JSObjectWithGlobalObject>*>(jsObject)->setPrivateProperty(exec->globalData(), name, jsValue);
+#if JSC_OBJC_API_ENABLED
+    if (jsObject->inherits(JSCallbackObject<JSAPIWrapperObject>::info())) {
+        jsCast<JSCallbackObject<JSAPIWrapperObject>*>(jsObject)->setPrivateProperty(exec->vm(), name, jsValue);

         return true;
     }
         return true;
     }

+#endif

     return false;
 }
 
 bool JSObjectDeletePrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
 {
     ExecState* exec = toJS(ctx);
     return false;
 }
 
 bool JSObjectDeletePrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
 {
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

     JSObject* jsObject = toJS(object);
     JSObject* jsObject = toJS(object);

-    Identifier name(propertyName->identifier(&exec->globalData()));
-    if (jsObject->inherits(&JSCallbackObject<JSGlobalObject>::s_info)) {
-        static_cast<JSCallbackObject<JSGlobalObject>*>(jsObject)->deletePrivateProperty(name);
+    Identifier name(propertyName->identifier(&exec->vm()));
+    if (jsObject->inherits(JSCallbackObject<JSGlobalObject>::info())) {
+        jsCast<JSCallbackObject<JSGlobalObject>*>(jsObject)->deletePrivateProperty(name);

         return true;
     }
         return true;
     }

-    if (jsObject->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info)) {
-        static_cast<JSCallbackObject<JSObjectWithGlobalObject>*>(jsObject)->deletePrivateProperty(name);
+    if (jsObject->inherits(JSCallbackObject<JSDestructibleObject>::info())) {
+        jsCast<JSCallbackObject<JSDestructibleObject>*>(jsObject)->deletePrivateProperty(name);

         return true;
     }
         return true;
     }

+#if JSC_OBJC_API_ENABLED
+    if (jsObject->inherits(JSCallbackObject<JSAPIWrapperObject>::info())) {
+        jsCast<JSCallbackObject<JSAPIWrapperObject>*>(jsObject)->deletePrivateProperty(name);
+        return true;
+    }
+#endif

     return false;
 }
 
     return false;
 }
 

-bool JSObjectIsFunction(JSContextRef, JSObjectRef object)
+bool JSObjectIsFunction(JSContextRef ctx, JSObjectRef object)

 {
 {

+    if (!object)
+        return false;
+    JSLockHolder locker(toJS(ctx));

     CallData callData;
     CallData callData;

-    return toJS(object)->getCallData(callData) != CallTypeNone;
+    JSCell* cell = toJS(object);
+    return cell->methodTable()->getCallData(cell, callData) != CallTypeNone;

 }
 
 JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 }
 
 JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);
+
+    if (!object)
+        return 0;

 
     JSObject* jsObject = toJS(object);
     JSObject* jsThisObject = toJS(thisObject);
 
     JSObject* jsObject = toJS(object);
     JSObject* jsThisObject = toJS(thisObject);


@@ -435,15 +588,19 @@ JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObject
         argList.append(toJS(exec, arguments[i]));
 
     CallData callData;
         argList.append(toJS(exec, arguments[i]));
 
     CallData callData;

-    CallType callType = jsObject->getCallData(callData);
+    CallType callType = jsObject->methodTable()->getCallData(jsObject, callData);

     if (callType == CallTypeNone)
         return 0;
 
     JSValueRef result = toRef(exec, call(exec, jsObject, callType, callData, jsThisObject, argList));
     if (exec->hadException()) {
     if (callType == CallTypeNone)
         return 0;
 
     JSValueRef result = toRef(exec, call(exec, jsObject, callType, callData, jsThisObject, argList));
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

         result = 0;
     }
     return result;
         result = 0;
     }
     return result;


@@ -451,20 +608,25 @@ JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObject
 
 bool JSObjectIsConstructor(JSContextRef, JSObjectRef object)
 {
 
 bool JSObjectIsConstructor(JSContextRef, JSObjectRef object)
 {

+    if (!object)
+        return false;

     JSObject* jsObject = toJS(object);
     ConstructData constructData;
     JSObject* jsObject = toJS(object);
     ConstructData constructData;

-    return jsObject->getConstructData(constructData) != ConstructTypeNone;
+    return jsObject->methodTable()->getConstructData(jsObject, constructData) != ConstructTypeNone;

 }
 
 JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 }
 
 JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);
+
+    if (!object)
+        return 0;

 
     JSObject* jsObject = toJS(object);
 
     ConstructData constructData;
 
     JSObject* jsObject = toJS(object);
 
     ConstructData constructData;

-    ConstructType constructType = jsObject->getConstructData(constructData);
+    ConstructType constructType = jsObject->methodTable()->getConstructData(jsObject, constructData);

     if (constructType == ConstructTypeNone)
         return 0;
 
     if (constructType == ConstructTypeNone)
         return 0;
 


@@ -473,9 +635,13 @@ JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size
         argList.append(toJS(exec, arguments[i]));
     JSObjectRef result = toRef(construct(exec, jsObject, constructType, constructData, argList));
     if (exec->hadException()) {
         argList.append(toJS(exec, arguments[i]));
     JSObjectRef result = toRef(construct(exec, jsObject, constructType, constructData, argList));
     if (exec->hadException()) {

+        JSValue exceptionValue = exec->exception();

         if (exception)
         if (exception)

-            *exception = toRef(exec, exec->exception());
+            *exception = toRef(exec, exceptionValue);

         exec->clearException();
         exec->clearException();

+#if ENABLE(REMOTE_INSPECTOR)
+        exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exceptionValue);
+#endif

         result = 0;
     }
     return result;
         result = 0;
     }
     return result;


@@ -484,33 +650,37 @@ JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size
 struct OpaqueJSPropertyNameArray {
     WTF_MAKE_FAST_ALLOCATED;
 public:
 struct OpaqueJSPropertyNameArray {
     WTF_MAKE_FAST_ALLOCATED;
 public:

-    OpaqueJSPropertyNameArray(JSGlobalData* globalData)
+    OpaqueJSPropertyNameArray(VM* vm)

         : refCount(0)
         : refCount(0)

-        , globalData(globalData)
+        , vm(vm)

     {
     }
     
     unsigned refCount;
     {
     }
     
     unsigned refCount;

-    JSGlobalData* globalData;
-    Vector<JSRetainPtr<JSStringRef> > array;
+    VM* vm;
+    Vector<JSRetainPtr<JSStringRef>> array;

 };
 
 JSPropertyNameArrayRef JSObjectCopyPropertyNames(JSContextRef ctx, JSObjectRef object)
 {
 };
 
 JSPropertyNameArrayRef JSObjectCopyPropertyNames(JSContextRef ctx, JSObjectRef object)
 {

-    JSObject* jsObject = toJS(object);
+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

 
 

-    JSGlobalData* globalData = &exec->globalData();
+    VM* vm = &exec->vm();

 
 

-    JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray(globalData);
-    PropertyNameArray array(globalData);
-    jsObject->getPropertyNames(exec, array);
+    JSObject* jsObject = toJS(object);
+    JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray(vm);
+    PropertyNameArray array(vm);
+    jsObject->methodTable()->getPropertyNames(jsObject, exec, array, ExcludeDontEnumProperties);

 
     size_t size = array.size();
     propertyNames->array.reserveInitialCapacity(size);
     for (size_t i = 0; i < size; ++i)
 
     size_t size = array.size();
     propertyNames->array.reserveInitialCapacity(size);
     for (size_t i = 0; i < size; ++i)

-        propertyNames->array.append(JSRetainPtr<JSStringRef>(Adopt, OpaqueJSString::create(array[i].ustring()).leakRef()));
+        propertyNames->array.uncheckedAppend(JSRetainPtr<JSStringRef>(Adopt, OpaqueJSString::create(array[i].string()).leakRef()));

     
     return JSPropertyNameArrayRetain(propertyNames);
 }
     
     return JSPropertyNameArrayRetain(propertyNames);
 }


@@ -524,7 +694,7 @@ JSPropertyNameArrayRef JSPropertyNameArrayRetain(JSPropertyNameArrayRef array)
 void JSPropertyNameArrayRelease(JSPropertyNameArrayRef array)
 {
     if (--array->refCount == 0) {
 void JSPropertyNameArrayRelease(JSPropertyNameArrayRef array)
 {
     if (--array->refCount == 0) {

-        APIEntryShim entryShim(array->globalData, false);
+        JSLockHolder locker(array->vm);

         delete array;
     }
 }
         delete array;
     }
 }


@@ -542,6 +712,6 @@ JSStringRef JSPropertyNameArrayGetNameAtIndex(JSPropertyNameArrayRef array, size
 void JSPropertyNameAccumulatorAddName(JSPropertyNameAccumulatorRef array, JSStringRef propertyName)
 {
     PropertyNameArray* propertyNames = toJS(array);
 void JSPropertyNameAccumulatorAddName(JSPropertyNameAccumulatorRef array, JSStringRef propertyName)
 {
     PropertyNameArray* propertyNames = toJS(array);

-    APIEntryShim entryShim(propertyNames->globalData());
-    propertyNames->add(propertyName->identifier(propertyNames->globalData()));
+    JSLockHolder locker(propertyNames->vm());
+    propertyNames->add(propertyName->identifier(propertyNames->vm()));

 }
 }