JavaScriptCore-576.tar.gz

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

diff --git a/API/JSObjectRef.cpp b/API/JSObjectRef.cpp
index e81e5129fc55a3a8866d50e3802fad1efe1a56f0..faaa4eb669753451ab997f20b40d81b8e55bde26 100644 (file)
--- a/API/JSObjectRef.cpp
+++ b/API/JSObjectRef.cpp
@@ -28,6 +28,7 @@
 #include "JSObjectRef.h"
 
 #include "APICast.h"
 #include "JSObjectRef.h"
 
 #include "APICast.h"

+#include "CodeBlock.h"

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


@@ -75,8 +76,7 @@ void JSClassRelease(JSClassRef jsClass)
 JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef jsClass, void* data)
 {
     ExecState* exec = toJS(ctx);
 JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef jsClass, void* data)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
     if (!jsClass)
         return toRef(new (exec) JSObject(exec->lexicalGlobalObject()->emptyObjectStructure())); // slightly more efficient
 
     if (!jsClass)
         return toRef(new (exec) JSObject(exec->lexicalGlobalObject()->emptyObjectStructure())); // slightly more efficient


@@ -91,8 +91,7 @@ JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef jsClass, void* data)
 JSObjectRef JSObjectMakeFunctionWithCallback(JSContextRef ctx, JSStringRef name, JSObjectCallAsFunctionCallback callAsFunction)
 {
     ExecState* exec = toJS(ctx);
 JSObjectRef JSObjectMakeFunctionWithCallback(JSContextRef ctx, JSStringRef name, JSObjectCallAsFunctionCallback callAsFunction)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
     Identifier nameID = name ? name->identifier(&exec->globalData()) : Identifier(exec, "anonymous");
     
 
     Identifier nameID = name ? name->identifier(&exec->globalData()) : Identifier(exec, "anonymous");
     


@@ -102,13 +101,12 @@ JSObjectRef JSObjectMakeFunctionWithCallback(JSContextRef ctx, JSStringRef name,
 JSObjectRef JSObjectMakeConstructor(JSContextRef ctx, JSClassRef jsClass, JSObjectCallAsConstructorCallback callAsConstructor)
 {
     ExecState* exec = toJS(ctx);
 JSObjectRef JSObjectMakeConstructor(JSContextRef ctx, JSClassRef jsClass, JSObjectCallAsConstructorCallback callAsConstructor)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsPrototype = jsClass ? jsClass->prototype(exec) : 0;
+    if (!jsPrototype)
+        jsPrototype = exec->lexicalGlobalObject()->objectPrototype();

 
 

-    JSValuePtr jsPrototype = jsClass 
-        ? jsClass->prototype(exec)
-        : exec->lexicalGlobalObject()->objectPrototype();
-    

     JSCallbackConstructor* constructor = new (exec) JSCallbackConstructor(exec->lexicalGlobalObject()->callbackConstructorStructure(), jsClass, callAsConstructor);
     constructor->putDirect(exec->propertyNames().prototype, jsPrototype, DontEnum | DontDelete | ReadOnly);
     return toRef(constructor);
     JSCallbackConstructor* constructor = new (exec) JSCallbackConstructor(exec->lexicalGlobalObject()->callbackConstructorStructure(), jsClass, callAsConstructor);
     constructor->putDirect(exec->propertyNames().prototype, jsPrototype, DontEnum | DontDelete | ReadOnly);
     return toRef(constructor);


@@ -117,12 +115,11 @@ JSObjectRef JSObjectMakeConstructor(JSContextRef ctx, JSClassRef jsClass, JSObje
 JSObjectRef JSObjectMakeFunction(JSContextRef ctx, JSStringRef name, unsigned parameterCount, const JSStringRef parameterNames[], JSStringRef body, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 JSObjectRef JSObjectMakeFunction(JSContextRef ctx, JSStringRef name, unsigned parameterCount, const JSStringRef parameterNames[], JSStringRef body, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
     Identifier nameID = name ? name->identifier(&exec->globalData()) : Identifier(exec, "anonymous");
     
 
     Identifier nameID = name ? name->identifier(&exec->globalData()) : Identifier(exec, "anonymous");
     

-    ArgList args;
+    MarkedArgumentBuffer args;

     for (unsigned i = 0; i < parameterCount; i++)
         args.append(jsString(exec, parameterNames[i]->ustring()));
     args.append(jsString(exec, body->ustring()));
     for (unsigned i = 0; i < parameterCount; i++)
         args.append(jsString(exec, parameterNames[i]->ustring()));
     args.append(jsString(exec, body->ustring()));


@@ -130,7 +127,7 @@ JSObjectRef JSObjectMakeFunction(JSContextRef ctx, JSStringRef name, unsigned pa
     JSObject* result = constructFunction(exec, args, nameID, sourceURL->ustring(), startingLineNumber);
     if (exec->hadException()) {
         if (exception)
     JSObject* result = constructFunction(exec, args, nameID, sourceURL->ustring(), startingLineNumber);
     if (exec->hadException()) {
         if (exception)

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

         exec->clearException();
         result = 0;
     }
         exec->clearException();
         result = 0;
     }


@@ -140,14 +137,13 @@ JSObjectRef JSObjectMakeFunction(JSContextRef ctx, JSStringRef name, unsigned pa
 JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

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

-        ArgList argList;
+        MarkedArgumentBuffer argList;

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

-            argList.append(toJS(arguments[i]));
+            argList.append(toJS(exec, arguments[i]));

 
         result = constructArray(exec, argList);
     } else
 
         result = constructArray(exec, argList);
     } else


@@ -155,7 +151,7 @@ JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSVa
 
     if (exec->hadException()) {
         if (exception)
 
     if (exec->hadException()) {
         if (exception)

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

         exec->clearException();
         result = 0;
     }
         exec->clearException();
         result = 0;
     }


@@ -166,17 +162,16 @@ JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSVa
 JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
 

-    ArgList argList;
+    MarkedArgumentBuffer argList;

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

-        argList.append(toJS(arguments[i]));
+        argList.append(toJS(exec, arguments[i]));

 
     JSObject* result = constructDate(exec, argList);
     if (exec->hadException()) {
         if (exception)
 
     JSObject* result = constructDate(exec, argList);
     if (exec->hadException()) {
         if (exception)

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

         exec->clearException();
         result = 0;
     }
         exec->clearException();
         result = 0;
     }


@@ -187,17 +182,16 @@ JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSVal
 JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
 

-    ArgList argList;
+    MarkedArgumentBuffer argList;

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

-        argList.append(toJS(arguments[i]));
+        argList.append(toJS(exec, arguments[i]));

 
     JSObject* result = constructError(exec, argList);
     if (exec->hadException()) {
         if (exception)
 
     JSObject* result = constructError(exec, argList);
     if (exec->hadException()) {
         if (exception)

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

         exec->clearException();
         result = 0;
     }
         exec->clearException();
         result = 0;
     }


@@ -208,17 +202,16 @@ JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSVa
 JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[],  JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
 

-    ArgList argList;
+    MarkedArgumentBuffer argList;

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

-        argList.append(toJS(arguments[i]));
+        argList.append(toJS(exec, arguments[i]));

 
     JSObject* result = constructRegExp(exec, argList);
     if (exec->hadException()) {
         if (exception)
 
     JSObject* result = constructRegExp(exec, argList);
     if (exec->hadException()) {
         if (exception)

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

         exec->clearException();
         result = 0;
     }
         exec->clearException();
         result = 0;
     }


@@ -226,16 +219,22 @@ JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSV
     return toRef(result);
 }
 
     return toRef(result);
 }
 

-JSValueRef JSObjectGetPrototype(JSContextRef, JSObjectRef object)
+JSValueRef JSObjectGetPrototype(JSContextRef ctx, JSObjectRef object)

 {
 {

+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+

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

-    return toRef(jsObject->prototype());
+    return toRef(exec, jsObject->prototype());

 }
 
 }
 

-void JSObjectSetPrototype(JSContextRef, JSObjectRef object, JSValueRef value)
+void JSObjectSetPrototype(JSContextRef ctx, JSObjectRef object, JSValueRef value)

 {
 {

+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+

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

-    JSValuePtr jsValue = toJS(value);
+    JSValue jsValue = toJS(exec, value);

 
     jsObject->setPrototype(jsValue.isObject() ? jsValue : jsNull());
 }
 
     jsObject->setPrototype(jsValue.isObject() ? jsValue : jsNull());
 }


@@ -243,8 +242,7 @@ void JSObjectSetPrototype(JSContextRef, JSObjectRef object, JSValueRef value)
 bool JSObjectHasProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
 {
     ExecState* exec = toJS(ctx);
 bool JSObjectHasProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

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


@@ -254,29 +252,27 @@ bool JSObjectHasProperty(JSContextRef ctx, JSObjectRef object, JSStringRef prope
 JSValueRef JSObjectGetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 JSValueRef JSObjectGetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

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

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

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

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

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

-    return toRef(jsValue);
+    return toRef(exec, jsValue);

 }
 
 void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSPropertyAttributes attributes, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 }
 
 void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSPropertyAttributes attributes, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
     JSObject* jsObject = toJS(object);
     Identifier name(propertyName->identifier(&exec->globalData()));
 
     JSObject* jsObject = toJS(object);
     Identifier name(propertyName->identifier(&exec->globalData()));

-    JSValuePtr jsValue = toJS(value);
+    JSValue jsValue = toJS(exec, value);

 
     if (attributes && !jsObject->hasProperty(exec, name))
         jsObject->putWithAttributes(exec, name, jsValue, attributes);
 
     if (attributes && !jsObject->hasProperty(exec, name))
         jsObject->putWithAttributes(exec, name, jsValue, attributes);


@@ -287,7 +283,7 @@ void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef prope
 
     if (exec->hadException()) {
         if (exception)
 
     if (exec->hadException()) {
         if (exception)

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

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


@@ -295,34 +291,32 @@ void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef prope
 JSValueRef JSObjectGetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned propertyIndex, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 JSValueRef JSObjectGetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned propertyIndex, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

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

-    JSValuePtr jsValue = jsObject->get(exec, propertyIndex);
+    JSValue jsValue = jsObject->get(exec, propertyIndex);

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

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

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

-    return toRef(jsValue);
+    return toRef(exec, jsValue);

 }
 
 
 void JSObjectSetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned propertyIndex, JSValueRef value, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 }
 
 
 void JSObjectSetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned propertyIndex, JSValueRef value, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

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

-    JSValuePtr jsValue = toJS(value);
+    JSValue jsValue = toJS(exec, value);

     
     jsObject->put(exec, propertyIndex, jsValue);
     if (exec->hadException()) {
         if (exception)
     
     jsObject->put(exec, propertyIndex, jsValue);
     if (exec->hadException()) {
         if (exception)

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

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


@@ -330,15 +324,14 @@ void JSObjectSetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned p
 bool JSObjectDeleteProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 bool JSObjectDeleteProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
     JSObject* jsObject = toJS(object);
 
     bool result = jsObject->deleteProperty(exec, propertyName->identifier(&exec->globalData()));
     if (exec->hadException()) {
         if (exception)
 
     JSObject* jsObject = toJS(object);
 
     bool result = jsObject->deleteProperty(exec, propertyName->identifier(&exec->globalData()));
     if (exec->hadException()) {
         if (exception)

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

         exec->clearException();
     }
     return result;
         exec->clearException();
     }
     return result;


@@ -380,8 +373,7 @@ bool JSObjectIsFunction(JSContextRef, JSObjectRef object)
 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);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

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


@@ -389,19 +381,19 @@ JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObject
     if (!jsThisObject)
         jsThisObject = exec->globalThisValue();
 
     if (!jsThisObject)
         jsThisObject = exec->globalThisValue();
 

-    ArgList argList;
+    MarkedArgumentBuffer argList;

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

-        argList.append(toJS(arguments[i]));
+        argList.append(toJS(exec, arguments[i]));

 
     CallData callData;
     CallType callType = jsObject->getCallData(callData);
     if (callType == CallTypeNone)
         return 0;
 
 
     CallData callData;
     CallType callType = jsObject->getCallData(callData);
     if (callType == CallTypeNone)
         return 0;
 

-    JSValueRef result = toRef(call(exec, jsObject, callType, callData, jsThisObject, argList));
+    JSValueRef result = toRef(exec, call(exec, jsObject, callType, callData, jsThisObject, argList));

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

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

         exec->clearException();
         result = 0;
     }
         exec->clearException();
         result = 0;
     }


@@ -418,8 +410,7 @@ bool JSObjectIsConstructor(JSContextRef, JSObjectRef object)
 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);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

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


@@ -428,20 +419,20 @@ JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size
     if (constructType == ConstructTypeNone)
         return 0;
 
     if (constructType == ConstructTypeNone)
         return 0;
 

-    ArgList argList;
+    MarkedArgumentBuffer argList;

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

-        argList.append(toJS(arguments[i]));
+        argList.append(toJS(exec, arguments[i]));

     JSObjectRef result = toRef(construct(exec, jsObject, constructType, constructData, argList));
     if (exec->hadException()) {
         if (exception)
     JSObjectRef result = toRef(construct(exec, jsObject, constructType, constructData, argList));
     if (exec->hadException()) {
         if (exception)

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

         exec->clearException();
         result = 0;
     }
     return result;
 }
 
         exec->clearException();
         result = 0;
     }
     return result;
 }
 

-struct OpaqueJSPropertyNameArray {
+struct OpaqueJSPropertyNameArray : FastAllocBase {

     OpaqueJSPropertyNameArray(JSGlobalData* globalData)
         : refCount(0)
         , globalData(globalData)
     OpaqueJSPropertyNameArray(JSGlobalData* globalData)
         : refCount(0)
         , globalData(globalData)


@@ -457,8 +448,7 @@ JSPropertyNameArrayRef JSObjectCopyPropertyNames(JSContextRef ctx, JSObjectRef o
 {
     JSObject* jsObject = toJS(object);
     ExecState* exec = toJS(ctx);
 {
     JSObject* jsObject = toJS(object);
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
     JSGlobalData* globalData = &exec->globalData();
 
 
     JSGlobalData* globalData = &exec->globalData();
 


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

-        JSLock lock(array->globalData->isSharedInstance);
+        APIEntryShim entryShim(array->globalData, false);

         delete array;
     }
 }
         delete array;
     }
 }


@@ -501,9 +491,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);

-
-    propertyNames->globalData()->heap.registerThread();
-    JSLock lock(propertyNames->globalData()->isSharedInstance);
-
+    APIEntryShim entryShim(propertyNames->globalData());

     propertyNames->add(propertyName->identifier(propertyNames->globalData()));
 }
     propertyNames->add(propertyName->identifier(propertyNames->globalData()));
 }