Changeset 159459 in webkit for trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

Timestamp:

Nov 18, 2013, 3:07:03 PM (12 years ago)

Author:

[email protected]

Message:

APIEntryShims need some love
​https://bugs.webkit.org/show_bug.cgi?id=124540

Reviewed by Filip Pizlo.

We were missing them in key places which some other hacking revealed. These could have manifested as
race conditions for VMs being used in multithreaded environments.

• API/JSContext.mm:

(-[JSContext setException:]):
(-[JSContext wrapperForObjCObject:]):
(-[JSContext wrapperForJSObject:]):

• API/JSContextRef.cpp:

(JSContextGroupRelease):
(JSGlobalContextRelease):

• API/JSManagedValue.mm:

(-[JSManagedValue initWithValue:]):
(-[JSManagedValue value]):

• API/JSObjectRef.cpp:

(JSObjectIsFunction):
(JSObjectCopyPropertyNames):

• API/JSValue.mm:

(containerValueToObject):

• API/JSWrapperMap.mm:

(tryUnwrapObjcObject):

File:

• trunk/Source/JavaScriptCore/API/JSObjectRef.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

@@ -507 +507 @@
 }
 
-bool JSObjectIsFunction(JSContextRef, JSObjectRef object)
+bool JSObjectIsFunction(JSContextRef ctx, JSObjectRef object)
 {
     if (!object)
         return false;
+    APIEntryShim entryShim(toJS(ctx));
     CallData callData;
     JSCell* cell = toJS(object);
@@ -606 +607 @@
         return 0;
     }
-    JSObject* jsObject = toJS(object);
     ExecState* exec = toJS(ctx);
     APIEntryShim entryShim(exec);
@@ -612 +612 @@
     VM* vm = &exec->vm();
 
+    JSObject* jsObject = toJS(object);
     JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray(vm);
     PropertyNameArray array(vm);