From 41386e9cb918eed93b3f13648cbef387e371e451 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 20 May 2015 09:56:07 +0000 Subject: webkitgtk-2.4.9 --- Source/JavaScriptCore/API/APICallbackFunction.h | 8 +- Source/JavaScriptCore/API/APICast.h | 7 +- Source/JavaScriptCore/API/APIShims.h | 125 ++ Source/JavaScriptCore/API/JSAPIWrapperObject.h | 2 + Source/JavaScriptCore/API/JSBase.cpp | 59 +- Source/JavaScriptCore/API/JSBase.h | 17 +- Source/JavaScriptCore/API/JSBasePrivate.h | 6 +- Source/JavaScriptCore/API/JSCTestRunnerUtils.cpp | 4 +- .../JavaScriptCore/API/JSCallbackConstructor.cpp | 9 +- Source/JavaScriptCore/API/JSCallbackConstructor.h | 6 +- Source/JavaScriptCore/API/JSCallbackFunction.cpp | 9 +- Source/JavaScriptCore/API/JSCallbackFunction.h | 4 +- Source/JavaScriptCore/API/JSCallbackObject.cpp | 23 +- Source/JavaScriptCore/API/JSCallbackObject.h | 34 +- .../JavaScriptCore/API/JSCallbackObjectFunctions.h | 87 +- Source/JavaScriptCore/API/JSClassRef.cpp | 30 +- Source/JavaScriptCore/API/JSClassRef.h | 16 +- Source/JavaScriptCore/API/JSContext.h | 250 --- Source/JavaScriptCore/API/JSContextInternal.h | 80 - Source/JavaScriptCore/API/JSContextPrivate.h | 57 - Source/JavaScriptCore/API/JSContextRef.cpp | 204 +- Source/JavaScriptCore/API/JSContextRef.h | 12 +- .../API/JSContextRefInspectorSupport.h | 43 - Source/JavaScriptCore/API/JSContextRefInternal.h | 60 - Source/JavaScriptCore/API/JSContextRefPrivate.h | 42 +- Source/JavaScriptCore/API/JSExport.h | 152 -- Source/JavaScriptCore/API/JSManagedValue.h | 85 - Source/JavaScriptCore/API/JSManagedValueInternal.h | 42 - Source/JavaScriptCore/API/JSObjectRef.cpp | 199 +- Source/JavaScriptCore/API/JSObjectRef.h | 4 +- Source/JavaScriptCore/API/JSProfilerPrivate.cpp | 50 - Source/JavaScriptCore/API/JSProfilerPrivate.h | 63 - Source/JavaScriptCore/API/JSRemoteInspector.cpp | 78 - Source/JavaScriptCore/API/JSRemoteInspector.h | 49 - Source/JavaScriptCore/API/JSRetainPtr.h | 17 +- Source/JavaScriptCore/API/JSScriptRef.cpp | 45 +- Source/JavaScriptCore/API/JSStringRef.cpp | 18 +- Source/JavaScriptCore/API/JSStringRef.h | 6 +- Source/JavaScriptCore/API/JSStringRefBSTR.cpp | 42 - Source/JavaScriptCore/API/JSStringRefBSTR.h | 62 - Source/JavaScriptCore/API/JSStringRefCF.cpp | 67 - Source/JavaScriptCore/API/JSStringRefCF.h | 60 - Source/JavaScriptCore/API/JSValue.h | 679 ------- Source/JavaScriptCore/API/JSValueInternal.h | 58 - Source/JavaScriptCore/API/JSValueRef.cpp | 191 +- Source/JavaScriptCore/API/JSValueRef.h | 24 +- Source/JavaScriptCore/API/JSVirtualMachine.h | 82 - .../JavaScriptCore/API/JSVirtualMachineInternal.h | 60 - .../API/JSWeakObjectMapRefInternal.h | 9 +- .../API/JSWeakObjectMapRefPrivate.cpp | 103 - .../JavaScriptCore/API/JSWeakObjectMapRefPrivate.h | 92 - Source/JavaScriptCore/API/JSWrapperMap.h | 48 - Source/JavaScriptCore/API/JavaScript.h | 4 +- Source/JavaScriptCore/API/JavaScriptCore.h | 42 - Source/JavaScriptCore/API/ObjCCallbackFunction.h | 6 +- Source/JavaScriptCore/API/ObjcRuntimeExtras.h | 242 --- Source/JavaScriptCore/API/OpaqueJSString.cpp | 29 +- Source/JavaScriptCore/API/OpaqueJSString.h | 26 +- Source/JavaScriptCore/API/WebKitAvailability.h | 35 - .../API/tests/CompareAndSwapTest.cpp | 118 -- .../JavaScriptCore/API/tests/CompareAndSwapTest.h | 40 - .../API/tests/CurrentThisInsideBlockGetterTest.h | 38 - .../API/tests/CustomGlobalObjectClassTest.c | 145 -- .../API/tests/CustomGlobalObjectClassTest.h | 33 - Source/JavaScriptCore/API/tests/DateTests.h | 32 - .../API/tests/ExecutionTimeLimitTest.cpp | 332 ---- .../API/tests/ExecutionTimeLimitTest.h | 40 - .../API/tests/GlobalContextWithFinalizerTest.cpp | 56 - .../API/tests/GlobalContextWithFinalizerTest.h | 42 - Source/JavaScriptCore/API/tests/JSExportTests.h | 34 - Source/JavaScriptCore/API/tests/JSNode.c | 8 +- Source/JavaScriptCore/API/tests/JSNode.h | 6 +- Source/JavaScriptCore/API/tests/JSNodeList.c | 8 +- Source/JavaScriptCore/API/tests/JSNodeList.h | 6 +- Source/JavaScriptCore/API/tests/Node.c | 6 +- Source/JavaScriptCore/API/tests/Node.h | 6 +- Source/JavaScriptCore/API/tests/NodeList.c | 6 +- Source/JavaScriptCore/API/tests/NodeList.h | 6 +- Source/JavaScriptCore/API/tests/Regress141275.h | 34 - Source/JavaScriptCore/API/tests/Regress141809.h | 34 - Source/JavaScriptCore/API/tests/minidom.c | 8 +- Source/JavaScriptCore/API/tests/minidom.html | 9 - Source/JavaScriptCore/API/tests/minidom.js | 110 -- Source/JavaScriptCore/API/tests/testapi.c | 1993 -------------------- Source/JavaScriptCore/API/tests/testapi.js | 307 --- 85 files changed, 622 insertions(+), 6798 deletions(-) create mode 100644 Source/JavaScriptCore/API/APIShims.h delete mode 100644 Source/JavaScriptCore/API/JSContext.h delete mode 100644 Source/JavaScriptCore/API/JSContextInternal.h delete mode 100644 Source/JavaScriptCore/API/JSContextPrivate.h delete mode 100644 Source/JavaScriptCore/API/JSContextRefInspectorSupport.h delete mode 100644 Source/JavaScriptCore/API/JSContextRefInternal.h delete mode 100644 Source/JavaScriptCore/API/JSExport.h delete mode 100644 Source/JavaScriptCore/API/JSManagedValue.h delete mode 100644 Source/JavaScriptCore/API/JSManagedValueInternal.h delete mode 100644 Source/JavaScriptCore/API/JSProfilerPrivate.cpp delete mode 100644 Source/JavaScriptCore/API/JSProfilerPrivate.h delete mode 100644 Source/JavaScriptCore/API/JSRemoteInspector.cpp delete mode 100644 Source/JavaScriptCore/API/JSRemoteInspector.h delete mode 100644 Source/JavaScriptCore/API/JSStringRefBSTR.cpp delete mode 100644 Source/JavaScriptCore/API/JSStringRefBSTR.h delete mode 100644 Source/JavaScriptCore/API/JSStringRefCF.cpp delete mode 100644 Source/JavaScriptCore/API/JSStringRefCF.h delete mode 100644 Source/JavaScriptCore/API/JSValue.h delete mode 100644 Source/JavaScriptCore/API/JSValueInternal.h delete mode 100644 Source/JavaScriptCore/API/JSVirtualMachine.h delete mode 100644 Source/JavaScriptCore/API/JSVirtualMachineInternal.h delete mode 100644 Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp delete mode 100644 Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.h delete mode 100644 Source/JavaScriptCore/API/JSWrapperMap.h delete mode 100644 Source/JavaScriptCore/API/JavaScriptCore.h delete mode 100644 Source/JavaScriptCore/API/ObjcRuntimeExtras.h delete mode 100644 Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp delete mode 100644 Source/JavaScriptCore/API/tests/CompareAndSwapTest.h delete mode 100644 Source/JavaScriptCore/API/tests/CurrentThisInsideBlockGetterTest.h delete mode 100644 Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.c delete mode 100644 Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.h delete mode 100644 Source/JavaScriptCore/API/tests/DateTests.h delete mode 100644 Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp delete mode 100644 Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.h delete mode 100644 Source/JavaScriptCore/API/tests/GlobalContextWithFinalizerTest.cpp delete mode 100644 Source/JavaScriptCore/API/tests/GlobalContextWithFinalizerTest.h delete mode 100644 Source/JavaScriptCore/API/tests/JSExportTests.h delete mode 100644 Source/JavaScriptCore/API/tests/Regress141275.h delete mode 100644 Source/JavaScriptCore/API/tests/Regress141809.h delete mode 100644 Source/JavaScriptCore/API/tests/minidom.html delete mode 100644 Source/JavaScriptCore/API/tests/minidom.js delete mode 100644 Source/JavaScriptCore/API/tests/testapi.c delete mode 100644 Source/JavaScriptCore/API/tests/testapi.js (limited to 'Source/JavaScriptCore/API') diff --git a/Source/JavaScriptCore/API/APICallbackFunction.h b/Source/JavaScriptCore/API/APICallbackFunction.h index 94b10c420..65c519b7a 100644 --- a/Source/JavaScriptCore/API/APICallbackFunction.h +++ b/Source/JavaScriptCore/API/APICallbackFunction.h @@ -27,9 +27,9 @@ #define APICallbackFunction_h #include "APICast.h" +#include "APIShims.h" #include "Error.h" #include "JSCallbackConstructor.h" -#include "JSLock.h" #include namespace JSC { @@ -46,7 +46,7 @@ EncodedJSValue JSC_HOST_CALL APICallbackFunction::call(ExecState* exec) { JSContextRef execRef = toRef(exec); JSObjectRef functionRef = toRef(exec->callee()); - JSObjectRef thisObjRef = toRef(jsCast(exec->thisValue().toThis(exec, NotStrictMode))); + JSObjectRef thisObjRef = toRef(jsCast(exec->hostThisValue().toThis(exec, NotStrictMode))); int argumentCount = static_cast(exec->argumentCount()); Vector arguments; @@ -57,7 +57,7 @@ EncodedJSValue JSC_HOST_CALL APICallbackFunction::call(ExecState* exec) JSValueRef exception = 0; JSValueRef result; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); result = jsCast(toJS(functionRef))->functionCallback()(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &exception); } if (exception) @@ -88,7 +88,7 @@ EncodedJSValue JSC_HOST_CALL APICallbackFunction::construct(ExecState* exec) JSValueRef exception = 0; JSObjectRef result; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); result = callback(ctx, constructorRef, argumentCount, arguments.data(), &exception); } if (exception) { diff --git a/Source/JavaScriptCore/API/APICast.h b/Source/JavaScriptCore/API/APICast.h index 8fe8d6034..6526d8907 100644 --- a/Source/JavaScriptCore/API/APICast.h +++ b/Source/JavaScriptCore/API/APICast.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -124,7 +124,6 @@ inline JSC::VM* toJS(JSContextGroupRef g) inline JSValueRef toRef(JSC::ExecState* exec, JSC::JSValue v) { - ASSERT(exec->vm().currentThreadIsHoldingAPILock()); #if USE(JSVALUE32_64) if (!v) return 0; diff --git a/Source/JavaScriptCore/API/APIShims.h b/Source/JavaScriptCore/API/APIShims.h new file mode 100644 index 000000000..a133b8ed4 --- /dev/null +++ b/Source/JavaScriptCore/API/APIShims.h @@ -0,0 +1,125 @@ +/* + * Copyright (C) 2009 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * 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 + * 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 + * 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. + */ + +#ifndef APIShims_h +#define APIShims_h + +#include "CallFrame.h" +#include "GCActivityCallback.h" +#include "IncrementalSweeper.h" +#include "JSLock.h" +#include + +namespace JSC { + +class APIEntryShimWithoutLock { +protected: + APIEntryShimWithoutLock(VM* vm, bool registerThread) + : m_vm(vm) + , m_entryIdentifierTable(wtfThreadData().setCurrentIdentifierTable(vm->identifierTable)) + { + if (registerThread) + vm->heap.machineThreads().addCurrentThread(); + } + + ~APIEntryShimWithoutLock() + { + wtfThreadData().setCurrentIdentifierTable(m_entryIdentifierTable); + } + +protected: + RefPtr m_vm; + IdentifierTable* m_entryIdentifierTable; +}; + +class APIEntryShim : public APIEntryShimWithoutLock { +public: + // Normal API entry + APIEntryShim(ExecState* exec, bool registerThread = true) + : APIEntryShimWithoutLock(&exec->vm(), registerThread) + , m_lockHolder(exec->vm().exclusiveThread ? 0 : exec) + { + } + + // JSPropertyNameAccumulator only has a vm. + APIEntryShim(VM* vm, bool registerThread = true) + : APIEntryShimWithoutLock(vm, registerThread) + , m_lockHolder(vm->exclusiveThread ? 0 : vm) + { + } + + ~APIEntryShim() + { + // Destroying our JSLockHolder should also destroy the VM. + m_vm.clear(); + } + +private: + JSLockHolder m_lockHolder; +}; + +class APICallbackShim { +public: + APICallbackShim(ExecState* exec) + : m_dropAllLocks(shouldDropAllLocks(exec->vm()) ? exec : nullptr) + , m_vm(&exec->vm()) + { + wtfThreadData().resetCurrentIdentifierTable(); + } + + APICallbackShim(VM& vm) + : m_dropAllLocks(shouldDropAllLocks(vm) ? &vm : nullptr) + , m_vm(&vm) + { + wtfThreadData().resetCurrentIdentifierTable(); + } + + ~APICallbackShim() + { + wtfThreadData().setCurrentIdentifierTable(m_vm->identifierTable); + } + +private: + static bool shouldDropAllLocks(VM& vm) + { + if (vm.exclusiveThread) + return false; + + // If the VM is in the middle of being destroyed then we don't want to resurrect it + // by allowing DropAllLocks to ref it. By this point the APILock has already been + // released anyways, so it doesn't matter that DropAllLocks is a no-op. + if (!vm.refCount()) + return false; + + return true; + } + + JSLock::DropAllLocks m_dropAllLocks; + VM* m_vm; +}; + +} + +#endif diff --git a/Source/JavaScriptCore/API/JSAPIWrapperObject.h b/Source/JavaScriptCore/API/JSAPIWrapperObject.h index 14194b6f9..909039771 100644 --- a/Source/JavaScriptCore/API/JSAPIWrapperObject.h +++ b/Source/JavaScriptCore/API/JSAPIWrapperObject.h @@ -45,6 +45,8 @@ public: void setWrappedObject(void*); protected: + static const unsigned StructureFlags = OverridesVisitChildren | Base::StructureFlags; + JSAPIWrapperObject(VM&, Structure*); private: diff --git a/Source/JavaScriptCore/API/JSBase.cpp b/Source/JavaScriptCore/API/JSBase.cpp index 3c5594b67..506561573 100644 --- a/Source/JavaScriptCore/API/JSBase.cpp +++ b/Source/JavaScriptCore/API/JSBase.cpp @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -28,23 +28,18 @@ #include "JSBasePrivate.h" #include "APICast.h" +#include "APIShims.h" #include "CallFrame.h" #include "Completion.h" -#include "Exception.h" -#include "GCActivityCallback.h" #include "InitializeThreading.h" #include "JSGlobalObject.h" #include "JSLock.h" #include "JSObject.h" #include "OpaqueJSString.h" -#include "JSCInlines.h" +#include "Operations.h" #include "SourceCode.h" #include -#if ENABLE(REMOTE_INSPECTOR) -#include "JSGlobalObjectInspectorController.h" -#endif - using namespace JSC; JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef thisObject, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception) @@ -54,7 +49,7 @@ JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef th return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsThisObject = toJS(thisObject); @@ -62,22 +57,14 @@ JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef th // evaluate sets "this" to the global object if it is NULL JSGlobalObject* globalObject = exec->vmEntryGlobalObject(); - SourceCode source = makeSource(script->string(), sourceURL ? sourceURL->string() : String(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first())); + SourceCode source = makeSource(script->string(), sourceURL->string(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first())); - NakedPtr evaluationException; - JSValue returnValue = evaluate(globalObject->globalExec(), source, jsThisObject, evaluationException); + JSValue evaluationException; + JSValue returnValue = evaluate(globalObject->globalExec(), source, jsThisObject, &evaluationException); if (evaluationException) { if (exception) - *exception = toRef(exec, evaluationException->value()); -#if ENABLE(REMOTE_INSPECTOR) - // FIXME: If we have a debugger attached we could learn about ParseError exceptions through - // ScriptDebugServer::sourceParsed and this path could produce a duplicate warning. The - // Debugger path is currently ignored by inspector. - // NOTE: If we don't have a debugger, this SourceCode will be forever lost to the inspector. - // We could stash it in the inspector in case an inspector is ever opened. - globalObject->inspectorController().reportAPIException(exec, evaluationException); -#endif + *exception = toRef(exec, evaluationException); return 0; } @@ -95,11 +82,11 @@ bool JSCheckScriptSyntax(JSContextRef ctx, JSStringRef script, JSStringRef sourc return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); startingLineNumber = std::max(1, startingLineNumber); - SourceCode source = makeSource(script->string(), sourceURL ? sourceURL->string() : String(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first())); + SourceCode source = makeSource(script->string(), sourceURL->string(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first())); JSValue syntaxException; bool isValidSyntax = checkSyntax(exec->vmEntryGlobalObject()->globalExec(), source, &syntaxException); @@ -107,10 +94,6 @@ bool JSCheckScriptSyntax(JSContextRef ctx, JSStringRef script, JSStringRef sourc if (!isValidSyntax) { if (exception) *exception = toRef(exec, syntaxException); -#if ENABLE(REMOTE_INSPECTOR) - Exception* exception = Exception::create(exec->vm(), syntaxException); - exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exception); -#endif return false; } @@ -128,7 +111,7 @@ void JSGarbageCollect(JSContextRef ctx) return; ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec, false); exec->vm().heap.reportAbandonedObjectGraph(); } @@ -140,13 +123,11 @@ void JSReportExtraMemoryCost(JSContextRef ctx, size_t size) return; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); - - exec->vm().heap.deprecatedReportExtraMemory(size); + APIEntryShim entryShim(exec); + exec->vm().heap.reportExtraMemoryCost(size); } extern "C" JS_EXPORT void JSSynchronousGarbageCollectForDebugging(JSContextRef); -extern "C" JS_EXPORT void JSSynchronousEdenCollectForDebugging(JSContextRef); void JSSynchronousGarbageCollectForDebugging(JSContextRef ctx) { @@ -154,20 +135,10 @@ void JSSynchronousGarbageCollectForDebugging(JSContextRef ctx) return; ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); exec->vm().heap.collectAllGarbage(); } -void JSSynchronousEdenCollectForDebugging(JSContextRef ctx) -{ - if (!ctx) - return; - - ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); - exec->vm().heap.collect(EdenCollection); -} - void JSDisableGCTimer(void) { GCActivityCallback::s_shouldCreateGCTimer = false; diff --git a/Source/JavaScriptCore/API/JSBase.h b/Source/JavaScriptCore/API/JSBase.h index 4c9608828..153d359d4 100644 --- a/Source/JavaScriptCore/API/JSBase.h +++ b/Source/JavaScriptCore/API/JSBase.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -84,6 +84,11 @@ typedef struct OpaqueJSValue* JSObjectRef; #define JS_EXPORT #endif /* defined(JS_NO_EXPORT) */ +/* JS tests uses WTF but has no config.h, so we need to set the export defines here. */ +#ifndef WTF_EXPORT_PRIVATE +#define WTF_EXPORT_PRIVATE JS_EXPORT +#endif + #ifdef __cplusplus extern "C" { #endif @@ -96,7 +101,7 @@ extern "C" { @param ctx The execution context to use. @param script A JSString containing the script to evaluate. @param thisObject The object to use as "this," or NULL to use the global object as "this." -@param sourceURL A JSString containing a URL for the script's source file. This is used by debuggers and when reporting exceptions. Pass NULL if you do not care to include source file information. +@param sourceURL A JSString containing a URL for the script's source file. This is only used when reporting exceptions. Pass NULL if you do not care to include source file information in exceptions. @param startingLineNumber An integer value specifying the script's starting line number in the file located at sourceURL. This is only used when reporting exceptions. The value is one-based, so the first line is line 1 and invalid values are clamped to 1. @param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception. @result The JSValue that results from evaluating script, or NULL if an exception is thrown. @@ -136,7 +141,11 @@ JS_EXPORT void JSGarbageCollect(JSContextRef ctx); /* Enable the Objective-C API for platforms with a modern runtime. */ #if !defined(JSC_OBJC_API_ENABLED) +#ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080 #define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE))) +#else +#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE))) +#endif #endif #endif /* JSBase_h */ diff --git a/Source/JavaScriptCore/API/JSBasePrivate.h b/Source/JavaScriptCore/API/JSBasePrivate.h index 137594972..133176e1c 100644 --- a/Source/JavaScriptCore/API/JSBasePrivate.h +++ b/Source/JavaScriptCore/API/JSBasePrivate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Apple Inc. All rights reserved. + * Copyright (C) 2008 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 diff --git a/Source/JavaScriptCore/API/JSCTestRunnerUtils.cpp b/Source/JavaScriptCore/API/JSCTestRunnerUtils.cpp index 27f822eb3..2e93ac114 100644 --- a/Source/JavaScriptCore/API/JSCTestRunnerUtils.cpp +++ b/Source/JavaScriptCore/API/JSCTestRunnerUtils.cpp @@ -27,7 +27,7 @@ #include "JSCTestRunnerUtils.h" #include "APICast.h" -#include "JSCInlines.h" +#include "Operations.h" #include "TestRunnerUtils.h" namespace JSC { @@ -35,14 +35,12 @@ namespace JSC { JSValueRef numberOfDFGCompiles(JSContextRef context, JSValueRef theFunctionValueRef) { ExecState* exec= toJS(context); - JSLockHolder holder(exec); return toRef(exec, numberOfDFGCompiles(toJS(exec, theFunctionValueRef))); } JSValueRef setNeverInline(JSContextRef context, JSValueRef theFunctionValueRef) { ExecState* exec= toJS(context); - JSLockHolder holder(exec); return toRef(exec, setNeverInline(toJS(exec, theFunctionValueRef))); } diff --git a/Source/JavaScriptCore/API/JSCallbackConstructor.cpp b/Source/JavaScriptCore/API/JSCallbackConstructor.cpp index 65e66dc13..8ea97a447 100644 --- a/Source/JavaScriptCore/API/JSCallbackConstructor.cpp +++ b/Source/JavaScriptCore/API/JSCallbackConstructor.cpp @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -28,16 +28,17 @@ #include "APICallbackFunction.h" #include "APICast.h" +#include "APIShims.h" #include "Error.h" #include "JSGlobalObject.h" #include "JSLock.h" #include "ObjectPrototype.h" -#include "JSCInlines.h" +#include "Operations.h" #include namespace JSC { -const ClassInfo JSCallbackConstructor::s_info = { "CallbackConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSCallbackConstructor) }; +const ClassInfo JSCallbackConstructor::s_info = { "CallbackConstructor", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSCallbackConstructor) }; JSCallbackConstructor::JSCallbackConstructor(JSGlobalObject* globalObject, Structure* structure, JSClassRef jsClass, JSObjectCallAsConstructorCallback callback) : JSDestructibleObject(globalObject->vm(), structure) diff --git a/Source/JavaScriptCore/API/JSCallbackConstructor.h b/Source/JavaScriptCore/API/JSCallbackConstructor.h index f178936e0..7eedb52e4 100644 --- a/Source/JavaScriptCore/API/JSCallbackConstructor.h +++ b/Source/JavaScriptCore/API/JSCallbackConstructor.h @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -34,7 +34,6 @@ namespace JSC { class JSCallbackConstructor : public JSDestructibleObject { public: typedef JSDestructibleObject Base; - static const unsigned StructureFlags = Base::StructureFlags | ImplementsHasInstance; static JSCallbackConstructor* create(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, JSClassRef classRef, JSObjectCallAsConstructorCallback callback) { @@ -57,6 +56,7 @@ public: protected: JSCallbackConstructor(JSGlobalObject*, Structure*, JSClassRef, JSObjectCallAsConstructorCallback); void finishCreation(JSGlobalObject*, JSClassRef); + static const unsigned StructureFlags = ImplementsHasInstance | JSObject::StructureFlags; private: friend struct APICallbackFunction; diff --git a/Source/JavaScriptCore/API/JSCallbackFunction.cpp b/Source/JavaScriptCore/API/JSCallbackFunction.cpp index 047fcd01c..1996991f7 100644 --- a/Source/JavaScriptCore/API/JSCallbackFunction.cpp +++ b/Source/JavaScriptCore/API/JSCallbackFunction.cpp @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -28,6 +28,7 @@ #include "APICallbackFunction.h" #include "APICast.h" +#include "APIShims.h" #include "CodeBlock.h" #include "Error.h" #include "ExceptionHelpers.h" @@ -35,14 +36,14 @@ #include "JSFunction.h" #include "JSGlobalObject.h" #include "JSLock.h" -#include "JSCInlines.h" +#include "Operations.h" #include namespace JSC { STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSCallbackFunction); -const ClassInfo JSCallbackFunction::s_info = { "CallbackFunction", &InternalFunction::s_info, 0, CREATE_METHOD_TABLE(JSCallbackFunction) }; +const ClassInfo JSCallbackFunction::s_info = { "CallbackFunction", &InternalFunction::s_info, 0, 0, CREATE_METHOD_TABLE(JSCallbackFunction) }; JSCallbackFunction::JSCallbackFunction(VM& vm, Structure* structure, JSObjectCallAsFunctionCallback callback) : InternalFunction(vm, structure) diff --git a/Source/JavaScriptCore/API/JSCallbackFunction.h b/Source/JavaScriptCore/API/JSCallbackFunction.h index a4fdd068f..dff18de56 100644 --- a/Source/JavaScriptCore/API/JSCallbackFunction.h +++ b/Source/JavaScriptCore/API/JSCallbackFunction.h @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 diff --git a/Source/JavaScriptCore/API/JSCallbackObject.cpp b/Source/JavaScriptCore/API/JSCallbackObject.cpp index 02b38fde7..94713da36 100644 --- a/Source/JavaScriptCore/API/JSCallbackObject.cpp +++ b/Source/JavaScriptCore/API/JSCallbackObject.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * Copyright (C) 2007 Eric Seidel * * Redistribution and use in source and binary forms, with or without @@ -11,10 +11,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -28,14 +28,14 @@ #include "JSCallbackObject.h" #include "Heap.h" -#include "JSCInlines.h" +#include "Operations.h" #include namespace JSC { // Define the two types of JSCallbackObjects we support. -template <> const ClassInfo JSCallbackObject::s_info = { "CallbackObject", &Base::s_info, 0, CREATE_METHOD_TABLE(JSCallbackObject) }; -template <> const ClassInfo JSCallbackObject::s_info = { "CallbackGlobalObject", &Base::s_info, 0, CREATE_METHOD_TABLE(JSCallbackObject) }; +template <> const ClassInfo JSCallbackObject::s_info = { "CallbackObject", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSCallbackObject) }; +template <> const ClassInfo JSCallbackObject::s_info = { "CallbackGlobalObject", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSCallbackObject) }; template<> const bool JSCallbackObject::needsDestruction = true; template<> const bool JSCallbackObject::needsDestruction = false; @@ -61,4 +61,15 @@ Structure* JSCallbackObject::createStructure(VM& vm, JSGlobalObj return Structure::create(vm, globalObject, proto, TypeInfo(GlobalObjectType, StructureFlags), info()); } +void JSCallbackObjectData::finalize(Handle handle, void* context) +{ + JSClassRef jsClass = static_cast(context); + JSObjectRef thisRef = toRef(static_cast(handle.get().asCell())); + + for (; jsClass; jsClass = jsClass->parentClass) + if (JSObjectFinalizeCallback finalize = jsClass->finalize) + finalize(thisRef); + WeakSet::deallocate(WeakImpl::asWeakImpl(handle.slot())); +} + } // namespace JSC diff --git a/Source/JavaScriptCore/API/JSCallbackObject.h b/Source/JavaScriptCore/API/JSCallbackObject.h index a1a77fd88..3f58906d9 100644 --- a/Source/JavaScriptCore/API/JSCallbackObject.h +++ b/Source/JavaScriptCore/API/JSCallbackObject.h @@ -11,10 +11,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -30,12 +30,11 @@ #include "JSObjectRef.h" #include "JSValueRef.h" #include "JSObject.h" +#include namespace JSC { -struct JSCallbackObjectData { - WTF_MAKE_FAST_ALLOCATED; -public: +struct JSCallbackObjectData : WeakHandleOwner { JSCallbackObjectData(void* privateData, JSClassRef jsClass) : privateData(privateData) , jsClass(jsClass) @@ -43,7 +42,7 @@ public: JSClassRetain(jsClass); } - ~JSCallbackObjectData() + virtual ~JSCallbackObjectData() { JSClassRelease(jsClass); } @@ -58,7 +57,7 @@ public: void setPrivateProperty(VM& vm, JSCell* owner, const Identifier& propertyName, JSValue value) { if (!m_privateProperties) - m_privateProperties = std::make_unique(); + m_privateProperties = adoptPtr(new JSPrivatePropertyMap); m_privateProperties->setPrivateProperty(vm, owner, propertyName, value); } @@ -79,8 +78,6 @@ public: void* privateData; JSClassRef jsClass; struct JSPrivatePropertyMap { - WTF_MAKE_FAST_ALLOCATED; - public: JSValue getPrivateProperty(const Identifier& propertyName) const { PrivatePropertyMap::const_iterator location = m_propertyMap.find(propertyName.impl()); @@ -109,10 +106,11 @@ public: } private: - typedef HashMap, WriteBarrier, IdentifierRepHash> PrivatePropertyMap; + typedef HashMap, WriteBarrier, IdentifierRepHash> PrivatePropertyMap; PrivatePropertyMap m_propertyMap; }; - std::unique_ptr m_privateProperties; + OwnPtr m_privateProperties; + virtual void finalize(Handle, void*) override; }; @@ -127,9 +125,6 @@ protected: public: typedef Parent Base; - static const unsigned StructureFlags = Base::StructureFlags | ProhibitsPropertyCaching | OverridesGetOwnPropertySlot | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | ImplementsHasInstance | OverridesHasInstance | OverridesGetPropertyNames | TypeOfShouldCallGetCallData; - - ~JSCallbackObject(); static JSCallbackObject* create(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, JSClassRef classRef, void* data) { @@ -173,6 +168,9 @@ public: using Parent::methodTable; +protected: + static const unsigned StructureFlags = ProhibitsPropertyCaching | OverridesGetOwnPropertySlot | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | ImplementsHasInstance | OverridesHasInstance | OverridesVisitChildren | OverridesGetPropertyNames | Parent::StructureFlags; + private: static String className(const JSObject*); @@ -198,6 +196,8 @@ private: { JSCallbackObject* thisObject = jsCast(cell); ASSERT_GC_OBJECT_INHERITS((static_cast(thisObject)), JSCallbackObject::info()); + COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag); + ASSERT(thisObject->Parent::structure()->typeInfo().overridesVisitChildren()); Parent::visitChildren(thisObject, visitor); thisObject->m_callbackObjectData->visitChildren(visitor); } @@ -211,10 +211,10 @@ private: static EncodedJSValue JSC_HOST_CALL construct(ExecState*); JSValue getStaticValue(ExecState*, PropertyName); - static EncodedJSValue staticFunctionGetter(ExecState*, JSObject*, EncodedJSValue, PropertyName); - static EncodedJSValue callbackGetter(ExecState*, JSObject*, EncodedJSValue, PropertyName); + static EncodedJSValue staticFunctionGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName); + static EncodedJSValue callbackGetter(ExecState*, EncodedJSValue, EncodedJSValue, PropertyName); - std::unique_ptr m_callbackObjectData; + OwnPtr m_callbackObjectData; }; } // namespace JSC diff --git a/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h b/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h index 585aab194..5be053f1e 100644 --- a/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h +++ b/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h @@ -11,10 +11,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -24,6 +24,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "APIShims.h" #include "APICast.h" #include "Error.h" #include "ExceptionHelpers.h" @@ -58,7 +59,7 @@ inline JSCallbackObject* JSCallbackObject::asCallbackObject(Enco template JSCallbackObject::JSCallbackObject(ExecState* exec, Structure* structure, JSClassRef jsClass, void* data) : Parent(exec->vm(), structure) - , m_callbackObjectData(std::make_unique(data, jsClass)) + , m_callbackObjectData(adoptPtr(new JSCallbackObjectData(data, jsClass))) { } @@ -67,20 +68,10 @@ JSCallbackObject::JSCallbackObject(ExecState* exec, Structure* structure template JSCallbackObject::JSCallbackObject(VM& vm, JSClassRef jsClass, Structure* structure) : Parent(vm, structure) - , m_callbackObjectData(std::make_unique(nullptr, jsClass)) + , m_callbackObjectData(adoptPtr(new JSCallbackObjectData(0, jsClass))) { } -template -JSCallbackObject::~JSCallbackObject() -{ - JSObjectRef thisRef = toRef(static_cast(this)); - for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) { - if (JSObjectFinalizeCallback finalize = jsClass->finalize) - finalize(thisRef); - } -} - template void JSCallbackObject::finishCreation(ExecState* exec) { @@ -113,10 +104,17 @@ void JSCallbackObject::init(ExecState* exec) // initialize from base to derived for (int i = static_cast(initRoutines.size()) - 1; i >= 0; i--) { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); JSObjectInitializeCallback initialize = initRoutines[i]; initialize(toRef(exec), toRef(this)); } + + for (JSClassRef jsClassPtr = classRef(); jsClassPtr; jsClassPtr = jsClassPtr->parentClass) { + if (jsClassPtr->finalize) { + WeakSet::allocate(this, m_callbackObjectData.get(), classRef()); + break; + } + } } template @@ -138,13 +136,13 @@ bool JSCallbackObject::getOwnPropertySlot(JSObject* object, ExecState* e JSObjectRef thisRef = toRef(thisObject); RefPtr propertyNameRef; - if (StringImpl* name = propertyName.uid()) { + if (StringImpl* name = propertyName.publicName()) { for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) { // optional optimization to bypass getProperty in cases when we only need to know if the property exists if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) { if (!propertyNameRef) propertyNameRef = OpaqueJSString::create(name); - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); if (hasProperty(ctx, thisRef, propertyNameRef.get())) { slot.setCustom(thisObject, ReadOnly | DontEnum, callbackGetter); return true; @@ -155,7 +153,7 @@ bool JSCallbackObject::getOwnPropertySlot(JSObject* object, ExecState* e JSValueRef exception = 0; JSValueRef value; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); value = getProperty(ctx, thisRef, propertyNameRef.get(), &exception); } if (exception) { @@ -230,7 +228,7 @@ void JSCallbackObject::put(JSCell* cell, ExecState* exec, PropertyName p RefPtr propertyNameRef; JSValueRef valueRef = toRef(exec, value); - if (StringImpl* name = propertyName.uid()) { + if (StringImpl* name = propertyName.publicName()) { for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) { if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) { if (!propertyNameRef) @@ -238,7 +236,7 @@ void JSCallbackObject::put(JSCell* cell, ExecState* exec, PropertyName p JSValueRef exception = 0; bool result; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception); } if (exception) @@ -255,7 +253,7 @@ void JSCallbackObject::put(JSCell* cell, ExecState* exec, PropertyName p JSValueRef exception = 0; bool result; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); result = setProperty(ctx, thisRef, entry->propertyNameRef.get(), valueRef, &exception); } if (exception) @@ -268,9 +266,6 @@ void JSCallbackObject::put(JSCell* cell, ExecState* exec, PropertyName p if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) { if (StaticFunctionEntry* entry = staticFunctions->get(name)) { - PropertySlot getSlot(thisObject); - if (Parent::getOwnPropertySlot(thisObject, exec, propertyName, getSlot)) - return Parent::put(thisObject, exec, propertyName, value, slot); if (entry->attributes & kJSPropertyAttributeReadOnly) return; thisObject->JSCallbackObject::putDirect(exec->vm(), propertyName, value); // put as override property @@ -300,7 +295,7 @@ void JSCallbackObject::putByIndex(JSCell* cell, ExecState* exec, unsigne JSValueRef exception = 0; bool result; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception); } if (exception) @@ -317,7 +312,7 @@ void JSCallbackObject::putByIndex(JSCell* cell, ExecState* exec, unsigne JSValueRef exception = 0; bool result; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); result = setProperty(ctx, thisRef, entry->propertyNameRef.get(), valueRef, &exception); } if (exception) @@ -348,7 +343,7 @@ bool JSCallbackObject::deleteProperty(JSCell* cell, ExecState* exec, Pro JSObjectRef thisRef = toRef(thisObject); RefPtr propertyNameRef; - if (StringImpl* name = propertyName.uid()) { + if (StringImpl* name = propertyName.publicName()) { for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) { if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) { if (!propertyNameRef) @@ -356,7 +351,7 @@ bool JSCallbackObject::deleteProperty(JSCell* cell, ExecState* exec, Pro JSValueRef exception = 0; bool result; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); result = deleteProperty(ctx, thisRef, propertyNameRef.get(), &exception); } if (exception) @@ -423,7 +418,7 @@ EncodedJSValue JSCallbackObject::construct(ExecState* exec) JSValueRef exception = 0; JSObject* result; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); result = toJS(callAsConstructor(execRef, constructorRef, argumentCount, arguments.data(), &exception)); } if (exception) @@ -449,7 +444,7 @@ bool JSCallbackObject::customHasInstance(JSObject* object, ExecState* ex JSValueRef exception = 0; bool result; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); result = hasInstance(execRef, thisRef, valueRef, &exception); } if (exception) @@ -478,7 +473,7 @@ EncodedJSValue JSCallbackObject::call(ExecState* exec) { JSContextRef execRef = toRef(exec); JSObjectRef functionRef = toRef(exec->callee()); - JSObjectRef thisObjRef = toRef(jsCast(exec->thisValue().toThis(exec, NotStrictMode))); + JSObjectRef thisObjRef = toRef(jsCast(exec->hostThisValue().toThis(exec, NotStrictMode))); for (JSClassRef jsClass = jsCast*>(toJS(functionRef))->classRef(); jsClass; jsClass = jsClass->parentClass) { if (JSObjectCallAsFunctionCallback callAsFunction = jsClass->callAsFunction) { @@ -490,7 +485,7 @@ EncodedJSValue JSCallbackObject::call(ExecState* exec) JSValueRef exception = 0; JSValue result; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); result = toJS(exec, callAsFunction(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &exception)); } if (exception) @@ -512,7 +507,7 @@ void JSCallbackObject::getOwnNonIndexPropertyNames(JSObject* object, Exe for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) { if (JSObjectGetPropertyNamesCallback getPropertyNames = jsClass->getPropertyNames) { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); getPropertyNames(execRef, thisRef, toRef(&propertyNames)); } @@ -522,10 +517,8 @@ void JSCallbackObject::getOwnNonIndexPropertyNames(JSObject* object, Exe for (iterator it = staticValues->begin(); it != end; ++it) { StringImpl* name = it->key.get(); StaticValueEntry* entry = it->value.get(); - if (entry->getProperty && (!(entry->attributes & kJSPropertyAttributeDontEnum) || mode.includeDontEnumProperties())) { - ASSERT(!name->isSymbol()); - propertyNames.add(Identifier::fromString(exec, String(name))); - } + if (entry->getProperty && (!(entry->attributes & kJSPropertyAttributeDontEnum) || (mode == IncludeDontEnumProperties))) + propertyNames.add(Identifier(exec, name)); } } @@ -535,10 +528,8 @@ void JSCallbackObject::getOwnNonIndexPropertyNames(JSObject* object, Exe for (iterator it = staticFunctions->begin(); it != end; ++it) { StringImpl* name = it->key.get(); StaticFunctionEntry* entry = it->value.get(); - if (!(entry->attributes & kJSPropertyAttributeDontEnum) || mode.includeDontEnumProperties()) { - ASSERT(!name->isSymbol()); - propertyNames.add(Identifier::fromString(exec, String(name))); - } + if (!(entry->attributes & kJSPropertyAttributeDontEnum) || (mode == IncludeDontEnumProperties)) + propertyNames.add(Identifier(exec, name)); } } } @@ -573,7 +564,7 @@ JSValue JSCallbackObject::getStaticValue(ExecState* exec, PropertyName p { JSObjectRef thisRef = toRef(this); - if (StringImpl* name = propertyName.uid()) { + if (StringImpl* name = propertyName.publicName()) { for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) { if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) { if (StaticValueEntry* entry = staticValues->get(name)) { @@ -581,7 +572,7 @@ JSValue JSCallbackObject::getStaticValue(ExecState* exec, PropertyName p JSValueRef exception = 0; JSValueRef value; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); value = getProperty(toRef(exec), thisRef, entry->propertyNameRef.get(), &exception); } if (exception) { @@ -600,7 +591,7 @@ JSValue JSCallbackObject::getStaticValue(ExecState* exec, PropertyName p } template -EncodedJSValue JSCallbackObject::staticFunctionGetter(ExecState* exec, JSObject* slotParent, EncodedJSValue, PropertyName propertyName) +EncodedJSValue JSCallbackObject::staticFunctionGetter(ExecState* exec, EncodedJSValue slotParent, EncodedJSValue, PropertyName propertyName) { JSCallbackObject* thisObj = asCallbackObject(slotParent); @@ -609,7 +600,7 @@ EncodedJSValue JSCallbackObject::staticFunctionGetter(ExecState* exec, J if (Parent::getOwnPropertySlot(thisObj, exec, propertyName, slot2)) return JSValue::encode(slot2.getValue(exec, propertyName)); - if (StringImpl* name = propertyName.uid()) { + if (StringImpl* name = propertyName.publicName()) { for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) { if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) { if (StaticFunctionEntry* entry = staticFunctions->get(name)) { @@ -628,14 +619,14 @@ EncodedJSValue JSCallbackObject::staticFunctionGetter(ExecState* exec, J } template -EncodedJSValue JSCallbackObject::callbackGetter(ExecState* exec, JSObject* slotParent, EncodedJSValue, PropertyName propertyName) +EncodedJSValue JSCallbackObject::callbackGetter(ExecState* exec, EncodedJSValue slotParent, EncodedJSValue, PropertyName propertyName) { JSCallbackObject* thisObj = asCallbackObject(slotParent); JSObjectRef thisRef = toRef(thisObj); RefPtr propertyNameRef; - if (StringImpl* name = propertyName.uid()) { + if (StringImpl* name = propertyName.publicName()) { for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) { if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) { if (!propertyNameRef) @@ -643,7 +634,7 @@ EncodedJSValue JSCallbackObject::callbackGetter(ExecState* exec, JSObjec JSValueRef exception = 0; JSValueRef value; { - JSLock::DropAllLocks dropAllLocks(exec); + APICallbackShim callbackShim(exec); value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), &exception); } if (exception) { diff --git a/Source/JavaScriptCore/API/JSClassRef.cpp b/Source/JavaScriptCore/API/JSClassRef.cpp index e0dbe6043..544c359b1 100644 --- a/Source/JavaScriptCore/API/JSClassRef.cpp +++ b/Source/JavaScriptCore/API/JSClassRef.cpp @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -33,7 +33,7 @@ #include "JSGlobalObject.h" #include "JSObjectRef.h" #include "ObjectPrototype.h" -#include "JSCInlines.h" +#include "Operations.h" #include #include @@ -62,7 +62,7 @@ OpaqueJSClass::OpaqueJSClass(const JSClassDefinition* definition, OpaqueJSClass* initializeThreading(); if (const JSStaticValue* staticValue = definition->staticValues) { - m_staticValues = std::make_unique(); + m_staticValues = adoptPtr(new OpaqueJSClassStaticValuesTable); while (staticValue->name) { String valueName = String::fromUTF8(staticValue->name); if (!valueName.isNull()) @@ -72,7 +72,7 @@ OpaqueJSClass::OpaqueJSClass(const JSClassDefinition* definition, OpaqueJSClass* } if (const JSStaticFunction* staticFunction = definition->staticFunctions) { - m_staticFunctions = std::make_unique(); + m_staticFunctions = adoptPtr(new OpaqueJSClassStaticFunctionsTable); while (staticFunction->name) { String functionName = String::fromUTF8(staticFunction->name); if (!functionName.isNull()) @@ -88,19 +88,19 @@ OpaqueJSClass::OpaqueJSClass(const JSClassDefinition* definition, OpaqueJSClass* OpaqueJSClass::~OpaqueJSClass() { // The empty string is shared across threads & is an identifier, in all other cases we should have done a deep copy in className(), below. - ASSERT(!m_className.length() || !m_className.impl()->isAtomic()); + ASSERT(!m_className.length() || !m_className.impl()->isIdentifier()); #ifndef NDEBUG if (m_staticValues) { OpaqueJSClassStaticValuesTable::const_iterator end = m_staticValues->end(); for (OpaqueJSClassStaticValuesTable::const_iterator it = m_staticValues->begin(); it != end; ++it) - ASSERT(!it->key->isAtomic()); + ASSERT(!it->key->isIdentifier()); } if (m_staticFunctions) { OpaqueJSClassStaticFunctionsTable::const_iterator end = m_staticFunctions->end(); for (OpaqueJSClassStaticFunctionsTable::const_iterator it = m_staticFunctions->begin(); it != end; ++it) - ASSERT(!it->key->isAtomic()); + ASSERT(!it->key->isIdentifier()); } #endif @@ -108,12 +108,12 @@ OpaqueJSClass::~OpaqueJSClass() JSClassRelease(prototypeClass); } -Ref OpaqueJSClass::createNoAutomaticPrototype(const JSClassDefinition* definition) +PassRefPtr OpaqueJSClass::createNoAutomaticPrototype(const JSClassDefinition* definition) { - return adoptRef(*new OpaqueJSClass(definition, 0)); + return adoptRef(new OpaqueJSClass(definition, 0)); } -Ref OpaqueJSClass::create(const JSClassDefinition* clientDefinition) +PassRefPtr OpaqueJSClass::create(const JSClassDefinition* clientDefinition) { JSClassDefinition definition = *clientDefinition; // Avoid modifying client copy. @@ -124,7 +124,7 @@ Ref OpaqueJSClass::create(const JSClassDefinition* clientDefiniti // We are supposed to use JSClassRetain/Release but since we know that we currently have // the only reference to this class object we cheat and use a RefPtr instead. RefPtr protoClass = adoptRef(new OpaqueJSClass(&protoDefinition, 0)); - return adoptRef(*new OpaqueJSClass(&definition, protoClass.get())); + return adoptRef(new OpaqueJSClass(&definition, protoClass.get())); } OpaqueJSClassContextData::OpaqueJSClassContextData(JSC::VM&, OpaqueJSClass* jsClass) @@ -134,7 +134,7 @@ OpaqueJSClassContextData::OpaqueJSClassContextData(JSC::VM&, OpaqueJSClass* jsCl staticValues = std::make_unique(); OpaqueJSClassStaticValuesTable::const_iterator end = jsClass->m_staticValues->end(); for (OpaqueJSClassStaticValuesTable::const_iterator it = jsClass->m_staticValues->begin(); it != end; ++it) { - ASSERT(!it->key->isAtomic()); + ASSERT(!it->key->isIdentifier()); String valueName = it->key->isolatedCopy(); staticValues->add(valueName.impl(), std::make_unique(it->value->getProperty, it->value->setProperty, it->value->attributes, valueName)); } @@ -144,7 +144,7 @@ OpaqueJSClassContextData::OpaqueJSClassContextData(JSC::VM&, OpaqueJSClass* jsCl staticFunctions = std::make_unique(); OpaqueJSClassStaticFunctionsTable::const_iterator end = jsClass->m_staticFunctions->end(); for (OpaqueJSClassStaticFunctionsTable::const_iterator it = jsClass->m_staticFunctions->begin(); it != end; ++it) { - ASSERT(!it->key->isAtomic()); + ASSERT(!it->key->isIdentifier()); staticFunctions->add(it->key->isolatedCopy(), std::make_unique(it->value->callAsFunction, it->value->attributes)); } } @@ -160,7 +160,7 @@ OpaqueJSClassContextData& OpaqueJSClass::contextData(ExecState* exec) String OpaqueJSClass::className() { - // Make a deep copy, so that the caller has no chance to put the original into AtomicStringTable. + // Make a deep copy, so that the caller has no chance to put the original into IdentifierTable. return m_className.isolatedCopy(); } diff --git a/Source/JavaScriptCore/API/JSClassRef.h b/Source/JavaScriptCore/API/JSClassRef.h index fa024d344..f979f3b2c 100644 --- a/Source/JavaScriptCore/API/JSClassRef.h +++ b/Source/JavaScriptCore/API/JSClassRef.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -85,8 +85,8 @@ public: }; struct OpaqueJSClass : public ThreadSafeRefCounted { - static Ref create(const JSClassDefinition*); - static Ref createNoAutomaticPrototype(const JSClassDefinition*); + static PassRefPtr create(const JSClassDefinition*); + static PassRefPtr createNoAutomaticPrototype(const JSClassDefinition*); JS_EXPORT_PRIVATE ~OpaqueJSClass(); String className(); @@ -118,10 +118,10 @@ private: OpaqueJSClassContextData& contextData(JSC::ExecState*); - // Strings in these data members should not be put into any AtomicStringTable. + // Strings in these data members should not be put into any IdentifierTable. String m_className; - std::unique_ptr m_staticValues; - std::unique_ptr m_staticFunctions; + OwnPtr m_staticValues; + OwnPtr m_staticFunctions; }; #endif // JSClassRef_h diff --git a/Source/JavaScriptCore/API/JSContext.h b/Source/JavaScriptCore/API/JSContext.h deleted file mode 100644 index 7095f91bb..000000000 --- a/Source/JavaScriptCore/API/JSContext.h +++ /dev/null @@ -1,250 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSContext_h -#define JSContext_h - -#include -#include - -#if JSC_OBJC_API_ENABLED - -@class JSVirtualMachine, JSValue; - -/*! -@interface -@discussion An instance of JSContext represents a JavaScript execution environment. All - JavaScript execution takes place within a context. - JSContext is also used to manage the life-cycle of objects within the - JavaScript virtual machine. Every instance of JSValue is associated with a - JSContext via a strong reference. The JSValue will keep the JSContext it - references alive so long as the JSValue remains alive. When all of the JSValues - that reference a particular JSContext have been deallocated the JSContext - will be deallocated unless it has been previously retained. -*/ -NS_CLASS_AVAILABLE(10_9, 7_0) -@interface JSContext : NSObject - -/*! -@methodgroup Creating New JSContexts -*/ -/*! -@method -@abstract Create a JSContext. -@result The new context. -*/ -- (instancetype)init; - -/*! -@method -@abstract Create a JSContext in the specified virtual machine. -@param virtualMachine The JSVirtualMachine in which the context will be created. -@result The new context. -*/ -- (instancetype)initWithVirtualMachine:(JSVirtualMachine *)virtualMachine; - -/*! -@methodgroup Evaluating Scripts -*/ -/*! -@method -@abstract Evaluate a string of JavaScript code. -@param script A string containing the JavaScript code to evaluate. -@result The last value generated by the script. -*/ -- (JSValue *)evaluateScript:(NSString *)script; - -/*! -@method -@abstract Evaluate a string of JavaScript code, with a URL for the script's source file. -@param script A string containing the JavaScript code to evaluate. -@param sourceURL A URL for the script's source file. Used by debuggers and when reporting exceptions. This parameter is informative only: it does not change the behavior of the script. -@result The last value generated by the script. -*/ -- (JSValue *)evaluateScript:(NSString *)script withSourceURL:(NSURL *)sourceURL NS_AVAILABLE(10_10, 8_0); - -/*! -@methodgroup Callback Accessors -*/ -/*! -@method -@abstract Get the JSContext that is currently executing. -@discussion This method may be called from within an Objective-C block or method invoked - as a callback from JavaScript to retrieve the callback's context. Outside of - a callback from JavaScript this method will return nil. -@result The currently executing JSContext or nil if there isn't one. -*/ -+ (JSContext *)currentContext; - -/*! -@method -@abstract Get the JavaScript function that is currently executing. -@discussion This method may be called from within an Objective-C block or method invoked - as a callback from JavaScript to retrieve the callback's context. Outside of - a callback from JavaScript this method will return nil. -@result The currently executing JavaScript function or nil if there isn't one. -*/ -+ (JSValue *)currentCallee NS_AVAILABLE(10_10, 8_0); - -/*! -@method -@abstract Get the this value of the currently executing method. -@discussion This method may be called from within an Objective-C block or method invoked - as a callback from JavaScript to retrieve the callback's this value. Outside - of a callback from JavaScript this method will return nil. -@result The current this value or nil if there isn't one. -*/ -+ (JSValue *)currentThis; - -/*! -@method -@abstract Get the arguments to the current callback. -@discussion This method may be called from within an Objective-C block or method invoked - as a callback from JavaScript to retrieve the callback's arguments, objects - in the returned array are instances of JSValue. Outside of a callback from - JavaScript this method will return nil. -@result An NSArray of the arguments nil if there is no current callback. -*/ -+ (NSArray *)currentArguments; - -/*! -@methodgroup Global Properties -*/ -/*! -@property -@abstract Get the global object of the context. -@discussion This method retrieves the global object of the JavaScript execution context. - Instances of JSContext originating from WebKit will return a reference to the - WindowProxy object. -@result The global object. -*/ -@property (readonly, strong) JSValue *globalObject; - -/*! -@property -@discussion The exception property may be used to throw an exception to JavaScript. - - Before a callback is made from JavaScript to an Objective-C block or method, - the prior value of the exception property will be preserved and the property - will be set to nil. After the callback has completed the new value of the - exception property will be read, and prior value restored. If the new value - of exception is not nil, the callback will result in that value being thrown. - - This property may also be used to check for uncaught exceptions arising from - API function calls (since the default behaviour of exceptionHandler is to - assign an uncaught exception to this property). - - If a JSValue originating from a different JSVirtualMachine than this context - is assigned to this property, an Objective-C exception will be raised. -*/ -@property (strong) JSValue *exception; - -/*! -@property -@discussion If a call to an API function results in an uncaught JavaScript exception, the - exceptionHandler block will be invoked. The default implementation for the - exception handler will store the exception to the exception property on - context. As a consequence the default behaviour is for unhandled exceptions - occurring within a callback from JavaScript to be rethrown upon return. - Setting this value to nil will result in all uncaught exceptions thrown from - the API being silently consumed. -*/ -@property (copy) void(^exceptionHandler)(JSContext *context, JSValue *exception); - -/*! -@property -@discussion All instances of JSContext are associated with a single JSVirtualMachine. The - virtual machine provides an "object space" or set of execution resources. -*/ -@property (readonly, strong) JSVirtualMachine *virtualMachine; - -/*! -@property -@discussion Name of the JSContext. Exposed when remote debugging the context. -*/ -@property (copy) NSString *name NS_AVAILABLE(10_10, 8_0); - -@end - -/*! -@category -@discussion Instances of JSContext implement the following methods in order to enable - support for subscript access by key and index, for example: - -@textblock - JSContext *context; - JSValue *v = context[@"X"]; // Get value for "X" from the global object. - context[@"Y"] = v; // Assign 'v' to "Y" on the global object. -@/textblock - - An object key passed as a subscript will be converted to a JavaScript value, - and then the value converted to a string used to resolve a property of the - global object. -*/ -@interface JSContext (SubscriptSupport) - -/*! -method -@abstract Get a particular property on the global object. -@param key -@result The JSValue for the global object's property. -*/ -- (JSValue *)objectForKeyedSubscript:(id)key; - -/*! -method -@abstract Set a particular property on the global object. -@param object -@param key -*/ -- (void)setObject:(id)object forKeyedSubscript:(NSObject *)key; - -@end - -/*! -@category -@discussion These functions are for bridging between the C API and the Objective-C API. -*/ -@interface JSContext (JSContextRefSupport) - -/*! -@method -@abstract Create a JSContext, wrapping its C API counterpart. -@param jsGlobalContextRef -@result The JSContext equivalent of the provided JSGlobalContextRef. -*/ -+ (JSContext *)contextWithJSGlobalContextRef:(JSGlobalContextRef)jsGlobalContextRef; - -/*! -@property -@abstract Get the C API counterpart wrapped by a JSContext. -@result The C API equivalent of this JSContext. -*/ -@property (readonly) JSGlobalContextRef JSGlobalContextRef; -@end - -#endif - -#endif // JSContext_h diff --git a/Source/JavaScriptCore/API/JSContextInternal.h b/Source/JavaScriptCore/API/JSContextInternal.h deleted file mode 100644 index 5308fbb92..000000000 --- a/Source/JavaScriptCore/API/JSContextInternal.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSContextInternal_h -#define JSContextInternal_h - -#import - -#if JSC_OBJC_API_ENABLED - -#import - -struct CallbackData { - CallbackData *next; - JSContext *context; - JSValue *preservedException; - JSValueRef calleeValue; - JSValueRef thisValue; - size_t argumentCount; - const JSValueRef *arguments; - NSArray *currentArguments; -}; - -class WeakContextRef { -public: - WeakContextRef(JSContext * = nil); - ~WeakContextRef(); - - JSContext * get(); - void set(JSContext *); - -private: - JSContext *m_weakContext; -}; - -@class JSWrapperMap; - -@interface JSContext(Internal) - -- (id)initWithGlobalContextRef:(JSGlobalContextRef)context; - -- (void)notifyException:(JSValueRef)exception; -- (JSValue *)valueFromNotifyException:(JSValueRef)exception; -- (BOOL)boolFromNotifyException:(JSValueRef)exception; - -- (void)beginCallbackWithData:(CallbackData *)callbackData calleeValue:(JSValueRef)calleeValue thisValue:(JSValueRef)thisValue argumentCount:(size_t)argumentCount arguments:(const JSValueRef *)arguments; -- (void)endCallbackWithData:(CallbackData *)callbackData; - -- (JSValue *)wrapperForObjCObject:(id)object; -- (JSValue *)wrapperForJSObject:(JSValueRef)value; - -@property (readonly, retain) JSWrapperMap *wrapperMap; - -@end - -#endif - -#endif // JSContextInternal_h diff --git a/Source/JavaScriptCore/API/JSContextPrivate.h b/Source/JavaScriptCore/API/JSContextPrivate.h deleted file mode 100644 index 7d1d0cbdb..000000000 --- a/Source/JavaScriptCore/API/JSContextPrivate.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2014 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSContextPrivate_h -#define JSContextPrivate_h - -#if JSC_OBJC_API_ENABLED - -#import - -@interface JSContext(Private) - -/*! -@property -@discussion Remote inspection setting of the JSContext. Default value is YES. -*/ -@property (setter=_setRemoteInspectionEnabled:) BOOL _remoteInspectionEnabled NS_AVAILABLE(10_10, 8_0); - -/*! -@property -@discussion Set whether or not the native call stack is included when reporting exceptions. Default value is YES. -*/ -@property (setter=_setIncludesNativeCallStackWhenReportingExceptions:) BOOL _includesNativeCallStackWhenReportingExceptions NS_AVAILABLE(10_10, 8_0); - -/*! -@property -@discussion Set the run loop the Web Inspector debugger should use when evaluating JavaScript in the JSContext. -*/ -@property (setter=_setDebuggerRunLoop:) CFRunLoopRef _debuggerRunLoop NS_AVAILABLE(10_10, 8_0); - -@end - -#endif - -#endif // JSContextInternal_h diff --git a/Source/JavaScriptCore/API/JSContextRef.cpp b/Source/JavaScriptCore/API/JSContextRef.cpp index 886754a03..81b61cf47 100644 --- a/Source/JavaScriptCore/API/JSContextRef.cpp +++ b/Source/JavaScriptCore/API/JSContextRef.cpp @@ -10,47 +10,37 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 - * 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 "JSContextRef.h" -#include "JSContextRefInternal.h" +#include "JSContextRefPrivate.h" #include "APICast.h" #include "CallFrame.h" +#include "CallFrameInlines.h" #include "InitializeThreading.h" #include "JSCallbackObject.h" #include "JSClassRef.h" #include "JSGlobalObject.h" #include "JSObject.h" -#include "JSCInlines.h" +#include "Operations.h" #include "SourceProvider.h" #include "StackVisitor.h" -#include "Watchdog.h" #include #include -#if ENABLE(REMOTE_INSPECTOR) -#include "JSGlobalObjectDebuggable.h" -#include "JSGlobalObjectInspectorController.h" -#include "JSRemoteInspector.h" -#endif - -#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS) -#include "JSContextRefInspectorSupport.h" -#endif - #if OS(DARWIN) #include @@ -67,7 +57,7 @@ using namespace JSC; JSContextGroupRef JSContextGroupCreate() { initializeThreading(); - return toRef(&VM::createContextGroup().leakRef()); + return toRef(VM::createContextGroup().leakRef()); } JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) @@ -78,10 +68,16 @@ JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) void JSContextGroupRelease(JSContextGroupRef group) { + IdentifierTable* savedIdentifierTable; VM& vm = *toJS(group); - JSLockHolder locker(&vm); - vm.deref(); + { + JSLockHolder lock(vm); + savedIdentifierTable = wtfThreadData().setCurrentIdentifierTable(vm.identifierTable); + vm.deref(); + } + + wtfThreadData().setCurrentIdentifierTable(savedIdentifierTable); } static bool internalScriptTimeoutCallback(ExecState* exec, void* callbackPtr, void* callbackData) @@ -95,21 +91,21 @@ static bool internalScriptTimeoutCallback(ExecState* exec, void* callbackPtr, vo void JSContextGroupSetExecutionTimeLimit(JSContextGroupRef group, double limit, JSShouldTerminateCallback callback, void* callbackData) { VM& vm = *toJS(group); - JSLockHolder locker(&vm); - Watchdog& watchdog = vm.ensureWatchdog(); + APIEntryShim entryShim(&vm); + Watchdog& watchdog = vm.watchdog; if (callback) { void* callbackPtr = reinterpret_cast(callback); - watchdog.setTimeLimit(std::chrono::duration_cast(std::chrono::duration(limit)), internalScriptTimeoutCallback, callbackPtr, callbackData); + watchdog.setTimeLimit(vm, limit, internalScriptTimeoutCallback, callbackPtr, callbackData); } else - watchdog.setTimeLimit(std::chrono::duration_cast(std::chrono::duration(limit))); + watchdog.setTimeLimit(vm, limit); } void JSContextGroupClearExecutionTimeLimit(JSContextGroupRef group) { VM& vm = *toJS(group); - JSLockHolder locker(&vm); - if (vm.watchdog) - vm.watchdog->setTimeLimit(Watchdog::noTimeLimit); + APIEntryShim entryShim(&vm); + Watchdog& watchdog = vm.watchdog; + watchdog.setTimeLimit(vm, std::numeric_limits::infinity()); } // From the API's perspective, a global context remains alive iff it has been JSGlobalContextRetained. @@ -135,14 +131,12 @@ JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClass RefPtr vm = group ? PassRefPtr(toJS(group)) : VM::createContextGroup(); - JSLockHolder locker(vm.get()); + APIEntryShim entryShim(vm.get(), false); + vm->makeUsableFromMultipleThreads(); if (!globalObjectClass) { JSGlobalObject* globalObject = JSGlobalObject::create(*vm, JSGlobalObject::createStructure(*vm, jsNull())); -#if ENABLE(REMOTE_INSPECTOR) - if (JSRemoteInspectorGetInspectionEnabledByDefault()) - globalObject->setRemoteDebuggingEnabled(true); -#endif + globalObject->setGlobalThis(*vm, JSProxy::create(*vm, JSProxy::createStructure(*vm, globalObject, globalObject->prototype()), globalObject)); return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec())); } @@ -152,17 +146,13 @@ JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClass if (!prototype) prototype = jsNull(); globalObject->resetPrototype(*vm, prototype); -#if ENABLE(REMOTE_INSPECTOR) - if (JSRemoteInspectorGetInspectionEnabledByDefault()) - globalObject->setRemoteDebuggingEnabled(true); -#endif return JSGlobalContextRetain(toGlobalRef(exec)); } JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx) { ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); VM& vm = exec->vm(); gcProtect(exec->vmEntryGlobalObject()); @@ -172,14 +162,21 @@ JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx) void JSGlobalContextRelease(JSGlobalContextRef ctx) { + IdentifierTable* savedIdentifierTable; ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + { + JSLockHolder lock(exec); - VM& vm = exec->vm(); - bool protectCountIsZero = Heap::heap(exec->vmEntryGlobalObject())->unprotect(exec->vmEntryGlobalObject()); - if (protectCountIsZero) - vm.heap.reportAbandonedObjectGraph(); - vm.deref(); + VM& vm = exec->vm(); + savedIdentifierTable = wtfThreadData().setCurrentIdentifierTable(vm.identifierTable); + + bool protectCountIsZero = Heap::heap(exec->vmEntryGlobalObject())->unprotect(exec->vmEntryGlobalObject()); + if (protectCountIsZero) + vm.heap.reportAbandonedObjectGraph(); + vm.deref(); + } + + wtfThreadData().setCurrentIdentifierTable(savedIdentifierTable); } JSObjectRef JSContextGetGlobalObject(JSContextRef ctx) @@ -189,7 +186,7 @@ JSObjectRef JSContextGetGlobalObject(JSContextRef ctx) return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); return toRef(jsCast(exec->lexicalGlobalObject()->methodTable()->toThis(exec->lexicalGlobalObject(), exec, NotStrictMode))); } @@ -211,7 +208,7 @@ JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx) return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); return toGlobalRef(exec->lexicalGlobalObject()->globalExec()); } @@ -224,7 +221,7 @@ JSStringRef JSGlobalContextCopyName(JSGlobalContextRef ctx) } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); String name = exec->vmEntryGlobalObject()->name(); if (name.isNull()) @@ -241,7 +238,7 @@ void JSGlobalContextSetName(JSGlobalContextRef ctx, JSStringRef name) } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); exec->vmEntryGlobalObject()->setName(name ? name->string() : String()); } @@ -313,119 +310,4 @@ JSStringRef JSContextCreateBacktrace(JSContextRef ctx, unsigned maxStackSize) return OpaqueJSString::create(builder.toString()).leakRef(); } -bool JSGlobalContextGetRemoteInspectionEnabled(JSGlobalContextRef ctx) -{ - if (!ctx) { - ASSERT_NOT_REACHED(); - return false; - } - - ExecState* exec = toJS(ctx); - JSLockHolder lock(exec); - - return exec->vmEntryGlobalObject()->remoteDebuggingEnabled(); -} - -void JSGlobalContextSetRemoteInspectionEnabled(JSGlobalContextRef ctx, bool enabled) -{ - if (!ctx) { - ASSERT_NOT_REACHED(); - return; - } - - ExecState* exec = toJS(ctx); - JSLockHolder lock(exec); - - exec->vmEntryGlobalObject()->setRemoteDebuggingEnabled(enabled); -} - -bool JSGlobalContextGetIncludesNativeCallStackWhenReportingExceptions(JSGlobalContextRef ctx) -{ -#if ENABLE(REMOTE_INSPECTOR) - if (!ctx) { - ASSERT_NOT_REACHED(); - return false; - } - - ExecState* exec = toJS(ctx); - JSLockHolder lock(exec); - - JSGlobalObject* globalObject = exec->vmEntryGlobalObject(); - return globalObject->inspectorController().includesNativeCallStackWhenReportingExceptions(); -#else - UNUSED_PARAM(ctx); - return false; -#endif -} - -void JSGlobalContextSetIncludesNativeCallStackWhenReportingExceptions(JSGlobalContextRef ctx, bool includesNativeCallStack) -{ -#if ENABLE(REMOTE_INSPECTOR) - if (!ctx) { - ASSERT_NOT_REACHED(); - return; - } - - ExecState* exec = toJS(ctx); - JSLockHolder lock(exec); - - JSGlobalObject* globalObject = exec->vmEntryGlobalObject(); - globalObject->inspectorController().setIncludesNativeCallStackWhenReportingExceptions(includesNativeCallStack); -#else - UNUSED_PARAM(ctx); - UNUSED_PARAM(includesNativeCallStack); -#endif -} - -#if USE(CF) -CFRunLoopRef JSGlobalContextGetDebuggerRunLoop(JSGlobalContextRef ctx) -{ -#if ENABLE(REMOTE_INSPECTOR) - if (!ctx) { - ASSERT_NOT_REACHED(); - return nullptr; - } - - ExecState* exec = toJS(ctx); - JSLockHolder lock(exec); - - return exec->vmEntryGlobalObject()->inspectorDebuggable().debuggerRunLoop(); -#else - UNUSED_PARAM(ctx); - return nullptr; -#endif -} -void JSGlobalContextSetDebuggerRunLoop(JSGlobalContextRef ctx, CFRunLoopRef runLoop) -{ -#if ENABLE(REMOTE_INSPECTOR) - if (!ctx) { - ASSERT_NOT_REACHED(); - return; - } - - ExecState* exec = toJS(ctx); - JSLockHolder lock(exec); - - exec->vmEntryGlobalObject()->inspectorDebuggable().setDebuggerRunLoop(runLoop); -#else - UNUSED_PARAM(ctx); - UNUSED_PARAM(runLoop); -#endif -} -#endif // USE(CF) - -#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS) -Inspector::AugmentableInspectorController* JSGlobalContextGetAugmentableInspectorController(JSGlobalContextRef ctx) -{ - if (!ctx) { - ASSERT_NOT_REACHED(); - return nullptr; - } - - ExecState* exec = toJS(ctx); - JSLockHolder lock(exec); - - return &exec->vmEntryGlobalObject()->inspectorController(); -} -#endif diff --git a/Source/JavaScriptCore/API/JSContextRef.h b/Source/JavaScriptCore/API/JSContextRef.h index 0c800bced..c8db1e56d 100644 --- a/Source/JavaScriptCore/API/JSContextRef.h +++ b/Source/JavaScriptCore/API/JSContextRef.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -48,7 +48,7 @@ extern "C" { synchronization is required. @result The created JSContextGroup. */ -JS_EXPORT JSContextGroupRef JSContextGroupCreate(void) CF_AVAILABLE(10_6, 7_0); +JS_EXPORT JSContextGroupRef JSContextGroupCreate() CF_AVAILABLE(10_6, 7_0); /*! @function @@ -141,7 +141,7 @@ JS_EXPORT JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx) CF_AVAI @discussion A JSGlobalContext's name is exposed for remote debugging to make it easier to identify the context you would like to attach to. */ -JS_EXPORT JSStringRef JSGlobalContextCopyName(JSGlobalContextRef ctx) CF_AVAILABLE(10_10, 8_0); +JS_EXPORT JSStringRef JSGlobalContextCopyName(JSGlobalContextRef ctx); /*! @function @@ -149,7 +149,7 @@ JS_EXPORT JSStringRef JSGlobalContextCopyName(JSGlobalContextRef ctx) CF_AVAILAB @param ctx The JSGlobalContext that you want to name. @param name The remote debugging name to set on ctx. */ -JS_EXPORT void JSGlobalContextSetName(JSGlobalContextRef ctx, JSStringRef name) CF_AVAILABLE(10_10, 8_0); +JS_EXPORT void JSGlobalContextSetName(JSGlobalContextRef ctx, JSStringRef name); #ifdef __cplusplus } diff --git a/Source/JavaScriptCore/API/JSContextRefInspectorSupport.h b/Source/JavaScriptCore/API/JSContextRefInspectorSupport.h deleted file mode 100644 index a09d828bd..000000000 --- a/Source/JavaScriptCore/API/JSContextRefInspectorSupport.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2014 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSContextRefInspectorSupport_h -#define JSContextRefInspectorSupport_h - -#ifndef __cplusplus -#error Requires C++ Support. -#endif - -#include - -namespace Inspector { -class AugmentableInspectorController; -} - -extern "C" { -JS_EXPORT Inspector::AugmentableInspectorController* JSGlobalContextGetAugmentableInspectorController(JSGlobalContextRef); -} - -#endif // JSContextRefInspectorSupport_h diff --git a/Source/JavaScriptCore/API/JSContextRefInternal.h b/Source/JavaScriptCore/API/JSContextRefInternal.h deleted file mode 100644 index 85632b8c7..000000000 --- a/Source/JavaScriptCore/API/JSContextRefInternal.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2014 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSContextRefInternal_h -#define JSContextRefInternal_h - -#include "JSContextRefPrivate.h" - -#if USE(CF) -#include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#if USE(CF) -/*! -@function -@abstract Gets the run loop used by the Web Inspector debugger when evaluating JavaScript in this context. -@param ctx The JSGlobalContext whose setting you want to get. -*/ -JS_EXPORT CFRunLoopRef JSGlobalContextGetDebuggerRunLoop(JSGlobalContextRef ctx) CF_AVAILABLE(10_10, 8_0); - -/*! -@function -@abstract Sets the run loop used by the Web Inspector debugger when evaluating JavaScript in this context. -@param ctx The JSGlobalContext that you want to change. -@param runLoop The new value of the setting for the context. -*/ -JS_EXPORT void JSGlobalContextSetDebuggerRunLoop(JSGlobalContextRef ctx, CFRunLoopRef) CF_AVAILABLE(10_10, 8_0); -#endif - -#ifdef __cplusplus -} -#endif - -#endif // JSContextRefInternal_h diff --git a/Source/JavaScriptCore/API/JSContextRefPrivate.h b/Source/JavaScriptCore/API/JSContextRefPrivate.h index 5a5bebd42..780a60306 100644 --- a/Source/JavaScriptCore/API/JSContextRefPrivate.h +++ b/Source/JavaScriptCore/API/JSContextRefPrivate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Apple Inc. All rights reserved. + * Copyright (C) 2009 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,17 +10,17 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef JSContextRefPrivate_h @@ -94,40 +94,6 @@ JS_EXPORT void JSContextGroupSetExecutionTimeLimit(JSContextGroupRef, double lim */ JS_EXPORT void JSContextGroupClearExecutionTimeLimit(JSContextGroupRef) CF_AVAILABLE(10_6, 7_0); -/*! -@function -@abstract Gets a whether or not remote inspection is enabled on the context. -@param ctx The JSGlobalContext whose setting you want to get. -@result The value of the setting, true if remote inspection is enabled, otherwise false. -@discussion Remote inspection is true by default. -*/ -JS_EXPORT bool JSGlobalContextGetRemoteInspectionEnabled(JSGlobalContextRef ctx) CF_AVAILABLE(10_10, 8_0); - -/*! -@function -@abstract Sets the remote inspection setting for a context. -@param ctx The JSGlobalContext that you want to change. -@param enabled The new remote inspection enabled setting for the context. -*/ -JS_EXPORT void JSGlobalContextSetRemoteInspectionEnabled(JSGlobalContextRef ctx, bool enabled) CF_AVAILABLE(10_10, 8_0); - -/*! -@function -@abstract Gets the include native call stack when reporting exceptions setting for a context. -@param ctx The JSGlobalContext whose setting you want to get. -@result The value of the setting, true if remote inspection is enabled, otherwise false. -@discussion This setting is true by default. -*/ -JS_EXPORT bool JSGlobalContextGetIncludesNativeCallStackWhenReportingExceptions(JSGlobalContextRef ctx) CF_AVAILABLE(10_10, 8_0); - -/*! -@function -@abstract Sets the include native call stack when reporting exceptions setting for a context. -@param ctx The JSGlobalContext that you want to change. -@param includeNativeCallStack The new value of the setting for the context. -*/ -JS_EXPORT void JSGlobalContextSetIncludesNativeCallStackWhenReportingExceptions(JSGlobalContextRef ctx, bool includesNativeCallStack) CF_AVAILABLE(10_10, 8_0); - #ifdef __cplusplus } #endif diff --git a/Source/JavaScriptCore/API/JSExport.h b/Source/JavaScriptCore/API/JSExport.h deleted file mode 100644 index 2d78dcc7a..000000000 --- a/Source/JavaScriptCore/API/JSExport.h +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import - -#if JSC_OBJC_API_ENABLED - -/*! -@protocol -@abstract JSExport provides a declarative way to export Objective-C instance methods, - class methods, and properties to JavaScript code. - -@discussion When a JavaScript value is created from an instance of an Objective-C class - for which no copying conversion is specified a JavaScript wrapper object will - be created. - - In JavaScript, inheritance is supported via a chain of prototype objects, and - for each Objective-C class (and per JSContext) an object appropriate for use - as a prototype will be provided. For the class NSObject the prototype object - will be the JavaScript context's Object Prototype. For all other Objective-C - classes a Prototype object will be created. The Prototype object for a given - Objective-C class will have its internal [Prototype] property set to point to - the Prototype object of the Objective-C class's superclass. As such the - prototype chain for a JavaScript wrapper object will reflect the wrapped - Objective-C type's inheritance hierarchy. - - In addition to the Prototype object a JavaScript Constructor object will also - be produced for each Objective-C class. The Constructor object has a property - named 'prototype' that references the Prototype object, and the Prototype - object has a property named 'constructor' that references the Constructor. - The Constructor object is not callable. - - By default no methods or properties of the Objective-C class will be exposed - to JavaScript; however methods and properties may explicitly be exported. - For each protocol that a class conforms to, if the protocol incorporates the - protocol JSExport, then the protocol will be interpreted as a list of methods - and properties to be exported to JavaScript. - - For each instance method being exported a corresponding JavaScript function - will be assigned as a property of the Prototype object. For each Objective-C - property being exported a JavaScript accessor property will be created on the - Prototype. For each class method exported a JavaScript function will be - created on the Constructor object. For example: - -
-@textblock
-    @protocol MyClassJavaScriptMethods 
-    - (void)foo;
-    @end
-
-    @interface MyClass : NSObject 
-    - (void)foo;
-    - (void)bar;
-    @end
-@/textblock
-
- - Data properties that are created on the prototype or constructor objects have - the attributes: writable:true, enumerable:false, configurable:true. - Accessor properties have the attributes: enumerable:false and configurable:true. - - If an instance of MyClass is converted to a JavaScript value, the resulting - wrapper object will (via its prototype) export the method foo to JavaScript, - since the class conforms to the MyClassJavaScriptMethods protocol, and this - protocol incorporates JSExport. bar will not be exported. - - Properties, arguments, and return values of the following types are - supported: - - Primitive numbers: signed values of up to 32-bits are converted in a manner - consistent with valueWithInt32/toInt32, unsigned values of up to 32-bits - are converted in a manner consistent with valueWithUInt32/toUInt32, all - other numeric values are converted consistently with valueWithDouble/ - toDouble. - - BOOL: values are converted consistently with valueWithBool/toBool. - - id: values are converted consistently with valueWithObject/toObject. - - Objective-C Class: - where the type is a pointer to a specified Objective-C - class, conversion is consistent with valueWithObjectOfClass/toObject. - - struct types: C struct types are supported, where JSValue provides support - for the given type. Support is built in for CGPoint, NSRange, CGRect, and - CGSize. - - block types: Blocks can only be passed if they had been converted - successfully by valueWithObject/toObject previously. - - For any interface that conforms to JSExport the normal copying conversion for - built in types will be inhibited - so, for example, if an instance that - derives from NSString but conforms to JSExport is passed to valueWithObject: - then a wrapper object for the Objective-C object will be returned rather than - a JavaScript string primitive. -*/ -@protocol JSExport -@end - -/*! -@define -@abstract Rename a selector when it's exported to JavaScript. -@discussion When a selector that takes one or more arguments is converted to a JavaScript - property name, by default a property name will be generated by performing the - following conversion: - - - All colons are removed from the selector - - - Any lowercase letter that had followed a colon will be capitalized. - - Under the default conversion a selector doFoo:withBar: will be exported as - doFooWithBar. The default conversion may be overriden using the JSExportAs - macro, for example to export a method doFoo:withBar: as doFoo: - -
-@textblock
-    @protocol MyClassJavaScriptMethods 
-    JSExportAs(doFoo,
-    - (void)doFoo:(id)foo withBar:(id)bar
-    );
-    @end
-@/textblock
-
- - Note that the JSExport macro may only be applied to a selector that takes one - or more argument. -*/ -#define JSExportAs(PropertyName, Selector) \ - @optional Selector __JS_EXPORT_AS__##PropertyName:(id)argument; @required Selector - -#endif diff --git a/Source/JavaScriptCore/API/JSManagedValue.h b/Source/JavaScriptCore/API/JSManagedValue.h deleted file mode 100644 index 97764eead..000000000 --- a/Source/JavaScriptCore/API/JSManagedValue.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#ifndef JSManagedValue_h -#define JSManagedValue_h - -#import -#import - -#if JSC_OBJC_API_ENABLED - -@class JSValue; -@class JSContext; - -/*! -@interface -@discussion JSManagedValue represents a "conditionally retained" JSValue. - "Conditionally retained" means that as long as either the JSManagedValue's - JavaScript value is reachable through the JavaScript object graph - or the JSManagedValue object is reachable through the external Objective-C - object graph as reported to the JSVirtualMachine using - addManagedReference:withOwner:, the corresponding JavaScript value will - be retained. However, if neither of these conditions are true, the - corresponding JSValue will be released and set to nil. - - The primary use case for JSManagedValue is for safely referencing JSValues - from the Objective-C heap. It is incorrect to store a JSValue into an - Objective-C heap object, as this can very easily create a reference cycle, - keeping the entire JSContext alive. -*/ -NS_CLASS_AVAILABLE(10_9, 7_0) -@interface JSManagedValue : NSObject - -/*! -@method -@abstract Create a JSManagedValue from a JSValue. -@param value -@result The new JSManagedValue. -*/ -+ (JSManagedValue *)managedValueWithValue:(JSValue *)value; -+ (JSManagedValue *)managedValueWithValue:(JSValue *)value andOwner:(id)owner NS_AVAILABLE(10_10, 8_0); - -/*! -@method -@abstract Create a JSManagedValue. -@param value -@result The new JSManagedValue. -*/ -- (instancetype)initWithValue:(JSValue *)value; - -/*! -@property -@abstract Get the JSValue from the JSManagedValue. -@result The corresponding JSValue for this JSManagedValue or - nil if the JSValue has been collected. -*/ -@property (readonly, strong) JSValue *value; - -@end - -#endif // JSC_OBJC_API_ENABLED - -#endif // JSManagedValue_h diff --git a/Source/JavaScriptCore/API/JSManagedValueInternal.h b/Source/JavaScriptCore/API/JSManagedValueInternal.h deleted file mode 100644 index 2443fe5a9..000000000 --- a/Source/JavaScriptCore/API/JSManagedValueInternal.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#ifndef JSManagedValueInternal_h -#define JSManagedValueInternal_h - -#import - -#if JSC_OBJC_API_ENABLED - -@interface JSManagedValue(Internal) - -- (void)didAddOwner:(id)owner; -- (void)didRemoveOwner:(id)owner; - -@end - -#endif // JSC_OBJC_API_ENABLED - -#endif // JSManagedValueInternal_h diff --git a/Source/JavaScriptCore/API/JSObjectRef.cpp b/Source/JavaScriptCore/API/JSObjectRef.cpp index e05fbbbdd..56fe90b47 100644 --- a/Source/JavaScriptCore/API/JSObjectRef.cpp +++ b/Source/JavaScriptCore/API/JSObjectRef.cpp @@ -11,10 +11,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -34,7 +34,6 @@ #include "CopiedSpaceInlines.h" #include "DateConstructor.h" #include "ErrorConstructor.h" -#include "Exception.h" #include "FunctionConstructor.h" #include "Identifier.h" #include "InitializeThreading.h" @@ -52,36 +51,12 @@ #include "JSValueRef.h" #include "ObjectConstructor.h" #include "ObjectPrototype.h" -#include "JSCInlines.h" +#include "Operations.h" #include "PropertyNameArray.h" #include "RegExpConstructor.h" -#if ENABLE(REMOTE_INSPECTOR) -#include "JSGlobalObjectInspectorController.h" -#endif - using namespace JSC; -enum class ExceptionStatus { - DidThrow, - DidNotThrow -}; - -static ExceptionStatus handleExceptionIfNeeded(ExecState* exec, JSValueRef* returnedExceptionRef) -{ - if (exec->hadException()) { - Exception* exception = exec->exception(); - if (returnedExceptionRef) - *returnedExceptionRef = toRef(exec, exception->value()); - exec->clearException(); -#if ENABLE(REMOTE_INSPECTOR) - exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exception); -#endif - return ExceptionStatus::DidThrow; - } - return ExceptionStatus::DidNotThrow; -} - JSClassRef JSClassCreate(const JSClassDefinition* definition) { initializeThreading(); @@ -110,7 +85,7 @@ JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef jsClass, void* data) return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); if (!jsClass) return toRef(constructEmptyObject(exec)); @@ -129,7 +104,7 @@ JSObjectRef JSObjectMakeFunctionWithCallback(JSContextRef ctx, JSStringRef name, return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); return toRef(JSCallbackFunction::create(exec->vm(), exec->lexicalGlobalObject(), callAsFunction, name ? name->string() : ASCIILiteral("anonymous"))); } @@ -140,7 +115,7 @@ JSObjectRef JSObjectMakeConstructor(JSContextRef ctx, JSClassRef jsClass, JSObje return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsPrototype = jsClass ? jsClass->prototype(exec) : 0; if (!jsPrototype) @@ -158,19 +133,23 @@ JSObjectRef JSObjectMakeFunction(JSContextRef ctx, JSStringRef name, unsigned pa return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); startingLineNumber = std::max(1, startingLineNumber); - Identifier nameID = name ? name->identifier(&exec->vm()) : Identifier::fromString(exec, "anonymous"); + Identifier nameID = name ? name->identifier(&exec->vm()) : Identifier(exec, "anonymous"); MarkedArgumentBuffer args; for (unsigned i = 0; i < parameterCount; i++) args.append(jsString(exec, parameterNames[i]->string())); args.append(jsString(exec, body->string())); - JSObject* result = constructFunction(exec, exec->lexicalGlobalObject(), args, nameID, sourceURL ? sourceURL->string() : String(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first())); - if (handleExceptionIfNeeded(exec, exception) == ExceptionStatus::DidThrow) + JSObject* result = constructFunction(exec, exec->lexicalGlobalObject(), args, nameID, sourceURL->string(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first())); + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); result = 0; + } return toRef(result); } @@ -181,7 +160,7 @@ JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSVa return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* result; if (argumentCount) { @@ -193,8 +172,12 @@ JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSVa } else result = constructEmptyArray(exec, 0); - if (handleExceptionIfNeeded(exec, exception) == ExceptionStatus::DidThrow) + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); result = 0; + } return toRef(result); } @@ -206,15 +189,19 @@ JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSVal return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); MarkedArgumentBuffer argList; for (size_t i = 0; i < argumentCount; ++i) argList.append(toJS(exec, arguments[i])); JSObject* result = constructDate(exec, exec->lexicalGlobalObject(), argList); - if (handleExceptionIfNeeded(exec, exception) == ExceptionStatus::DidThrow) + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); result = 0; + } return toRef(result); } @@ -226,14 +213,18 @@ JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSVa return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue message = argumentCount ? toJS(exec, arguments[0]) : jsUndefined(); Structure* errorStructure = exec->lexicalGlobalObject()->errorStructure(); JSObject* result = ErrorInstance::create(exec, errorStructure, message); - if (handleExceptionIfNeeded(exec, exception) == ExceptionStatus::DidThrow) + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); result = 0; + } return toRef(result); } @@ -245,15 +236,19 @@ JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSV return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); MarkedArgumentBuffer argList; for (size_t i = 0; i < argumentCount; ++i) argList.append(toJS(exec, arguments[i])); JSObject* result = constructRegExp(exec, exec->lexicalGlobalObject(), argList); - if (handleExceptionIfNeeded(exec, exception) == ExceptionStatus::DidThrow) + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); result = 0; + } return toRef(result); } @@ -265,7 +260,7 @@ JSValueRef JSObjectGetPrototype(JSContextRef ctx, JSObjectRef object) return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsObject = toJS(object); return toRef(exec, jsObject->prototype()); @@ -278,19 +273,11 @@ void JSObjectSetPrototype(JSContextRef ctx, JSObjectRef object, JSValueRef value return; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsObject = toJS(object); JSValue jsValue = toJS(exec, value); - if (JSProxy* proxy = jsDynamicCast(jsObject)) { - if (JSGlobalObject* globalObject = jsDynamicCast(proxy->target())) { - globalObject->resetPrototype(exec->vm(), jsValue.isObject() ? jsValue : jsNull()); - return; - } - // Someday we might use proxies for something other than JSGlobalObjects, but today is not that day. - RELEASE_ASSERT_NOT_REACHED(); - } jsObject->setPrototypeWithCycleCheck(exec, jsValue.isObject() ? jsValue : jsNull()); } @@ -301,7 +288,7 @@ bool JSObjectHasProperty(JSContextRef ctx, JSObjectRef object, JSStringRef prope return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsObject = toJS(object); @@ -315,12 +302,16 @@ JSValueRef JSObjectGetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsObject = toJS(object); JSValue jsValue = jsObject->get(exec, propertyName->identifier(&exec->vm())); - handleExceptionIfNeeded(exec, exception); + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); + } return toRef(exec, jsValue); } @@ -331,7 +322,7 @@ void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef prope return; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsObject = toJS(object); Identifier name(propertyName->identifier(&exec->vm())); @@ -345,7 +336,11 @@ void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef prope jsObject->methodTable()->put(jsObject, exec, name, jsValue, slot); } - handleExceptionIfNeeded(exec, exception); + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); + } } JSValueRef JSObjectGetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned propertyIndex, JSValueRef* exception) @@ -355,12 +350,16 @@ JSValueRef JSObjectGetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsi return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsObject = toJS(object); JSValue jsValue = jsObject->get(exec, propertyIndex); - handleExceptionIfNeeded(exec, exception); + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); + } return toRef(exec, jsValue); } @@ -372,13 +371,17 @@ void JSObjectSetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned p return; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsObject = toJS(object); JSValue jsValue = toJS(exec, value); jsObject->methodTable()->putByIndex(jsObject, exec, propertyIndex, jsValue, false); - handleExceptionIfNeeded(exec, exception); + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); + } } bool JSObjectDeleteProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception) @@ -388,23 +391,23 @@ bool JSObjectDeleteProperty(JSContextRef ctx, JSObjectRef object, JSStringRef pr return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsObject = toJS(object); bool result = jsObject->methodTable()->deleteProperty(jsObject, exec, propertyName->identifier(&exec->vm())); - handleExceptionIfNeeded(exec, exception); + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); + } return result; } void* JSObjectGetPrivate(JSObjectRef object) { JSObject* jsObject = uncheckedToJS(object); - - // Get wrapped object if proxied - if (jsObject->inherits(JSProxy::info())) - jsObject = jsCast(jsObject)->target(); - + if (jsObject->inherits(JSCallbackObject::info())) return jsCast*>(jsObject)->getPrivate(); if (jsObject->inherits(JSCallbackObject::info())) @@ -420,11 +423,7 @@ void* JSObjectGetPrivate(JSObjectRef object) bool JSObjectSetPrivate(JSObjectRef object, void* data) { JSObject* jsObject = uncheckedToJS(object); - - // Get wrapped object if proxied - if (jsObject->inherits(JSProxy::info())) - jsObject = jsCast(jsObject)->target(); - + if (jsObject->inherits(JSCallbackObject::info())) { jsCast*>(jsObject)->setPrivate(data); return true; @@ -446,15 +445,10 @@ bool JSObjectSetPrivate(JSObjectRef object, void* data) JSValueRef JSObjectGetPrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName) { ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsObject = toJS(object); JSValue result; Identifier name(propertyName->identifier(&exec->vm())); - - // Get wrapped object if proxied - if (jsObject->inherits(JSProxy::info())) - jsObject = jsCast(jsObject)->target(); - if (jsObject->inherits(JSCallbackObject::info())) result = jsCast*>(jsObject)->getPrivateProperty(name); else if (jsObject->inherits(JSCallbackObject::info())) @@ -469,15 +463,10 @@ JSValueRef JSObjectGetPrivateProperty(JSContextRef ctx, JSObjectRef object, JSSt bool JSObjectSetPrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value) { ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsObject = toJS(object); JSValue jsValue = value ? toJS(exec, value) : JSValue(); Identifier name(propertyName->identifier(&exec->vm())); - - // Get wrapped object if proxied - if (jsObject->inherits(JSProxy::info())) - jsObject = jsCast(jsObject)->target(); - if (jsObject->inherits(JSCallbackObject::info())) { jsCast*>(jsObject)->setPrivateProperty(exec->vm(), name, jsValue); return true; @@ -498,14 +487,9 @@ bool JSObjectSetPrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRe bool JSObjectDeletePrivateProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName) { ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSObject* jsObject = toJS(object); Identifier name(propertyName->identifier(&exec->vm())); - - // Get wrapped object if proxied - if (jsObject->inherits(JSProxy::info())) - jsObject = jsCast(jsObject)->target(); - if (jsObject->inherits(JSCallbackObject::info())) { jsCast*>(jsObject)->deletePrivateProperty(name); return true; @@ -523,11 +507,10 @@ bool JSObjectDeletePrivateProperty(JSContextRef ctx, JSObjectRef object, JSStrin return false; } -bool JSObjectIsFunction(JSContextRef ctx, JSObjectRef object) +bool JSObjectIsFunction(JSContextRef, JSObjectRef object) { if (!object) return false; - JSLockHolder locker(toJS(ctx)); CallData callData; JSCell* cell = toJS(object); return cell->methodTable()->getCallData(cell, callData) != CallTypeNone; @@ -536,7 +519,7 @@ bool JSObjectIsFunction(JSContextRef ctx, JSObjectRef object) JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) { ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); if (!object) return 0; @@ -557,8 +540,12 @@ JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObject return 0; JSValueRef result = toRef(exec, call(exec, jsObject, callType, callData, jsThisObject, argList)); - if (handleExceptionIfNeeded(exec, exception) == ExceptionStatus::DidThrow) + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); result = 0; + } return result; } @@ -574,7 +561,7 @@ bool JSObjectIsConstructor(JSContextRef, JSObjectRef object) JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) { ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); if (!object) return 0; @@ -590,8 +577,12 @@ JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size for (size_t i = 0; i < argumentCount; i++) argList.append(toJS(exec, arguments[i])); JSObjectRef result = toRef(construct(exec, jsObject, constructType, constructData, argList)); - if (handleExceptionIfNeeded(exec, exception) == ExceptionStatus::DidThrow) + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); result = 0; + } return result; } @@ -615,15 +606,15 @@ JSPropertyNameArrayRef JSObjectCopyPropertyNames(JSContextRef ctx, JSObjectRef o ASSERT_NOT_REACHED(); return 0; } + JSObject* jsObject = toJS(object); ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); VM* vm = &exec->vm(); - JSObject* jsObject = toJS(object); JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray(vm); - PropertyNameArray array(vm, PropertyNameMode::Strings); - jsObject->methodTable()->getPropertyNames(jsObject, exec, array, EnumerationMode()); + PropertyNameArray array(vm); + jsObject->methodTable()->getPropertyNames(jsObject, exec, array, ExcludeDontEnumProperties); size_t size = array.size(); propertyNames->array.reserveInitialCapacity(size); @@ -642,7 +633,7 @@ JSPropertyNameArrayRef JSPropertyNameArrayRetain(JSPropertyNameArrayRef array) void JSPropertyNameArrayRelease(JSPropertyNameArrayRef array) { if (--array->refCount == 0) { - JSLockHolder locker(array->vm); + APIEntryShim entryShim(array->vm, false); delete array; } } @@ -660,6 +651,6 @@ JSStringRef JSPropertyNameArrayGetNameAtIndex(JSPropertyNameArrayRef array, size void JSPropertyNameAccumulatorAddName(JSPropertyNameAccumulatorRef array, JSStringRef propertyName) { PropertyNameArray* propertyNames = toJS(array); - JSLockHolder locker(propertyNames->vm()); + APIEntryShim entryShim(propertyNames->vm()); propertyNames->add(propertyName->identifier(propertyNames->vm())); } diff --git a/Source/JavaScriptCore/API/JSObjectRef.h b/Source/JavaScriptCore/API/JSObjectRef.h index 754dff363..5e7fd69a9 100644 --- a/Source/JavaScriptCore/API/JSObjectRef.h +++ b/Source/JavaScriptCore/API/JSObjectRef.h @@ -11,10 +11,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 diff --git a/Source/JavaScriptCore/API/JSProfilerPrivate.cpp b/Source/JavaScriptCore/API/JSProfilerPrivate.cpp deleted file mode 100644 index ac112ae6e..000000000 --- a/Source/JavaScriptCore/API/JSProfilerPrivate.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2008 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "JSProfilerPrivate.h" - -#include "APICast.h" -#include "LegacyProfiler.h" -#include "OpaqueJSString.h" - -using namespace JSC; - -void JSStartProfiling(JSContextRef ctx, JSStringRef title) -{ - // Use an independent stopwatch for API-initiated profiling, since the user will expect it - // to be relative to when their command was issued. - RefPtr stopwatch = Stopwatch::create(); - stopwatch->start(); - LegacyProfiler::profiler()->startProfiling(toJS(ctx), title->string(), stopwatch.release()); -} - -void JSEndProfiling(JSContextRef ctx, JSStringRef title) -{ - ExecState* exec = toJS(ctx); - LegacyProfiler* profiler = LegacyProfiler::profiler(); - profiler->stopProfiling(exec, title->string()); -} - diff --git a/Source/JavaScriptCore/API/JSProfilerPrivate.h b/Source/JavaScriptCore/API/JSProfilerPrivate.h deleted file mode 100644 index 34f26a202..000000000 --- a/Source/JavaScriptCore/API/JSProfilerPrivate.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2008 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSProfiler_h -#define JSProfiler_h - -#include - -#ifndef __cplusplus -#include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/*! -@function JSStartProfiling -@abstract Enables the profler. -@param ctx The execution context to use. -@param title The title of the profile. -@result The profiler is turned on. -*/ -JS_EXPORT void JSStartProfiling(JSContextRef ctx, JSStringRef title); - -/*! -@function JSEndProfiling -@abstract Disables the profler. -@param ctx The execution context to use. -@param title The title of the profile. -@result The profiler is turned off. If there is no name, the most recently started - profile is stopped. If the name does not match any profile then no profile - is stopped. -*/ -JS_EXPORT void JSEndProfiling(JSContextRef ctx, JSStringRef title); - -#ifdef __cplusplus -} -#endif - -#endif /* JSProfiler_h */ diff --git a/Source/JavaScriptCore/API/JSRemoteInspector.cpp b/Source/JavaScriptCore/API/JSRemoteInspector.cpp deleted file mode 100644 index faebc5de3..000000000 --- a/Source/JavaScriptCore/API/JSRemoteInspector.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2015 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "JSRemoteInspector.h" - -#include "JSGlobalObjectConsoleClient.h" - -#if ENABLE(REMOTE_INSPECTOR) -#include "RemoteInspector.h" -#endif - -using namespace Inspector; - -static bool remoteInspectionEnabledByDefault = true; - -void JSRemoteInspectorDisableAutoStart(void) -{ -#if ENABLE(REMOTE_INSPECTOR) - RemoteInspector::startDisabled(); -#endif -} - -void JSRemoteInspectorStart(void) -{ -#if ENABLE(REMOTE_INSPECTOR) - RemoteInspector::singleton(); -#endif -} - -void JSRemoteInspectorSetParentProcessInformation(pid_t pid, const UInt8* auditData, size_t auditLength) -{ -#if ENABLE(REMOTE_INSPECTOR) - RetainPtr auditDataRef = adoptCF(CFDataCreate(kCFAllocatorDefault, auditData, auditLength)); - RemoteInspector::singleton().setParentProcessInformation(pid, auditDataRef); -#else - UNUSED_PARAM(pid); - UNUSED_PARAM(auditData); - UNUSED_PARAM(auditLength); -#endif -} - -void JSRemoteInspectorSetLogToSystemConsole(bool logToSystemConsole) -{ - JSGlobalObjectConsoleClient::setLogToSystemConsole(logToSystemConsole); -} - -bool JSRemoteInspectorGetInspectionEnabledByDefault(void) -{ - return remoteInspectionEnabledByDefault; -} - -void JSRemoteInspectorSetInspectionEnabledByDefault(bool enabledByDefault) -{ - remoteInspectionEnabledByDefault = enabledByDefault; -} diff --git a/Source/JavaScriptCore/API/JSRemoteInspector.h b/Source/JavaScriptCore/API/JSRemoteInspector.h deleted file mode 100644 index 2bde47949..000000000 --- a/Source/JavaScriptCore/API/JSRemoteInspector.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2015 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSRemoteInspector_h -#define JSRemoteInspector_h - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -JS_EXPORT void JSRemoteInspectorDisableAutoStart(void) CF_AVAILABLE(10_11, 9_0); -JS_EXPORT void JSRemoteInspectorStart(void) CF_AVAILABLE(10_11, 9_0); -JS_EXPORT void JSRemoteInspectorSetParentProcessInformation(pid_t, const uint8_t* auditData, size_t auditLength) CF_AVAILABLE(10_11, 9_0); - -JS_EXPORT void JSRemoteInspectorSetLogToSystemConsole(bool) CF_AVAILABLE(10_11, 9_0); - -JS_EXPORT bool JSRemoteInspectorGetInspectionEnabledByDefault(void) CF_AVAILABLE(10_11, 9_0); -JS_EXPORT void JSRemoteInspectorSetInspectionEnabledByDefault(bool) CF_AVAILABLE(10_11, 9_0); - -#ifdef __cplusplus -} -#endif - -#endif /* JSRemoteInspector_h */ diff --git a/Source/JavaScriptCore/API/JSRetainPtr.h b/Source/JavaScriptCore/API/JSRetainPtr.h index e40084080..574f7aaf1 100644 --- a/Source/JavaScriptCore/API/JSRetainPtr.h +++ b/Source/JavaScriptCore/API/JSRetainPtr.h @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -57,8 +57,11 @@ public: T operator->() const { return m_ptr; } bool operator!() const { return !m_ptr; } - explicit operator bool() const { return m_ptr; } + // This conversion operator allows implicit conversion to bool but not to other integer types. + typedef T JSRetainPtr::*UnspecifiedBoolType; + operator UnspecifiedBoolType() const { return m_ptr ? &JSRetainPtr::m_ptr : 0; } + JSRetainPtr& operator=(const JSRetainPtr&); template JSRetainPtr& operator=(const JSRetainPtr&); JSRetainPtr& operator=(T); @@ -72,16 +75,6 @@ private: T m_ptr; }; -inline JSRetainPtr adopt(JSStringRef o) -{ - return JSRetainPtr(Adopt, o); -} - -inline JSRetainPtr adopt(JSGlobalContextRef o) -{ - return JSRetainPtr(Adopt, o); -} - template inline JSRetainPtr::JSRetainPtr(const JSRetainPtr& o) : m_ptr(o.m_ptr) { diff --git a/Source/JavaScriptCore/API/JSScriptRef.cpp b/Source/JavaScriptCore/API/JSScriptRef.cpp index 3b7b76bf3..9277001d2 100644 --- a/Source/JavaScriptCore/API/JSScriptRef.cpp +++ b/Source/JavaScriptCore/API/JSScriptRef.cpp @@ -26,13 +26,13 @@ #include "config.h" #include "APICast.h" +#include "APIShims.h" #include "Completion.h" -#include "Exception.h" #include "JSBasePrivate.h" #include "VM.h" #include "JSScriptRefPrivate.h" #include "OpaqueJSString.h" -#include "JSCInlines.h" +#include "Operations.h" #include "Parser.h" #include "SourceCode.h" #include "SourceProvider.h" @@ -41,9 +41,9 @@ using namespace JSC; struct OpaqueJSScript : public SourceProvider { public: - static WTF::RefPtr create(VM* vm, const String& url, int startingLineNumber, const String& source) + static WTF::PassRefPtr create(VM* vm, const String& url, int startingLineNumber, const String& source) { - return WTF::adoptRef(*new OpaqueJSScript(vm, url, startingLineNumber, source)); + return WTF::adoptRef(new OpaqueJSScript(vm, url, startingLineNumber, source)); } virtual const String& source() const override @@ -69,10 +69,7 @@ private: static bool parseScript(VM* vm, const SourceCode& source, ParserError& error) { - return !!JSC::parse( - vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin, - JSParserStrictMode::NotStrict, SourceParseMode::ProgramMode, - error); + return JSC::parse(vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error); } extern "C" { @@ -80,7 +77,7 @@ extern "C" { JSScriptRef JSScriptCreateReferencingImmortalASCIIText(JSContextGroupRef contextGroup, JSStringRef url, int startingLineNumber, const char* source, size_t length, JSStringRef* errorMessage, int* errorLine) { VM* vm = toJS(contextGroup); - JSLockHolder locker(vm); + APIEntryShim entryShim(vm); for (size_t i = 0; i < length; i++) { if (!isASCII(source[i])) return 0; @@ -88,15 +85,15 @@ JSScriptRef JSScriptCreateReferencingImmortalASCIIText(JSContextGroupRef context startingLineNumber = std::max(1, startingLineNumber); - RefPtr result = OpaqueJSScript::create(vm, url ? url->string() : String(), startingLineNumber, String(StringImpl::createFromLiteral(source, length))); + RefPtr result = OpaqueJSScript::create(vm, url->string(), startingLineNumber, String(StringImpl::createFromLiteral(source, length))); ParserError error; if (!parseScript(vm, SourceCode(result), error)) { if (errorMessage) - *errorMessage = OpaqueJSString::create(error.message()).leakRef(); + *errorMessage = OpaqueJSString::create(error.m_message).leakRef(); if (errorLine) - *errorLine = error.line(); - return nullptr; + *errorLine = error.m_line; + return 0; } return result.release().leakRef(); @@ -105,19 +102,19 @@ JSScriptRef JSScriptCreateReferencingImmortalASCIIText(JSContextGroupRef context JSScriptRef JSScriptCreateFromString(JSContextGroupRef contextGroup, JSStringRef url, int startingLineNumber, JSStringRef source, JSStringRef* errorMessage, int* errorLine) { VM* vm = toJS(contextGroup); - JSLockHolder locker(vm); + APIEntryShim entryShim(vm); startingLineNumber = std::max(1, startingLineNumber); - RefPtr result = OpaqueJSScript::create(vm, url ? url->string() : String(), startingLineNumber, source->string()); + RefPtr result = OpaqueJSScript::create(vm, url->string(), startingLineNumber, source->string()); ParserError error; if (!parseScript(vm, SourceCode(result), error)) { if (errorMessage) - *errorMessage = OpaqueJSString::create(error.message()).leakRef(); + *errorMessage = OpaqueJSString::create(error.m_message).leakRef(); if (errorLine) - *errorLine = error.line(); - return nullptr; + *errorLine = error.m_line; + return 0; } return result.release().leakRef(); @@ -125,30 +122,30 @@ JSScriptRef JSScriptCreateFromString(JSContextGroupRef contextGroup, JSStringRef void JSScriptRetain(JSScriptRef script) { - JSLockHolder locker(script->vm()); + APIEntryShim entryShim(script->vm()); script->ref(); } void JSScriptRelease(JSScriptRef script) { - JSLockHolder locker(script->vm()); + APIEntryShim entryShim(script->vm()); script->deref(); } JSValueRef JSScriptEvaluate(JSContextRef context, JSScriptRef script, JSValueRef thisValueRef, JSValueRef* exception) { ExecState* exec = toJS(context); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); if (script->vm() != &exec->vm()) { RELEASE_ASSERT_NOT_REACHED(); return 0; } - NakedPtr internalException; + JSValue internalException; JSValue thisValue = thisValueRef ? toJS(exec, thisValueRef) : jsUndefined(); - JSValue result = evaluate(exec, SourceCode(script), thisValue, internalException); + JSValue result = evaluate(exec, SourceCode(script), thisValue, &internalException); if (internalException) { if (exception) - *exception = toRef(exec, internalException->value()); + *exception = toRef(exec, internalException); return 0; } ASSERT(result); diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp index c9b380ce6..25b84c7d2 100644 --- a/Source/JavaScriptCore/API/JSStringRef.cpp +++ b/Source/JavaScriptCore/API/JSStringRef.cpp @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -37,7 +37,7 @@ using namespace WTF::Unicode; JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) { initializeThreading(); - return &OpaqueJSString::create(chars, numChars).leakRef(); + return OpaqueJSString::create(chars, numChars).leakRef(); } JSStringRef JSStringCreateWithUTF8CString(const char* string) @@ -51,12 +51,12 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) const LChar* stringStart = reinterpret_cast(string); if (conversionOK == convertUTF8ToUTF16(&string, string + length, &p, p + length, &sourceIsAllASCII)) { if (sourceIsAllASCII) - return &OpaqueJSString::create(stringStart, length).leakRef(); - return &OpaqueJSString::create(buffer.data(), p - buffer.data()).leakRef(); + return OpaqueJSString::create(stringStart, length).leakRef(); + return OpaqueJSString::create(buffer.data(), p - buffer.data()).leakRef(); } } - return &OpaqueJSString::create().leakRef(); + return OpaqueJSString::create().leakRef(); } JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) @@ -78,15 +78,11 @@ void JSStringRelease(JSStringRef string) size_t JSStringGetLength(JSStringRef string) { - if (!string) - return 0; return string->length(); } const JSChar* JSStringGetCharactersPtr(JSStringRef string) { - if (!string) - return nullptr; return string->characters(); } @@ -98,7 +94,7 @@ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) size_t JSStringGetUTF8CString(JSStringRef string, char* buffer, size_t bufferSize) { - if (!string || !buffer || !bufferSize) + if (!bufferSize) return 0; char* destination = buffer; diff --git a/Source/JavaScriptCore/API/JSStringRef.h b/Source/JavaScriptCore/API/JSStringRef.h index 6f45fcbd8..aded73626 100644 --- a/Source/JavaScriptCore/API/JSStringRef.h +++ b/Source/JavaScriptCore/API/JSStringRef.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 diff --git a/Source/JavaScriptCore/API/JSStringRefBSTR.cpp b/Source/JavaScriptCore/API/JSStringRefBSTR.cpp deleted file mode 100644 index e900d24d8..000000000 --- a/Source/JavaScriptCore/API/JSStringRefBSTR.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2007 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Inc. ("Apple") nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * 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 OR ITS 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. - */ - -#include "config.h" -#include "JSStringRefBSTR.h" - -#include "JSStringRef.h" - -JSStringRef JSStringCreateWithBSTR(BSTR string) -{ - return JSStringCreateWithCharacters(string ? string : L"", string ? SysStringLen(string) : 0); -} - -BSTR JSStringCopyBSTR(const JSStringRef string) -{ - return SysAllocStringLen(JSStringGetCharactersPtr(string), JSStringGetLength(string)); -} diff --git a/Source/JavaScriptCore/API/JSStringRefBSTR.h b/Source/JavaScriptCore/API/JSStringRefBSTR.h deleted file mode 100644 index 066c68d53..000000000 --- a/Source/JavaScriptCore/API/JSStringRefBSTR.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2007 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Inc. ("Apple") nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * 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 OR ITS 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. - */ - -#ifndef JSStringRefBSTR_h -#define JSStringRefBSTR_h - -#include "JSBase.h" - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/* COM convenience methods */ - -/*! -@function -@abstract Creates a JavaScript string from a BSTR. -@param string The BSTR to copy into the new JSString. -@result A JSString containing string. Ownership follows the Create Rule. -*/ -JS_EXPORT JSStringRef JSStringCreateWithBSTR(const BSTR string); - -/*! -@function -@abstract Creates a BSTR from a JavaScript string. -@param string The JSString to copy into the new BSTR. -@result A BSTR containing string. Ownership follows the Create Rule. -*/ -JS_EXPORT BSTR JSStringCopyBSTR(const JSStringRef string); - -#ifdef __cplusplus -} -#endif - -#endif /* JSStringRefBSTR_h */ diff --git a/Source/JavaScriptCore/API/JSStringRefCF.cpp b/Source/JavaScriptCore/API/JSStringRefCF.cpp deleted file mode 100644 index 05872593f..000000000 --- a/Source/JavaScriptCore/API/JSStringRefCF.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "JSStringRefCF.h" - -#include "APICast.h" -#include "InitializeThreading.h" -#include "JSCJSValue.h" -#include "JSStringRef.h" -#include "OpaqueJSString.h" -#include - -JSStringRef JSStringCreateWithCFString(CFStringRef string) -{ - JSC::initializeThreading(); - - // We cannot use CFIndex here since CFStringGetLength can return values larger than - // it can hold. () - size_t length = CFStringGetLength(string); - if (!length) - return &OpaqueJSString::create(reinterpret_cast(""), 0).leakRef(); - - Vector lcharBuffer(length); - CFIndex usedBufferLength; - CFIndex convertedSize = CFStringGetBytes(string, CFRangeMake(0, length), kCFStringEncodingISOLatin1, 0, false, lcharBuffer.data(), length, &usedBufferLength); - if (static_cast(convertedSize) == length && static_cast(usedBufferLength) == length) - return &OpaqueJSString::create(lcharBuffer.data(), length).leakRef(); - - auto buffer = std::make_unique(length); - CFStringGetCharacters(string, CFRangeMake(0, length), buffer.get()); - static_assert(sizeof(UniChar) == sizeof(UChar), "UniChar and UChar must be same size"); - return &OpaqueJSString::create(reinterpret_cast(buffer.get()), length).leakRef(); -} - -CFStringRef JSStringCopyCFString(CFAllocatorRef allocator, JSStringRef string) -{ - if (!string || !string->length()) - return CFSTR(""); - - if (string->is8Bit()) - return CFStringCreateWithBytes(allocator, reinterpret_cast(string->characters8()), string->length(), kCFStringEncodingISOLatin1, false); - - return CFStringCreateWithCharacters(allocator, reinterpret_cast(string->characters16()), string->length()); -} diff --git a/Source/JavaScriptCore/API/JSStringRefCF.h b/Source/JavaScriptCore/API/JSStringRefCF.h deleted file mode 100644 index 1e210c7a9..000000000 --- a/Source/JavaScriptCore/API/JSStringRefCF.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSStringRefCF_h -#define JSStringRefCF_h - -#include "JSBase.h" -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/* CFString convenience methods */ - -/*! -@function -@abstract Creates a JavaScript string from a CFString. -@discussion This function is optimized to take advantage of cases when - CFStringGetCharactersPtr returns a valid pointer. -@param string The CFString to copy into the new JSString. -@result A JSString containing string. Ownership follows the Create Rule. -*/ -JS_EXPORT JSStringRef JSStringCreateWithCFString(CFStringRef string); -/*! -@function -@abstract Creates a CFString from a JavaScript string. -@param alloc The alloc parameter to pass to CFStringCreate. -@param string The JSString to copy into the new CFString. -@result A CFString containing string. Ownership follows the Create Rule. -*/ -JS_EXPORT CFStringRef JSStringCopyCFString(CFAllocatorRef alloc, JSStringRef string) CF_RETURNS_RETAINED; - -#ifdef __cplusplus -} -#endif - -#endif /* JSStringRefCF_h */ diff --git a/Source/JavaScriptCore/API/JSValue.h b/Source/JavaScriptCore/API/JSValue.h deleted file mode 100644 index 803d10513..000000000 --- a/Source/JavaScriptCore/API/JSValue.h +++ /dev/null @@ -1,679 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSValue_h -#define JSValue_h - -#if JSC_OBJC_API_ENABLED - -#import - -@class JSContext; - -/*! -@interface -@discussion A JSValue is a reference to a value within the JavaScript object space of a - JSVirtualMachine. All instances of JSValue originate from a JSContext and - hold a strong reference to this JSContext. As long as any value associated with - a particular JSContext is retained, that JSContext will remain alive. - Where an instance method is invoked upon a JSValue, and this returns another - JSValue, the returned JSValue will originate from the same JSContext as the - JSValue on which the method was invoked. - - All JavaScript values are associated with a particular JSVirtualMachine - (the associated JSVirtualMachine is available indirectly via the context - property). An instance of JSValue may only be passed as an argument to - methods on instances of JSValue and JSContext that belong to the same - JSVirtualMachine - passing a JSValue to a method on an object originating - from a different JSVirtualMachine will result in an Objective-C exception - being raised. -*/ -NS_CLASS_AVAILABLE(10_9, 7_0) -@interface JSValue : NSObject - -/*! -@property -@abstract The JSContext that this value originates from. -*/ -@property (readonly, strong) JSContext *context; - -/*! -@methodgroup Creating JavaScript Values -*/ -/*! -@method -@abstract Create a JSValue by converting an Objective-C object. -@discussion The resulting JSValue retains the provided Objective-C object. -@param value The Objective-C object to be converted. -@result The new JSValue. -*/ -+ (JSValue *)valueWithObject:(id)value inContext:(JSContext *)context; - -/*! -@method -@abstract Create a JavaScript value from a BOOL primitive. -@param value -@param context The JSContext in which the resulting JSValue will be created. -@result The new JSValue representing the equivalent boolean value. -*/ -+ (JSValue *)valueWithBool:(BOOL)value inContext:(JSContext *)context; - -/*! -@method -@abstract Create a JavaScript value from a double primitive. -@param value -@param context The JSContext in which the resulting JSValue will be created. -@result The new JSValue representing the equivalent boolean value. -*/ -+ (JSValue *)valueWithDouble:(double)value inContext:(JSContext *)context; - -/*! -@method -@abstract Create a JavaScript value from an int32_t primitive. -@param value -@param context The JSContext in which the resulting JSValue will be created. -@result The new JSValue representing the equivalent boolean value. -*/ -+ (JSValue *)valueWithInt32:(int32_t)value inContext:(JSContext *)context; - -/*! -@method -@abstract Create a JavaScript value from a uint32_t primitive. -@param value -@param context The JSContext in which the resulting JSValue will be created. -@result The new JSValue representing the equivalent boolean value. -*/ -+ (JSValue *)valueWithUInt32:(uint32_t)value inContext:(JSContext *)context; - -/*! -@method -@abstract Create a new, empty JavaScript object. -@param context The JSContext in which the resulting object will be created. -@result The new JavaScript object. -*/ -+ (JSValue *)valueWithNewObjectInContext:(JSContext *)context; - -/*! -@method -@abstract Create a new, empty JavaScript array. -@param context The JSContext in which the resulting array will be created. -@result The new JavaScript array. -*/ -+ (JSValue *)valueWithNewArrayInContext:(JSContext *)context; - -/*! -@method -@abstract Create a new JavaScript regular expression object. -@param pattern The regular expression pattern. -@param flags The regular expression flags. -@param context The JSContext in which the resulting regular expression object will be created. -@result The new JavaScript regular expression object. -*/ -+ (JSValue *)valueWithNewRegularExpressionFromPattern:(NSString *)pattern flags:(NSString *)flags inContext:(JSContext *)context; - -/*! -@method -@abstract Create a new JavaScript error object. -@param message The error message. -@param context The JSContext in which the resulting error object will be created. -@result The new JavaScript error object. -*/ -+ (JSValue *)valueWithNewErrorFromMessage:(NSString *)message inContext:(JSContext *)context; - -/*! -@method -@abstract Create the JavaScript value null. -@param context The JSContext to which the resulting JSValue belongs. -@result The JSValue representing the JavaScript value null. -*/ -+ (JSValue *)valueWithNullInContext:(JSContext *)context; - -/*! -@method -@abstract Create the JavaScript value undefined. -@param context The JSContext to which the resulting JSValue belongs. -@result The JSValue representing the JavaScript value undefined. -*/ -+ (JSValue *)valueWithUndefinedInContext:(JSContext *)context; - -/*! -@methodgroup Converting to Objective-C Types -@discussion When converting between JavaScript values and Objective-C objects a copy is - performed. Values of types listed below are copied to the corresponding - types on conversion in each direction. For NSDictionaries, entries in the - dictionary that are keyed by strings are copied onto a JavaScript object. - For dictionaries and arrays, conversion is recursive, with the same object - conversion being applied to all entries in the collection. - -
-@textblock
-   Objective-C type  |   JavaScript type
- --------------------+---------------------
-         nil         |     undefined
-        NSNull       |        null
-       NSString      |       string
-       NSNumber      |   number, boolean
-     NSDictionary    |   Object object
-       NSArray       |    Array object
-        NSDate       |     Date object
-       NSBlock (1)   |   Function object (1)
-          id (2)     |   Wrapper object (2)
-        Class (3)    | Constructor object (3)
-@/textblock
-
- - (1) Instances of NSBlock with supported arguments types will be presented to - JavaScript as a callable Function object. For more information on supported - argument types see JSExport.h. If a JavaScript Function originating from an - Objective-C block is converted back to an Objective-C object the block will - be returned. All other JavaScript functions will be converted in the same - manner as a JavaScript object of type Object. - - (2) For Objective-C instances that do not derive from the set of types listed - above, a wrapper object to provide a retaining handle to the Objective-C - instance from JavaScript. For more information on these wrapper objects, see - JSExport.h. When a JavaScript wrapper object is converted back to Objective-C - the Objective-C instance being retained by the wrapper is returned. - - (3) For Objective-C Class objects a constructor object containing exported - class methods will be returned. See JSExport.h for more information on - constructor objects. - - For all methods taking arguments of type id, arguments will be converted - into a JavaScript value according to the above conversion. -*/ -/*! -@method -@abstract Convert this JSValue to an Objective-C object. -@discussion The JSValue is converted to an Objective-C object according - to the conversion rules specified above. -@result The Objective-C representation of this JSValue. -*/ -- (id)toObject; - -/*! -@method -@abstract Convert a JSValue to an Objective-C object of a specific class. -@discussion The JSValue is converted to an Objective-C object of the specified Class. - If the result is not of the specified Class then nil will be returned. -@result An Objective-C object of the specified Class or nil. -*/ -- (id)toObjectOfClass:(Class)expectedClass; - -/*! -@method -@abstract Convert a JSValue to a boolean. -@discussion The JSValue is converted to a boolean according to the rules specified - by the JavaScript language. -@result The boolean result of the conversion. -*/ -- (BOOL)toBool; - -/*! -@method -@abstract Convert a JSValue to a double. -@discussion The JSValue is converted to a number according to the rules specified - by the JavaScript language. -@result The double result of the conversion. -*/ -- (double)toDouble; - -/*! -@method -@abstract Convert a JSValue to an int32_t. -@discussion The JSValue is converted to an integer according to the rules specified - by the JavaScript language. -@result The int32_t result of the conversion. -*/ -- (int32_t)toInt32; - -/*! -@method -@abstract Convert a JSValue to a uint32_t. -@discussion The JSValue is converted to an integer according to the rules specified - by the JavaScript language. -@result The uint32_t result of the conversion. -*/ -- (uint32_t)toUInt32; - -/*! -@method -@abstract Convert a JSValue to a NSNumber. -@discussion If the JSValue represents a boolean, a NSNumber value of YES or NO - will be returned. For all other types the value will be converted to a number according - to the rules specified by the JavaScript language. -@result The NSNumber result of the conversion. -*/ -- (NSNumber *)toNumber; - -/*! -@method -@abstract Convert a JSValue to a NSString. -@discussion The JSValue is converted to a string according to the rules specified - by the JavaScript language. -@result The NSString containing the result of the conversion. -*/ -- (NSString *)toString; - -/*! -@method -@abstract Convert a JSValue to a NSDate. -@discussion The value is converted to a number representing a time interval - since 1970 which is then used to create a new NSDate instance. -@result The NSDate created using the converted time interval. -*/ -- (NSDate *)toDate; - -/*! -@method -@abstract Convert a JSValue to a NSArray. -@discussion If the value is null or undefined then nil is returned. - If the value is not an object then a JavaScript TypeError will be thrown. - The property length is read from the object, converted to an unsigned - integer, and an NSArray of this size is allocated. Properties corresponding - to indicies within the array bounds will be copied to the array, with - JSValues converted to equivalent Objective-C objects as specified. -@result The NSArray containing the recursively converted contents of the - converted JavaScript array. -*/ -- (NSArray *)toArray; - -/*! -@method -@abstract Convert a JSValue to a NSDictionary. -@discussion If the value is null or undefined then nil is returned. - If the value is not an object then a JavaScript TypeError will be thrown. - All enumerable properties of the object are copied to the dictionary, with - JSValues converted to equivalent Objective-C objects as specified. -@result The NSDictionary containing the recursively converted contents of - the converted JavaScript object. -*/ -- (NSDictionary *)toDictionary; - -/*! -@methodgroup Accessing Properties -*/ -/*! -@method -@abstract Access a property of a JSValue. -@result The JSValue for the requested property or the JSValue undefined - if the property does not exist. -*/ -- (JSValue *)valueForProperty:(NSString *)property; - -/*! -@method -@abstract Set a property on a JSValue. -*/ -- (void)setValue:(id)value forProperty:(NSString *)property; - -/*! -@method -@abstract Delete a property from a JSValue. -@result YES if deletion is successful, NO otherwise. -*/ -- (BOOL)deleteProperty:(NSString *)property; - -/*! -@method -@abstract Check if a JSValue has a property. -@discussion This method has the same function as the JavaScript operator in. -@result Returns YES if property is present on the value. -*/ -- (BOOL)hasProperty:(NSString *)property; - -/*! -@method -@abstract Define properties with custom descriptors on JSValues. -@discussion This method may be used to create a data or accessor property on an object. - This method operates in accordance with the Object.defineProperty method in the - JavaScript language. -*/ -- (void)defineProperty:(NSString *)property descriptor:(id)descriptor; - -/*! -@method -@abstract Access an indexed (numerical) property on a JSValue. -@result The JSValue for the property at the specified index. - Returns the JavaScript value undefined if no property exists at that index. -*/ -- (JSValue *)valueAtIndex:(NSUInteger)index; - -/*! -@method -@abstract Set an indexed (numerical) property on a JSValue. -@discussion For JSValues that are JavaScript arrays, indices greater than - UINT_MAX - 1 will not affect the length of the array. -*/ -- (void)setValue:(id)value atIndex:(NSUInteger)index; - -/*! -@methodgroup Checking JavaScript Types -*/ -/*! -@method -@abstract Check if a JSValue corresponds to the JavaScript value undefined. -*/ -@property (readonly) BOOL isUndefined; - -/*! -@method -@abstract Check if a JSValue corresponds to the JavaScript value null. -*/ -@property (readonly) BOOL isNull; - -/*! -@method -@abstract Check if a JSValue is a boolean. -*/ -@property (readonly) BOOL isBoolean; - -/*! -@method -@abstract Check if a JSValue is a number. -@discussion In JavaScript, there is no differentiation between types of numbers. - Semantically all numbers behave like doubles except in special cases like bit - operations. -*/ -@property (readonly) BOOL isNumber; - -/*! -@method -@abstract Check if a JSValue is a string. -*/ -@property (readonly) BOOL isString; - -/*! -@method -@abstract Check if a JSValue is an object. -*/ -@property (readonly) BOOL isObject; - -/*! -@method -@abstract Check if a JSValue is an array. -*/ -@property (readonly) BOOL isArray NS_AVAILABLE(10_11, 9_0); - -/*! -@method -@abstract Check if a JSValue is a date. -*/ -@property (readonly) BOOL isDate NS_AVAILABLE(10_11, 9_0); - -/*! -@method -@abstract Compare two JSValues using JavaScript's === operator. -*/ -- (BOOL)isEqualToObject:(id)value; - -/*! -@method -@abstract Compare two JSValues using JavaScript's == operator. -*/ -- (BOOL)isEqualWithTypeCoercionToObject:(id)value; - -/*! -@method -@abstract Check if a JSValue is an instance of another object. -@discussion This method has the same function as the JavaScript operator instanceof. - If an object other than a JSValue is passed, it will first be converted according to - the aforementioned rules. -*/ -- (BOOL)isInstanceOf:(id)value; - -/*! -@methodgroup Calling Functions and Constructors -*/ -/*! -@method -@abstract Invoke a JSValue as a function. -@discussion In JavaScript, if a function doesn't explicitly return a value then it - implicitly returns the JavaScript value undefined. -@param arguments The arguments to pass to the function. -@result The return value of the function call. -*/ -- (JSValue *)callWithArguments:(NSArray *)arguments; - -/*! -@method -@abstract Invoke a JSValue as a constructor. -@discussion This is equivalent to using the new syntax in JavaScript. -@param arguments The arguments to pass to the constructor. -@result The return value of the constructor call. -*/ -- (JSValue *)constructWithArguments:(NSArray *)arguments; - -/*! -@method -@abstract Invoke a method on a JSValue. -@discussion Accesses the property named method from this value and - calls the resulting value as a function, passing this JSValue as the this - value along with the specified arguments. -@param method The name of the method to be invoked. -@param arguments The arguments to pass to the method. -@result The return value of the method call. -*/ -- (JSValue *)invokeMethod:(NSString *)method withArguments:(NSArray *)arguments; - -@end - -/*! -@category -@discussion Objective-C methods exported to JavaScript may have argument and/or return - values of struct types, provided that conversion to and from the struct is - supported by JSValue. Support is provided for any types where JSValue - contains both a class method valueWith:inContext:, and and instance - method to- where the string in these selector names match, - with the first argument to the former being of the same struct type as the - return type of the latter. - Support is provided for structs of type CGPoint, NSRange, CGRect and CGSize. -*/ -@interface JSValue (StructSupport) - -/*! -@method -@abstract Create a JSValue from a CGPoint. -@result A newly allocated JavaScript object containing properties - named x and y, with values from the CGPoint. -*/ -+ (JSValue *)valueWithPoint:(CGPoint)point inContext:(JSContext *)context; - -/*! -@method -@abstract Create a JSValue from a NSRange. -@result A newly allocated JavaScript object containing properties - named location and length, with values from the NSRange. -*/ -+ (JSValue *)valueWithRange:(NSRange)range inContext:(JSContext *)context; - -/*! -@method -@abstract -Create a JSValue from a CGRect. -@result A newly allocated JavaScript object containing properties - named x, y, width, and height, with values from the CGRect. -*/ -+ (JSValue *)valueWithRect:(CGRect)rect inContext:(JSContext *)context; - -/*! -@method -@abstract Create a JSValue from a CGSize. -@result A newly allocated JavaScript object containing properties - named width and height, with values from the CGSize. -*/ -+ (JSValue *)valueWithSize:(CGSize)size inContext:(JSContext *)context; - -/*! -@method -@abstract Convert a JSValue to a CGPoint. -@discussion Reads the properties named x and y from - this JSValue, and converts the results to double. -@result The new CGPoint. -*/ -- (CGPoint)toPoint; - -/*! -@method -@abstract Convert a JSValue to an NSRange. -@discussion Reads the properties named location and - length from this JSValue and converts the results to double. -@result The new NSRange. -*/ -- (NSRange)toRange; - -/*! -@method -@abstract Convert a JSValue to a CGRect. -@discussion Reads the properties named x, y, - width, and height from this JSValue and converts the results to double. -@result The new CGRect. -*/ -- (CGRect)toRect; - -/*! -@method -@abstract Convert a JSValue to a CGSize. -@discussion Reads the properties named width and - height from this JSValue and converts the results to double. -@result The new CGSize. -*/ -- (CGSize)toSize; - -@end - -/*! -@category -@discussion Instances of JSValue implement the following methods in order to enable - support for subscript access by key and index, for example: - -@textblock - JSValue *objectA, *objectB; - JSValue *v1 = object[@"X"]; // Get value for property "X" from 'object'. - JSValue *v2 = object[42]; // Get value for index 42 from 'object'. - object[@"Y"] = v1; // Assign 'v1' to property "Y" of 'object'. - object[101] = v2; // Assign 'v2' to index 101 of 'object'. -@/textblock - - An object key passed as a subscript will be converted to a JavaScript value, - and then the value converted to a string used as a property name. -*/ -@interface JSValue (SubscriptSupport) - -- (JSValue *)objectForKeyedSubscript:(id)key; -- (JSValue *)objectAtIndexedSubscript:(NSUInteger)index; -- (void)setObject:(id)object forKeyedSubscript:(NSObject *)key; -- (void)setObject:(id)object atIndexedSubscript:(NSUInteger)index; - -@end - -/*! -@category -@discussion These functions are for bridging between the C API and the Objective-C API. -*/ -@interface JSValue (JSValueRefSupport) - -/*! -@method -@abstract Creates a JSValue, wrapping its C API counterpart. -@param value -@param context -@result The Objective-C API equivalent of the specified JSValueRef. -*/ -+ (JSValue *)valueWithJSValueRef:(JSValueRef)value inContext:(JSContext *)context; - -/*! -@property -@abstract Returns the C API counterpart wrapped by a JSContext. -@result The C API equivalent of this JSValue. -*/ -@property (readonly) JSValueRef JSValueRef; -@end - -#ifdef __cplusplus -extern "C" { -#endif - -/*! -@group Property Descriptor Constants -@discussion These keys may assist in creating a property descriptor for use with the - defineProperty method on JSValue. - Property descriptors must fit one of three descriptions: - - Data Descriptor: - - A descriptor containing one or both of the keys value and writable, - and optionally containing one or both of the keys enumerable and - configurable. A data descriptor may not contain either the get or - set key. - A data descriptor may be used to create or modify the attributes of a - data property on an object (replacing any existing accessor property). - - Accessor Descriptor: - - A descriptor containing one or both of the keys get and set, and - optionally containing one or both of the keys enumerable and - configurable. An accessor descriptor may not contain either the value - or writable key. - An accessor descriptor may be used to create or modify the attributes of - an accessor property on an object (replacing any existing data property). - - Generic Descriptor: - - A descriptor containing one or both of the keys enumerable and - configurable. A generic descriptor may not contain any of the keys - value, writable, get, or set. - A generic descriptor may be used to modify the attributes of an existing - data or accessor property, or to create a new data property. -*/ -/*! -@const -*/ -JS_EXPORT extern NSString * const JSPropertyDescriptorWritableKey; -/*! -@const -*/ -JS_EXPORT extern NSString * const JSPropertyDescriptorEnumerableKey; -/*! -@const -*/ -JS_EXPORT extern NSString * const JSPropertyDescriptorConfigurableKey; -/*! -@const -*/ -JS_EXPORT extern NSString * const JSPropertyDescriptorValueKey; -/*! -@const -*/ -JS_EXPORT extern NSString * const JSPropertyDescriptorGetKey; -/*! -@const -*/ -JS_EXPORT extern NSString * const JSPropertyDescriptorSetKey; - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif - -#endif // JSValue_h diff --git a/Source/JavaScriptCore/API/JSValueInternal.h b/Source/JavaScriptCore/API/JSValueInternal.h deleted file mode 100644 index 4f1a8f69c..000000000 --- a/Source/JavaScriptCore/API/JSValueInternal.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSValueInternal_h -#define JSValueInternal_h - -#import -#import - -#if JSC_OBJC_API_ENABLED - -@interface JSValue(Internal) - -JSValueRef valueInternalValue(JSValue *); - -- (JSValue *)initWithValue:(JSValueRef)value inContext:(JSContext *)context; - -JSValueRef objectToValue(JSContext *, id); -id valueToObject(JSContext *, JSValueRef); -id valueToNumber(JSGlobalContextRef, JSValueRef, JSValueRef* exception); -id valueToString(JSGlobalContextRef, JSValueRef, JSValueRef* exception); -id valueToDate(JSGlobalContextRef, JSValueRef, JSValueRef* exception); -id valueToArray(JSGlobalContextRef, JSValueRef, JSValueRef* exception); -id valueToDictionary(JSGlobalContextRef, JSValueRef, JSValueRef* exception); - -+ (SEL)selectorForStructToValue:(const char *)structTag; -+ (SEL)selectorForValueToStruct:(const char *)structTag; - -@end - -NSInvocation *typeToValueInvocationFor(const char* encodedType); -NSInvocation *valueToTypeInvocationFor(const char* encodedType); - -#endif - -#endif // JSValueInternal_h diff --git a/Source/JavaScriptCore/API/JSValueRef.cpp b/Source/JavaScriptCore/API/JSValueRef.cpp index 54405e2af..3e0cbbd7a 100644 --- a/Source/JavaScriptCore/API/JSValueRef.cpp +++ b/Source/JavaScriptCore/API/JSValueRef.cpp @@ -10,69 +10,46 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 - * 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 "JSValueRef.h" #include "APICast.h" -#include "DateInstance.h" -#include "Exception.h" +#include "APIShims.h" #include "JSAPIWrapperObject.h" -#include "JSCInlines.h" #include "JSCJSValue.h" #include "JSCallbackObject.h" #include "JSGlobalObject.h" #include "JSONObject.h" #include "JSString.h" #include "LiteralParser.h" +#include "Operations.h" #include "Protect.h" -#include + #include #include #include +#include // for std::min + #if PLATFORM(MAC) #include #endif -#if ENABLE(REMOTE_INSPECTOR) -#include "JSGlobalObjectInspectorController.h" -#endif - using namespace JSC; -enum class ExceptionStatus { - DidThrow, - DidNotThrow -}; - -static ExceptionStatus handleExceptionIfNeeded(ExecState* exec, JSValueRef* returnedExceptionRef) -{ - if (exec->hadException()) { - Exception* exception = exec->exception(); - if (returnedExceptionRef) - *returnedExceptionRef = toRef(exec, exception->value()); - exec->clearException(); -#if ENABLE(REMOTE_INSPECTOR) - exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exception); -#endif - return ExceptionStatus::DidThrow; - } - return ExceptionStatus::DidNotThrow; -} - #if PLATFORM(MAC) static bool evernoteHackNeeded() { @@ -91,7 +68,7 @@ static bool evernoteHackNeeded() return kJSTypeUndefined; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsValue = toJS(exec, value); @@ -116,9 +93,10 @@ bool JSValueIsUndefined(JSContextRef ctx, JSValueRef value) return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); - return toJS(exec, value).isUndefined(); + JSValue jsValue = toJS(exec, value); + return jsValue.isUndefined(); } bool JSValueIsNull(JSContextRef ctx, JSValueRef value) @@ -128,9 +106,10 @@ bool JSValueIsNull(JSContextRef ctx, JSValueRef value) return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); - return toJS(exec, value).isNull(); + JSValue jsValue = toJS(exec, value); + return jsValue.isNull(); } bool JSValueIsBoolean(JSContextRef ctx, JSValueRef value) @@ -140,9 +119,10 @@ bool JSValueIsBoolean(JSContextRef ctx, JSValueRef value) return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); - return toJS(exec, value).isBoolean(); + JSValue jsValue = toJS(exec, value); + return jsValue.isBoolean(); } bool JSValueIsNumber(JSContextRef ctx, JSValueRef value) @@ -152,9 +132,10 @@ bool JSValueIsNumber(JSContextRef ctx, JSValueRef value) return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); - return toJS(exec, value).isNumber(); + JSValue jsValue = toJS(exec, value); + return jsValue.isNumber(); } bool JSValueIsString(JSContextRef ctx, JSValueRef value) @@ -164,9 +145,10 @@ bool JSValueIsString(JSContextRef ctx, JSValueRef value) return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); - return toJS(exec, value).isString(); + JSValue jsValue = toJS(exec, value); + return jsValue.isString(); } bool JSValueIsObject(JSContextRef ctx, JSValueRef value) @@ -176,33 +158,10 @@ bool JSValueIsObject(JSContextRef ctx, JSValueRef value) return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); - - return toJS(exec, value).isObject(); -} - -bool JSValueIsArray(JSContextRef ctx, JSValueRef value) -{ - if (!ctx) { - ASSERT_NOT_REACHED(); - return false; - } - ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); - - return toJS(exec, value).inherits(JSArray::info()); -} - -bool JSValueIsDate(JSContextRef ctx, JSValueRef value) -{ - if (!ctx) { - ASSERT_NOT_REACHED(); - return false; - } - ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); - return toJS(exec, value).inherits(DateInstance::info()); + JSValue jsValue = toJS(exec, value); + return jsValue.isObject(); } bool JSValueIsObjectOfClass(JSContextRef ctx, JSValueRef value, JSClassRef jsClass) @@ -212,14 +171,11 @@ bool JSValueIsObjectOfClass(JSContextRef ctx, JSValueRef value, JSClassRef jsCla return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsValue = toJS(exec, value); if (JSObject* o = jsValue.getObject()) { - if (o->inherits(JSProxy::info())) - o = jsCast(o)->target(); - if (o->inherits(JSCallbackObject::info())) return jsCast*>(o)->inherits(jsClass); if (o->inherits(JSCallbackObject::info())) @@ -239,14 +195,17 @@ bool JSValueIsEqual(JSContextRef ctx, JSValueRef a, JSValueRef b, JSValueRef* ex return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsA = toJS(exec, a); JSValue jsB = toJS(exec, b); bool result = JSValue::equal(exec, jsA, jsB); // false if an exception is thrown - handleExceptionIfNeeded(exec, exception); - + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); + } return result; } @@ -257,7 +216,7 @@ bool JSValueIsStrictEqual(JSContextRef ctx, JSValueRef a, JSValueRef b) return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsA = toJS(exec, a); JSValue jsB = toJS(exec, b); @@ -272,7 +231,7 @@ bool JSValueIsInstanceOfConstructor(JSContextRef ctx, JSValueRef value, JSObject return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsValue = toJS(exec, value); @@ -280,7 +239,11 @@ bool JSValueIsInstanceOfConstructor(JSContextRef ctx, JSValueRef value, JSObject if (!jsConstructor->structure()->typeInfo().implementsHasInstance()) return false; bool result = jsConstructor->hasInstance(exec, jsValue); // false if an exception is thrown - handleExceptionIfNeeded(exec, exception); + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); + } return result; } @@ -291,7 +254,7 @@ JSValueRef JSValueMakeUndefined(JSContextRef ctx) return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); return toRef(exec, jsUndefined()); } @@ -303,7 +266,7 @@ JSValueRef JSValueMakeNull(JSContextRef ctx) return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); return toRef(exec, jsNull()); } @@ -315,7 +278,7 @@ JSValueRef JSValueMakeBoolean(JSContextRef ctx, bool value) return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); return toRef(exec, jsBoolean(value)); } @@ -327,9 +290,15 @@ JSValueRef JSValueMakeNumber(JSContextRef ctx, double value) return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); - return toRef(exec, jsNumber(purifyNaN(value))); + // Our JSValue representation relies on a standard bit pattern for NaN. NaNs + // generated internally to JavaScriptCore naturally have that representation, + // but an external NaN might not. + if (std::isnan(value)) + value = QNaN; + + return toRef(exec, jsNumber(value)); } JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef string) @@ -339,9 +308,9 @@ JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef string) return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); - return toRef(exec, jsString(exec, string ? string->string() : String())); + return toRef(exec, jsString(exec, string->string())); } JSValueRef JSValueMakeFromJSONString(JSContextRef ctx, JSStringRef string) @@ -351,14 +320,14 @@ JSValueRef JSValueMakeFromJSONString(JSContextRef ctx, JSStringRef string) return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); String str = string->string(); unsigned length = str.length(); - if (!length || str.is8Bit()) { + if (length && str.is8Bit()) { LiteralParser parser(exec, str.characters8(), length, StrictJSON); return toRef(exec, parser.tryLiteralParse()); } - LiteralParser parser(exec, str.characters16(), length, StrictJSON); + LiteralParser parser(exec, str.deprecatedCharacters(), length, StrictJSON); return toRef(exec, parser.tryLiteralParse()); } @@ -369,13 +338,17 @@ JSStringRef JSValueCreateJSONString(JSContextRef ctx, JSValueRef apiValue, unsig return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue value = toJS(exec, apiValue); String result = JSONStringify(exec, value, indent); if (exception) *exception = 0; - if (handleExceptionIfNeeded(exec, exception) == ExceptionStatus::DidThrow) + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); return 0; + } return OpaqueJSString::create(result).leakRef(); } @@ -386,7 +359,7 @@ bool JSValueToBoolean(JSContextRef ctx, JSValueRef value) return false; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsValue = toJS(exec, value); return jsValue.toBoolean(exec); @@ -396,16 +369,20 @@ double JSValueToNumber(JSContextRef ctx, JSValueRef value, JSValueRef* exception { if (!ctx) { ASSERT_NOT_REACHED(); - return PNaN; + return QNaN; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsValue = toJS(exec, value); double number = jsValue.toNumber(exec); - if (handleExceptionIfNeeded(exec, exception) == ExceptionStatus::DidThrow) - number = PNaN; + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); + number = QNaN; + } return number; } @@ -416,13 +393,17 @@ JSStringRef JSValueToStringCopy(JSContextRef ctx, JSValueRef value, JSValueRef* return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsValue = toJS(exec, value); RefPtr stringRef(OpaqueJSString::create(jsValue.toString(exec)->value(exec))); - if (handleExceptionIfNeeded(exec, exception) == ExceptionStatus::DidThrow) - stringRef = nullptr; + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); + stringRef.clear(); + } return stringRef.release().leakRef(); } @@ -433,15 +414,19 @@ JSObjectRef JSValueToObject(JSContextRef ctx, JSValueRef value, JSValueRef* exce return 0; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsValue = toJS(exec, value); JSObjectRef objectRef = toRef(jsValue.toObject(exec)); - if (handleExceptionIfNeeded(exec, exception) == ExceptionStatus::DidThrow) + if (exec->hadException()) { + if (exception) + *exception = toRef(exec, exec->exception()); + exec->clearException(); objectRef = 0; + } return objectRef; -} +} void JSValueProtect(JSContextRef ctx, JSValueRef value) { @@ -450,7 +435,7 @@ void JSValueProtect(JSContextRef ctx, JSValueRef value) return; } ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsValue = toJSForGC(exec, value); gcProtect(jsValue); @@ -464,7 +449,7 @@ void JSValueUnprotect(JSContextRef ctx, JSValueRef value) #endif ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); + APIEntryShim entryShim(exec); JSValue jsValue = toJSForGC(exec, value); gcUnprotect(jsValue); diff --git a/Source/JavaScriptCore/API/JSValueRef.h b/Source/JavaScriptCore/API/JSValueRef.h index 9c4fa58cd..97385c01e 100644 --- a/Source/JavaScriptCore/API/JSValueRef.h +++ b/Source/JavaScriptCore/API/JSValueRef.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -129,24 +129,6 @@ JS_EXPORT bool JSValueIsObject(JSContextRef ctx, JSValueRef value); */ JS_EXPORT bool JSValueIsObjectOfClass(JSContextRef ctx, JSValueRef value, JSClassRef jsClass); -/*! -@function -@abstract Tests whether a JavaScript value is an array. -@param ctx The execution context to use. -@param value The JSValue to test. -@result true if value is an array, otherwise false. -*/ -JS_EXPORT bool JSValueIsArray(JSContextRef ctx, JSValueRef value) CF_AVAILABLE(10_11, 9_0); - -/*! -@function -@abstract Tests whether a JavaScript value is a date. -@param ctx The execution context to use. -@param value The JSValue to test. -@result true if value is a date, otherwise false. -*/ -JS_EXPORT bool JSValueIsDate(JSContextRef ctx, JSValueRef value) CF_AVAILABLE(10_11, 9_0); - /* Comparing values */ /*! diff --git a/Source/JavaScriptCore/API/JSVirtualMachine.h b/Source/JavaScriptCore/API/JSVirtualMachine.h deleted file mode 100644 index ccf9264d5..000000000 --- a/Source/JavaScriptCore/API/JSVirtualMachine.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import - -#if JSC_OBJC_API_ENABLED - -/*! -@interface -@discussion An instance of JSVirtualMachine represents a single JavaScript "object space" - or set of execution resources. Thread safety is supported by locking the - virtual machine, with concurrent JavaScript execution supported by allocating - separate instances of JSVirtualMachine. -*/ -NS_CLASS_AVAILABLE(10_9, 7_0) -@interface JSVirtualMachine : NSObject - -/*! -@methodgroup Creating New Virtual Machines -*/ -/*! -@method -@abstract Create a new JSVirtualMachine. -*/ -- (instancetype)init; - -/*! -@methodgroup Memory Management -*/ -/*! -@method -@abstract Notify the JSVirtualMachine of an external object relationship. -@discussion Allows clients of JSVirtualMachine to make the JavaScript runtime aware of - arbitrary external Objective-C object graphs. The runtime can then use - this information to retain any JavaScript values that are referenced - from somewhere in said object graph. - - For correct behavior clients must make their external object graphs - reachable from within the JavaScript runtime. If an Objective-C object is - reachable from within the JavaScript runtime, all managed references - transitively reachable from it as recorded using - -addManagedReference:withOwner: will be scanned by the garbage collector. -@param object The object that the owner points to. -@param owner The object that owns the pointed to object. -*/ -- (void)addManagedReference:(id)object withOwner:(id)owner; - -/*! -@method -@abstract Notify the JSVirtualMachine that a previous object relationship no longer exists. -@discussion The JavaScript runtime will continue to scan any references that were - reported to it by -addManagedReference:withOwner: until those references are removed. -@param object The object that was formerly owned. -@param owner The former owner. -*/ -- (void)removeManagedReference:(id)object withOwner:(id)owner; - -@end - -#endif diff --git a/Source/JavaScriptCore/API/JSVirtualMachineInternal.h b/Source/JavaScriptCore/API/JSVirtualMachineInternal.h deleted file mode 100644 index 5a4fbefa5..000000000 --- a/Source/JavaScriptCore/API/JSVirtualMachineInternal.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSVirtualMachineInternal_h -#define JSVirtualMachineInternal_h - -#if JSC_OBJC_API_ENABLED - -#import - -namespace JSC { -class VM; -class SlotVisitor; -} - -#if defined(__OBJC__) -@class NSMapTable; - -@interface JSVirtualMachine(Internal) - -JSContextGroupRef getGroupFromVirtualMachine(JSVirtualMachine *); - -+ (JSVirtualMachine *)virtualMachineWithContextGroupRef:(JSContextGroupRef)group; - -- (JSContext *)contextForGlobalContextRef:(JSGlobalContextRef)globalContext; -- (void)addContext:(JSContext *)wrapper forGlobalContextRef:(JSGlobalContextRef)globalContext; - -- (NSMapTable *)externalObjectGraph; - -@end -#endif // defined(__OBJC__) - -void scanExternalObjectGraph(JSC::VM&, JSC::SlotVisitor&, void* root); -void scanExternalRememberedSet(JSC::VM&, JSC::SlotVisitor&); - -#endif // JSC_OBJC_API_ENABLED - -#endif // JSVirtualMachineInternal_h diff --git a/Source/JavaScriptCore/API/JSWeakObjectMapRefInternal.h b/Source/JavaScriptCore/API/JSWeakObjectMapRefInternal.h index 9037947d7..f7b91da51 100644 --- a/Source/JavaScriptCore/API/JSWeakObjectMapRefInternal.h +++ b/Source/JavaScriptCore/API/JSWeakObjectMapRefInternal.h @@ -41,9 +41,9 @@ typedef JSC::WeakGCMap WeakMapType; struct OpaqueJSWeakObjectMap : public RefCounted { public: - static Ref create(JSC::VM& vm, void* data, JSWeakMapDestroyedCallback callback) + static PassRefPtr create(void* data, JSWeakMapDestroyedCallback callback) { - return adoptRef(*new OpaqueJSWeakObjectMap(vm, data, callback)); + return adoptRef(new OpaqueJSWeakObjectMap(data, callback)); } WeakMapType& map() { return m_map; } @@ -54,9 +54,8 @@ public: } private: - OpaqueJSWeakObjectMap(JSC::VM& vm, void* data, JSWeakMapDestroyedCallback callback) - : m_map(vm) - , m_data(data) + OpaqueJSWeakObjectMap(void* data, JSWeakMapDestroyedCallback callback) + : m_data(data) , m_callback(callback) { } diff --git a/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp b/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp deleted file mode 100644 index 925c00f0b..000000000 --- a/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (C) 2010 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#include "config.h" -#include "JSWeakObjectMapRefPrivate.h" - -#include "APICast.h" -#include "JSCJSValue.h" -#include "JSCallbackObject.h" -#include "JSWeakObjectMapRefInternal.h" -#include "JSCInlines.h" -#include "Weak.h" -#include "WeakGCMapInlines.h" -#include -#include - -using namespace WTF; -using namespace JSC; - -#ifdef __cplusplus -extern "C" { -#endif - -JSWeakObjectMapRef JSWeakObjectMapCreate(JSContextRef context, void* privateData, JSWeakMapDestroyedCallback callback) -{ - ExecState* exec = toJS(context); - JSLockHolder locker(exec); - RefPtr map = OpaqueJSWeakObjectMap::create(exec->vm(), privateData, callback); - exec->lexicalGlobalObject()->registerWeakMap(map.get()); - return map.get(); -} - -void JSWeakObjectMapSet(JSContextRef ctx, JSWeakObjectMapRef map, void* key, JSObjectRef object) -{ - if (!ctx) { - ASSERT_NOT_REACHED(); - return; - } - ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); - JSObject* obj = toJS(object); - if (!obj) - return; - ASSERT(obj->inherits(JSProxy::info()) - || obj->inherits(JSCallbackObject::info()) - || obj->inherits(JSCallbackObject::info())); - map->map().set(key, obj); -} - -JSObjectRef JSWeakObjectMapGet(JSContextRef ctx, JSWeakObjectMapRef map, void* key) -{ - if (!ctx) { - ASSERT_NOT_REACHED(); - return 0; - } - ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); - return toRef(jsCast(map->map().get(key))); -} - -void JSWeakObjectMapRemove(JSContextRef ctx, JSWeakObjectMapRef map, void* key) -{ - if (!ctx) { - ASSERT_NOT_REACHED(); - return; - } - ExecState* exec = toJS(ctx); - JSLockHolder locker(exec); - map->map().remove(key); -} - -// We need to keep this function in the build to keep the nightlies running. -JS_EXPORT bool JSWeakObjectMapClear(JSContextRef, JSWeakObjectMapRef, void*, JSObjectRef); -bool JSWeakObjectMapClear(JSContextRef, JSWeakObjectMapRef, void*, JSObjectRef) -{ - return true; -} - -#ifdef __cplusplus -} -#endif diff --git a/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.h b/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.h deleted file mode 100644 index 5a07cf7c4..000000000 --- a/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (C) 2010 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#ifndef JSWeakObjectMapRefPrivate_h -#define JSWeakObjectMapRefPrivate_h - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/*! @typedef JSWeakObjectMapRef A weak map for storing JSObjectRefs */ -typedef struct OpaqueJSWeakObjectMap* JSWeakObjectMapRef; - -/*! - @typedef JSWeakMapDestroyedCallback - @abstract The callback invoked when a JSWeakObjectMapRef is being destroyed. - @param map The map that is being destroyed. - @param data The private data (if any) that was associated with the map instance. - */ -typedef void (*JSWeakMapDestroyedCallback)(JSWeakObjectMapRef map, void* data); - -/*! - @function - @abstract Creates a weak value map that can be used to reference user defined objects without preventing them from being collected. - @param ctx The execution context to use. - @param data A void* to set as the map's private data. Pass NULL to specify no private data. - @param destructor A function to call when the weak map is destroyed. - @result A JSWeakObjectMapRef bound to the given context, data and destructor. - @discussion The JSWeakObjectMapRef can be used as a storage mechanism to hold custom JS objects without forcing those objects to - remain live as JSValueProtect would. - */ -JS_EXPORT JSWeakObjectMapRef JSWeakObjectMapCreate(JSContextRef ctx, void* data, JSWeakMapDestroyedCallback destructor); - -/*! - @function - @abstract Associates a JSObjectRef with the given key in a JSWeakObjectMap. - @param ctx The execution context to use. - @param map The map to operate on. - @param key The key to associate a weak reference with. - @param object The user defined object to associate with the key. - */ -JS_EXPORT void JSWeakObjectMapSet(JSContextRef ctx, JSWeakObjectMapRef map, void* key, JSObjectRef); - -/*! - @function - @abstract Retrieves the JSObjectRef associated with a key. - @param ctx The execution context to use. - @param map The map to query. - @param key The key to search for. - @result Either the live object associated with the provided key, or NULL. - */ -JS_EXPORT JSObjectRef JSWeakObjectMapGet(JSContextRef ctx, JSWeakObjectMapRef map, void* key); - -/*! - @function - @abstract Removes the entry for the given key if the key is present, otherwise it has no effect. - @param ctx The execution context to use. - @param map The map to use. - @param key The key to remove. - */ -JS_EXPORT void JSWeakObjectMapRemove(JSContextRef ctx, JSWeakObjectMapRef map, void* key); - -#ifdef __cplusplus -} -#endif - -#endif // JSWeakObjectMapPrivate_h diff --git a/Source/JavaScriptCore/API/JSWrapperMap.h b/Source/JavaScriptCore/API/JSWrapperMap.h deleted file mode 100644 index c6aa1af13..000000000 --- a/Source/JavaScriptCore/API/JSWrapperMap.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import -#import -#import - -#if JSC_OBJC_API_ENABLED - -@interface JSWrapperMap : NSObject - -- (id)initWithContext:(JSContext *)context; - -- (JSValue *)jsWrapperForObject:(id)object; - -- (JSValue *)objcWrapperForJSValueRef:(JSValueRef)value; - -@end - -id tryUnwrapObjcObject(JSGlobalContextRef, JSValueRef); - -bool supportsInitMethodConstructors(); -Protocol *getJSExportProtocol(); -Class getNSBlockClass(); - -#endif diff --git a/Source/JavaScriptCore/API/JavaScript.h b/Source/JavaScriptCore/API/JavaScript.h index ffe7b83fc..f8d92d8f9 100644 --- a/Source/JavaScriptCore/API/JavaScript.h +++ b/Source/JavaScriptCore/API/JavaScript.h @@ -11,10 +11,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 diff --git a/Source/JavaScriptCore/API/JavaScriptCore.h b/Source/JavaScriptCore/API/JavaScriptCore.h deleted file mode 100644 index b2fde1dbe..000000000 --- a/Source/JavaScriptCore/API/JavaScriptCore.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JavaScriptCore_h -#define JavaScriptCore_h - -#include -#include - -#if defined(__OBJC__) && JSC_OBJC_API_ENABLED - -#import "JSContext.h" -#import "JSValue.h" -#import "JSManagedValue.h" -#import "JSVirtualMachine.h" -#import "JSExport.h" - -#endif - -#endif /* JavaScriptCore_h */ diff --git a/Source/JavaScriptCore/API/ObjCCallbackFunction.h b/Source/JavaScriptCore/API/ObjCCallbackFunction.h index adb167c76..046bf650d 100644 --- a/Source/JavaScriptCore/API/ObjCCallbackFunction.h +++ b/Source/JavaScriptCore/API/ObjCCallbackFunction.h @@ -48,7 +48,7 @@ class ObjCCallbackFunction : public InternalFunction { public: typedef InternalFunction Base; - static ObjCCallbackFunction* create(VM&, JSGlobalObject*, const String& name, std::unique_ptr); + static ObjCCallbackFunction* create(VM&, JSGlobalObject*, const String& name, PassOwnPtr); static void destroy(JSCell*); static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype) @@ -62,7 +62,7 @@ public: ObjCCallbackFunctionImpl* impl() const { return m_impl.get(); } protected: - ObjCCallbackFunction(VM&, JSGlobalObject*, JSObjectCallAsFunctionCallback, JSObjectCallAsConstructorCallback, std::unique_ptr); + ObjCCallbackFunction(VM&, JSGlobalObject*, JSObjectCallAsFunctionCallback, JSObjectCallAsConstructorCallback, PassOwnPtr); private: static CallType getCallData(JSCell*, CallData&); @@ -73,7 +73,7 @@ private: JSObjectCallAsFunctionCallback m_functionCallback; JSObjectCallAsConstructorCallback m_constructCallback; - std::unique_ptr m_impl; + OwnPtr m_impl; }; } // namespace JSC diff --git a/Source/JavaScriptCore/API/ObjcRuntimeExtras.h b/Source/JavaScriptCore/API/ObjcRuntimeExtras.h deleted file mode 100644 index 128df5c90..000000000 --- a/Source/JavaScriptCore/API/ObjcRuntimeExtras.h +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import -#import -#import -#import - -inline bool protocolImplementsProtocol(Protocol *candidate, Protocol *target) -{ - unsigned protocolProtocolsCount; - Protocol ** protocolProtocols = protocol_copyProtocolList(candidate, &protocolProtocolsCount); - for (unsigned i = 0; i < protocolProtocolsCount; ++i) { - if (protocol_isEqual(protocolProtocols[i], target)) { - free(protocolProtocols); - return true; - } - } - free(protocolProtocols); - return false; -} - -inline void forEachProtocolImplementingProtocol(Class cls, Protocol *target, void (^callback)(Protocol *)) -{ - ASSERT(cls); - ASSERT(target); - - Vector worklist; - HashSet visited; - - // Initially fill the worklist with the Class's protocols. - unsigned protocolsCount; - Protocol ** protocols = class_copyProtocolList(cls, &protocolsCount); - worklist.append(protocols, protocolsCount); - free(protocols); - - while (!worklist.isEmpty()) { - Protocol *protocol = worklist.last(); - worklist.removeLast(); - - // Are we encountering this Protocol for the first time? - if (!visited.add(protocol).isNewEntry) - continue; - - // If it implements the protocol, make the callback. - if (protocolImplementsProtocol(protocol, target)) - callback(protocol); - - // Add incorporated protocols to the worklist. - protocols = protocol_copyProtocolList(protocol, &protocolsCount); - worklist.append(protocols, protocolsCount); - free(protocols); - } -} - -inline void forEachMethodInClass(Class cls, void (^callback)(Method)) -{ - unsigned count; - Method* methods = class_copyMethodList(cls, &count); - for (unsigned i = 0; i < count; ++i) - callback(methods[i]); - free(methods); -} - -inline void forEachMethodInProtocol(Protocol *protocol, BOOL isRequiredMethod, BOOL isInstanceMethod, void (^callback)(SEL, const char*)) -{ - unsigned count; - struct objc_method_description* methods = protocol_copyMethodDescriptionList(protocol, isRequiredMethod, isInstanceMethod, &count); - for (unsigned i = 0; i < count; ++i) - callback(methods[i].name, methods[i].types); - free(methods); -} - -inline void forEachPropertyInProtocol(Protocol *protocol, void (^callback)(objc_property_t)) -{ - unsigned count; - objc_property_t* properties = protocol_copyPropertyList(protocol, &count); - for (unsigned i = 0; i < count; ++i) - callback(properties[i]); - free(properties); -} - -template -void skipPair(const char*& position) -{ - size_t count = 1; - do { - char c = *position++; - if (!c) - @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:@"Malformed type encoding" userInfo:nil]; - if (c == open) - ++count; - else if (c == close) - --count; - } while (count); -} - -class StringRange { - WTF_MAKE_NONCOPYABLE(StringRange); -public: - StringRange(const char* begin, const char* end) : m_ptr(strndup(begin, end - begin)) { } - ~StringRange() { free(m_ptr); } - operator const char*() const { return m_ptr; } - const char* get() const { return m_ptr; } - -private: - char* m_ptr; -}; - -class StructBuffer { - WTF_MAKE_NONCOPYABLE(StructBuffer); -public: - StructBuffer(const char* encodedType) - { - NSUInteger size, alignment; - NSGetSizeAndAlignment(encodedType, &size, &alignment); - --alignment; - m_allocation = static_cast(malloc(size + alignment)); - m_buffer = reinterpret_cast((reinterpret_cast(m_allocation) + alignment) & ~alignment); - } - - ~StructBuffer() { free(m_allocation); } - operator void*() const { return m_buffer; } - -private: - void* m_allocation; - void* m_buffer; -}; - -template -typename DelegateType::ResultType parseObjCType(const char*& position) -{ - ASSERT(*position); - - switch (*position++) { - case 'c': - return DelegateType::template typeInteger(); - case 'i': - return DelegateType::template typeInteger(); - case 's': - return DelegateType::template typeInteger(); - case 'l': - return DelegateType::template typeInteger(); - case 'q': - return DelegateType::template typeDouble(); - case 'C': - return DelegateType::template typeInteger(); - case 'I': - return DelegateType::template typeInteger(); - case 'S': - return DelegateType::template typeInteger(); - case 'L': - return DelegateType::template typeInteger(); - case 'Q': - return DelegateType::template typeDouble(); - case 'f': - return DelegateType::template typeDouble(); - case 'd': - return DelegateType::template typeDouble(); - case 'B': - return DelegateType::typeBool(); - case 'v': - return DelegateType::typeVoid(); - - case '@': { // An object (whether statically typed or typed id) - if (position[0] == '?' && position[1] == '<') { - position += 2; - const char* begin = position; - skipPair<'<','>'>(position); - return DelegateType::typeBlock(begin, position - 1); - } - - if (*position == '"') { - const char* begin = position + 1; - const char* protocolPosition = strchr(begin, '<'); - const char* endOfType = strchr(begin, '"'); - position = endOfType + 1; - - // There's no protocol involved in this type, so just handle the class name. - if (!protocolPosition || protocolPosition > endOfType) - return DelegateType::typeOfClass(begin, endOfType); - // We skipped the class name and went straight to the protocol, so this is an id type. - if (begin == protocolPosition) - return DelegateType::typeId(); - // We have a class name with a protocol. For now, ignore the protocol. - return DelegateType::typeOfClass(begin, protocolPosition); - } - - return DelegateType::typeId(); - } - - case '{': { // {name=type...} A structure - const char* begin = position - 1; - skipPair<'{','}'>(position); - return DelegateType::typeStruct(begin, position); - } - - // NOT supporting C strings, arrays, pointers, unions, bitfields, function pointers. - case '*': // A character string (char *) - case '[': // [array type] An array - case '(': // (name=type...) A union - case 'b': // bnum A bit field of num bits - case '^': // ^type A pointer to type - case '?': // An unknown type (among other things, this code is used for function pointers) - // NOT supporting Objective-C Class, SEL - case '#': // A class object (Class) - case ':': // A method selector (SEL) - default: - return nil; - } -} - -extern "C" { - // Forward declare some Objective-C runtime internal methods that are not API. - const char *_protocol_getMethodTypeEncoding(Protocol *, SEL, BOOL isRequiredMethod, BOOL isInstanceMethod); - id objc_initWeak(id *, id); - void objc_destroyWeak(id *); - bool _Block_has_signature(void *); - const char * _Block_signature(void *); -} diff --git a/Source/JavaScriptCore/API/OpaqueJSString.cpp b/Source/JavaScriptCore/API/OpaqueJSString.cpp index 07a79ad99..5cc2e0ab8 100644 --- a/Source/JavaScriptCore/API/OpaqueJSString.cpp +++ b/Source/JavaScriptCore/API/OpaqueJSString.cpp @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -28,13 +28,11 @@ #include "CallFrame.h" #include "Identifier.h" -#include "IdentifierInlines.h" #include "JSGlobalObject.h" -#include using namespace JSC; -RefPtr OpaqueJSString::create(const String& string) +PassRefPtr OpaqueJSString::create(const String& string) { if (string.isNull()) return nullptr; @@ -49,7 +47,7 @@ OpaqueJSString::~OpaqueJSString() if (!characters) return; - if (!m_string.is8Bit() && m_string.characters16() == characters) + if (!m_string.is8Bit() && m_string.deprecatedCharacters() == characters) return; fastFree(characters); @@ -57,26 +55,32 @@ OpaqueJSString::~OpaqueJSString() String OpaqueJSString::string() const { + if (!this) + return String(); + // Return a copy of the wrapped string, because the caller may make it an Identifier. return m_string.isolatedCopy(); } Identifier OpaqueJSString::identifier(VM* vm) const { - if (m_string.isNull()) + if (!this || m_string.isNull()) return Identifier(); if (m_string.isEmpty()) return Identifier(Identifier::EmptyIdentifier); if (m_string.is8Bit()) - return Identifier::fromString(vm, m_string.characters8(), m_string.length()); + return Identifier(vm, m_string.characters8(), m_string.length()); - return Identifier::fromString(vm, m_string.characters16(), m_string.length()); + return Identifier(vm, m_string.characters16(), m_string.length()); } const UChar* OpaqueJSString::characters() { + if (!this) + return nullptr; + // m_characters is put in a local here to avoid an extra atomic load. UChar* characters = m_characters; if (characters) @@ -87,7 +91,12 @@ const UChar* OpaqueJSString::characters() unsigned length = m_string.length(); UChar* newCharacters = static_cast(fastMalloc(length * sizeof(UChar))); - StringView(m_string).getCharactersWithUpconvert(newCharacters); + + if (m_string.is8Bit()) { + for (size_t i = 0; i < length; ++i) + newCharacters[i] = m_string.characters8()[i]; + } else + memcpy(newCharacters, m_string.characters16(), length * sizeof(UChar)); if (!m_characters.compare_exchange_strong(characters, newCharacters)) { fastFree(newCharacters); diff --git a/Source/JavaScriptCore/API/OpaqueJSString.h b/Source/JavaScriptCore/API/OpaqueJSString.h index 208131b3b..f1dd6a43d 100644 --- a/Source/JavaScriptCore/API/OpaqueJSString.h +++ b/Source/JavaScriptCore/API/OpaqueJSString.h @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -36,29 +36,29 @@ namespace JSC { } struct OpaqueJSString : public ThreadSafeRefCounted { - static Ref create() + static PassRefPtr create() { - return adoptRef(*new OpaqueJSString); + return adoptRef(new OpaqueJSString); } - static Ref create(const LChar* characters, unsigned length) + static PassRefPtr create(const LChar* characters, unsigned length) { - return adoptRef(*new OpaqueJSString(characters, length)); + return adoptRef(new OpaqueJSString(characters, length)); } - static Ref create(const UChar* characters, unsigned length) + static PassRefPtr create(const UChar* characters, unsigned length) { - return adoptRef(*new OpaqueJSString(characters, length)); + return adoptRef(new OpaqueJSString(characters, length)); } - JS_EXPORT_PRIVATE static RefPtr create(const String&); + JS_EXPORT_PRIVATE static PassRefPtr create(const String&); JS_EXPORT_PRIVATE ~OpaqueJSString(); - bool is8Bit() { return m_string.is8Bit(); } - const LChar* characters8() { return m_string.characters8(); } - const UChar* characters16() { return m_string.characters16(); } - unsigned length() { return m_string.length(); } + bool is8Bit() { return this ? m_string.is8Bit() : false; } + const LChar* characters8() { return this ? m_string.characters8() : nullptr; } + const UChar* characters16() { return this ? m_string.characters16() : nullptr; } + unsigned length() { return this ? m_string.length() : 0; } const UChar* characters(); diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h index 28b3af4ee..6af619825 100644 --- a/Source/JavaScriptCore/API/WebKitAvailability.h +++ b/Source/JavaScriptCore/API/WebKitAvailability.h @@ -27,43 +27,8 @@ #define __WebKitAvailability__ #if defined(__APPLE__) && !defined(BUILDING_GTK__) - #include #include - -#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 -/* To support availability macros that mention newer OS X versions when building on older OS X versions, - we provide our own definitions of the underlying macros that the availability macros expand to. We're - free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with - an application rather than as part of the system. -*/ - -#ifndef __NSi_10_10 // Building from trunk rather than SDK. -#define __NSi_10_10 introduced=10.0 // Use 10.0 to indicate that everything is available. -#endif - -#ifndef __NSi_10_11 // Building from trunk rather than SDK. -#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available. -#endif - -#ifndef __AVAILABILITY_INTERNAL__MAC_10_9 -#define __AVAILABILITY_INTERNAL__MAC_10_9 -#endif - -#ifndef __AVAILABILITY_INTERNAL__MAC_10_10 -#define __AVAILABILITY_INTERNAL__MAC_10_10 -#endif - -#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER -#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER -#endif - -#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER -#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER -#endif - -#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */ - #else #define CF_AVAILABLE(_mac, _ios) #endif diff --git a/Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp b/Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp deleted file mode 100644 index c78d47da4..000000000 --- a/Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (C) 2015 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#include "config.h" -#include "CompareAndSwapTest.h" - -#include -#include -#include - -class Bitmap { -public: - Bitmap() { clearAll(); } - - inline void clearAll(); - inline bool concurrentTestAndSet(size_t n); - inline size_t numBits() const { return words * wordSize; } - -private: - static const size_t Size = 4096*10; - - static const unsigned wordSize = sizeof(uint8_t) * 8; - static const unsigned words = (Size + wordSize - 1) / wordSize; - static const uint8_t one = 1; - - uint8_t bits[words]; -}; - -inline void Bitmap::clearAll() -{ - memset(&bits, 0, sizeof(bits)); -} - -inline bool Bitmap::concurrentTestAndSet(size_t n) -{ - uint8_t mask = one << (n % wordSize); - size_t index = n / wordSize; - uint8_t* wordPtr = &bits[index]; - uint8_t oldValue; - do { - oldValue = *wordPtr; - if (oldValue & mask) - return true; - } while (!WTF::weakCompareAndSwap(wordPtr, oldValue, oldValue | mask)); - return false; -} - -struct Data { - Bitmap* bitmap; - int id; - int numThreads; -}; - -static void setBitThreadFunc(void* p) -{ - Data* data = reinterpret_cast(p); - Bitmap* bitmap = data->bitmap; - size_t numBits = bitmap->numBits(); - - // The computed start index here is heuristic that seems to maximize (anecdotally) - // the chance for the CAS issue to manifest. - size_t start = (numBits * (data->numThreads - data->id)) / data->numThreads; - - printf(" started Thread %d\n", data->id); - for (size_t i = start; i < numBits; i++) - while (!bitmap->concurrentTestAndSet(i)) { } - for (size_t i = 0; i < start; i++) - while (!bitmap->concurrentTestAndSet(i)) { } - - printf(" finished Thread %d\n", data->id); -} - -void testCompareAndSwap() -{ - Bitmap bitmap; - const int numThreads = 5; - ThreadIdentifier threadIDs[numThreads]; - Data data[numThreads]; - - WTF::initializeThreading(); - - printf("Starting %d threads for CompareAndSwap test. Test should complete without hanging.\n", numThreads); - for (int i = 0; i < numThreads; i++) { - data[i].bitmap = &bitmap; - data[i].id = i; - data[i].numThreads = numThreads; - std::function threadFunc = std::bind(setBitThreadFunc, &data[i]); - threadIDs[i] = createThread("setBitThreadFunc", threadFunc); - } - - printf("Waiting for %d threads to join\n", numThreads); - for (int i = 0; i < numThreads; i++) - waitForThreadCompletion(threadIDs[i]); - - printf("PASS: CompareAndSwap test completed without a hang\n"); -} diff --git a/Source/JavaScriptCore/API/tests/CompareAndSwapTest.h b/Source/JavaScriptCore/API/tests/CompareAndSwapTest.h deleted file mode 100644 index 73fa0de13..000000000 --- a/Source/JavaScriptCore/API/tests/CompareAndSwapTest.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2015 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#ifndef CompareAndSwapTest_h -#define CompareAndSwapTest_h - -#ifdef __cplusplus -extern "C" { -#endif - -/* Regression test for webkit.org/b/142513 */ -void testCompareAndSwap(); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* CompareAndSwapTest_h */ diff --git a/Source/JavaScriptCore/API/tests/CurrentThisInsideBlockGetterTest.h b/Source/JavaScriptCore/API/tests/CurrentThisInsideBlockGetterTest.h deleted file mode 100644 index f228333c4..000000000 --- a/Source/JavaScriptCore/API/tests/CurrentThisInsideBlockGetterTest.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2013 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#ifndef CurrentThisInsideBlockGetterTest_h -#define CurrentThisInsideBlockGetterTest_h - -#include - -#if JSC_OBJC_API_ENABLED - -void currentThisInsideBlockGetterTest(); - -#endif // JSC_OBJC_API_ENABLED - - -#endif // CurrentThisInsideBlockGetterTest_h diff --git a/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.c b/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.c deleted file mode 100644 index 62e63978e..000000000 --- a/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (C) 2014 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "CustomGlobalObjectClassTest.h" - -#include -#include -#include - -extern bool assertTrue(bool value, const char* message); - -static bool executedCallback = false; - -static JSValueRef jsDoSomething(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argc, const JSValueRef args[], JSValueRef* exception) -{ - (void)function; - (void)thisObject; - (void)argc; - (void)args; - (void)exception; - executedCallback = true; - return JSValueMakeNull(ctx); -} - -static JSStaticFunction bridgedFunctions[] = { - {"doSomething", jsDoSomething, kJSPropertyAttributeDontDelete}, - {0, 0, 0}, -}; - -static JSClassRef bridgedObjectClass = NULL; -static JSClassDefinition bridgedClassDef; - -static JSClassRef jsClassRef() -{ - if (!bridgedObjectClass) { - bridgedClassDef = kJSClassDefinitionEmpty; - bridgedClassDef.className = "BridgedObject"; - bridgedClassDef.staticFunctions = bridgedFunctions; - bridgedObjectClass = JSClassCreate(&bridgedClassDef); - } - return bridgedObjectClass; -} - -void customGlobalObjectClassTest() -{ - JSClassRef bridgedObjectJsClassRef = jsClassRef(); - JSGlobalContextRef globalContext = JSGlobalContextCreate(bridgedObjectJsClassRef); - - JSObjectRef globalObj = JSContextGetGlobalObject(globalContext); - - JSPropertyNameArrayRef propertyNames = JSObjectCopyPropertyNames(globalContext, globalObj); - size_t propertyCount = JSPropertyNameArrayGetCount(propertyNames); - assertTrue(propertyCount == 1, "Property count == 1"); - - JSStringRef propertyNameRef = JSPropertyNameArrayGetNameAtIndex(propertyNames, 0); - size_t propertyNameLength = JSStringGetLength(propertyNameRef); - size_t bufferSize = sizeof(char) * (propertyNameLength + 1); - char* buffer = (char*)malloc(bufferSize); - JSStringGetUTF8CString(propertyNameRef, buffer, bufferSize); - buffer[propertyNameLength] = '\0'; - assertTrue(!strncmp(buffer, "doSomething", propertyNameLength), "First property name is doSomething"); - free(buffer); - - bool hasMethod = JSObjectHasProperty(globalContext, globalObj, propertyNameRef); - assertTrue(hasMethod, "Property found by name"); - - JSValueRef doSomethingProperty = - JSObjectGetProperty(globalContext, globalObj, propertyNameRef, NULL); - assertTrue(!JSValueIsUndefined(globalContext, doSomethingProperty), "Property is defined"); - - bool globalObjectClassMatchesClassRef = JSValueIsObjectOfClass(globalContext, globalObj, bridgedObjectJsClassRef); - assertTrue(globalObjectClassMatchesClassRef, "Global object is the right class"); - - JSStringRef script = JSStringCreateWithUTF8CString("doSomething();"); - JSEvaluateScript(globalContext, script, NULL, NULL, 1, NULL); - JSStringRelease(script); - - assertTrue(executedCallback, "Executed custom global object callback"); -} - -void globalObjectSetPrototypeTest() -{ - JSClassDefinition definition = kJSClassDefinitionEmpty; - definition.className = "Global"; - JSClassRef global = JSClassCreate(&definition); - JSGlobalContextRef context = JSGlobalContextCreate(global); - JSObjectRef object = JSContextGetGlobalObject(context); - - JSObjectRef above = JSObjectMake(context, 0, 0); - JSStringRef test = JSStringCreateWithUTF8CString("test"); - JSValueRef value = JSValueMakeString(context, test); - JSObjectSetProperty(context, above, test, value, kJSPropertyAttributeDontEnum, 0); - - JSObjectSetPrototype(context, object, above); - JSStringRef script = JSStringCreateWithUTF8CString("test === \"test\""); - JSValueRef result = JSEvaluateScript(context, script, 0, 0, 0, 0); - - assertTrue(JSValueToBoolean(context, result), "test === \"test\""); - - JSStringRelease(test); - JSStringRelease(script); -} - -void globalObjectPrivatePropertyTest() -{ - JSClassDefinition definition = kJSClassDefinitionEmpty; - definition.className = "Global"; - JSClassRef global = JSClassCreate(&definition); - JSGlobalContextRef context = JSGlobalContextCreate(global); - JSObjectRef globalObject = JSContextGetGlobalObject(context); - - JSStringRef privateName = JSStringCreateWithUTF8CString("private"); - JSValueRef privateValue = JSValueMakeString(context, privateName); - assertTrue(JSObjectSetPrivateProperty(context, globalObject, privateName, privateValue), "JSObjectSetPrivateProperty succeeded"); - JSValueRef result = JSObjectGetPrivateProperty(context, globalObject, privateName); - assertTrue(JSValueIsStrictEqual(context, privateValue, result), "privateValue === \"private\""); - - assertTrue(JSObjectDeletePrivateProperty(context, globalObject, privateName), "JSObjectDeletePrivateProperty succeeded"); - result = JSObjectGetPrivateProperty(context, globalObject, privateName); - assertTrue(JSValueIsNull(context, result), "Deleted private property is indeed no longer present"); - - JSStringRelease(privateName); -} diff --git a/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.h b/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.h deleted file mode 100644 index 86914ca6f..000000000 --- a/Source/JavaScriptCore/API/tests/CustomGlobalObjectClassTest.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2014 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. ``AS IS'' AND ANY - * 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 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef CustomGlobalObjectClassTest_h -#define CustomGlobalObjectClassTest_h - -void customGlobalObjectClassTest(void); -void globalObjectSetPrototypeTest(void); -void globalObjectPrivatePropertyTest(void); - -#endif // CustomGlobalObjectClassTest_h diff --git a/Source/JavaScriptCore/API/tests/DateTests.h b/Source/JavaScriptCore/API/tests/DateTests.h deleted file mode 100644 index eeb47a165..000000000 --- a/Source/JavaScriptCore/API/tests/DateTests.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2014 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#import - -#if JSC_OBJC_API_ENABLED - -void runDateTests(); - -#endif // JSC_OBJC_API_ENABLED diff --git a/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp b/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp deleted file mode 100644 index 4ecac8ec3..000000000 --- a/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp +++ /dev/null @@ -1,332 +0,0 @@ -/* - * Copyright (C) 2015 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#include "config.h" -#include "ExecutionTimeLimitTest.h" - -#include "InitializeThreading.h" -#include "JSContextRefPrivate.h" -#include "JavaScriptCore.h" -#include "Options.h" -#include -#include -#include - -using namespace std::chrono; -using JSC::Options; - -static JSGlobalContextRef context = nullptr; - -static JSValueRef currentCPUTimeAsJSFunctionCallback(JSContextRef ctx, JSObjectRef functionObject, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) -{ - UNUSED_PARAM(functionObject); - UNUSED_PARAM(thisObject); - UNUSED_PARAM(argumentCount); - UNUSED_PARAM(arguments); - UNUSED_PARAM(exception); - - ASSERT(JSContextGetGlobalContext(ctx) == context); - return JSValueMakeNumber(ctx, currentCPUTime().count() / 1000000.); -} - -bool shouldTerminateCallbackWasCalled = false; -static bool shouldTerminateCallback(JSContextRef, void*) -{ - shouldTerminateCallbackWasCalled = true; - return true; -} - -bool cancelTerminateCallbackWasCalled = false; -static bool cancelTerminateCallback(JSContextRef, void*) -{ - cancelTerminateCallbackWasCalled = true; - return false; -} - -int extendTerminateCallbackCalled = 0; -static bool extendTerminateCallback(JSContextRef ctx, void*) -{ - extendTerminateCallbackCalled++; - if (extendTerminateCallbackCalled == 1) { - JSContextGroupRef contextGroup = JSContextGetGroup(ctx); - JSContextGroupSetExecutionTimeLimit(contextGroup, .200f, extendTerminateCallback, 0); - return false; - } - return true; -} - -struct TierOptions { - const char* tier; - unsigned timeLimitAdjustmentMillis; - const char* optionsStr; -}; - -static void testResetAfterTimeout(bool& failed) -{ - JSValueRef v = nullptr; - JSValueRef exception = nullptr; - const char* reentryScript = "100"; - JSStringRef script = JSStringCreateWithUTF8CString(reentryScript); - v = JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception); - if (exception) { - printf("FAIL: Watchdog timeout was not reset.\n"); - failed = true; - } else if (!JSValueIsNumber(context, v) || JSValueToNumber(context, v, nullptr) != 100) { - printf("FAIL: Script result is not as expected.\n"); - failed = true; - } -} - -int testExecutionTimeLimit() -{ - static const TierOptions tierOptionsList[] = { - { "LLINT", 0, "--enableConcurrentJIT=false --useLLInt=true --useJIT=false" }, - { "Baseline", 0, "--enableConcurrentJIT=false --useLLInt=true --useJIT=true --useDFGJIT=false" }, - { "DFG", 0, "--enableConcurrentJIT=false --useLLInt=true --useJIT=true --useDFGJIT=true --useFTLJIT=false" }, - { "FTL", 200, "--enableConcurrentJIT=false --useLLInt=true --useJIT=true --useDFGJIT=true --useFTLJIT=true" }, - }; - - bool failed = false; - - JSC::initializeThreading(); - Options::initialize(); // Ensure options is initialized first. - - for (auto tierOptions : tierOptionsList) { - StringBuilder savedOptionsBuilder; - Options::dumpAllOptionsInALine(savedOptionsBuilder); - - Options::setOptions(tierOptions.optionsStr); - - unsigned tierAdjustmentMillis = tierOptions.timeLimitAdjustmentMillis; - double timeLimit; - - context = JSGlobalContextCreateInGroup(nullptr, nullptr); - - JSContextGroupRef contextGroup = JSContextGetGroup(context); - JSObjectRef globalObject = JSContextGetGlobalObject(context); - ASSERT(JSValueIsObject(context, globalObject)); - - JSValueRef scriptResult = nullptr; - JSValueRef exception = nullptr; - - JSStringRef currentCPUTimeStr = JSStringCreateWithUTF8CString("currentCPUTime"); - JSObjectRef currentCPUTimeFunction = JSObjectMakeFunctionWithCallback(context, currentCPUTimeStr, currentCPUTimeAsJSFunctionCallback); - JSObjectSetProperty(context, globalObject, currentCPUTimeStr, currentCPUTimeFunction, kJSPropertyAttributeNone, nullptr); - JSStringRelease(currentCPUTimeStr); - - /* Test script timeout: */ - timeLimit = (100 + tierAdjustmentMillis) / 1000.0; - JSContextGroupSetExecutionTimeLimit(contextGroup, timeLimit, shouldTerminateCallback, 0); - { - unsigned timeAfterWatchdogShouldHaveFired = 150 + tierAdjustmentMillis; - - StringBuilder scriptBuilder; - scriptBuilder.append("function foo() { var startTime = currentCPUTime(); while (true) { for (var i = 0; i < 1000; i++); if (currentCPUTime() - startTime > "); - scriptBuilder.appendNumber(timeAfterWatchdogShouldHaveFired / 1000.0); - scriptBuilder.append(") break; } } foo();"); - - JSStringRef script = JSStringCreateWithUTF8CString(scriptBuilder.toString().utf8().data()); - exception = nullptr; - shouldTerminateCallbackWasCalled = false; - auto startTime = currentCPUTime(); - scriptResult = JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception); - auto endTime = currentCPUTime(); - - if (((endTime - startTime) < milliseconds(timeAfterWatchdogShouldHaveFired)) && shouldTerminateCallbackWasCalled) - printf("PASS: %s script timed out as expected.\n", tierOptions.tier); - else { - if ((endTime - startTime) >= milliseconds(timeAfterWatchdogShouldHaveFired)) - printf("FAIL: %s script did not time out as expected.\n", tierOptions.tier); - if (!shouldTerminateCallbackWasCalled) - printf("FAIL: %s script timeout callback was not called.\n", tierOptions.tier); - failed = true; - } - - if (!exception) { - printf("FAIL: %s TerminatedExecutionException was not thrown.\n", tierOptions.tier); - failed = true; - } - - testResetAfterTimeout(failed); - } - - /* Test the script timeout's TerminatedExecutionException should NOT be catchable: */ - timeLimit = (100 + tierAdjustmentMillis) / 1000.0; - JSContextGroupSetExecutionTimeLimit(contextGroup, timeLimit, shouldTerminateCallback, 0); - { - unsigned timeAfterWatchdogShouldHaveFired = 150 + tierAdjustmentMillis; - - StringBuilder scriptBuilder; - scriptBuilder.append("function foo() { var startTime = currentCPUTime(); try { while (true) { for (var i = 0; i < 1000; i++); if (currentCPUTime() - startTime > "); - scriptBuilder.appendNumber(timeAfterWatchdogShouldHaveFired / 1000.0); - scriptBuilder.append(") break; } } catch(e) { } } foo();"); - - JSStringRef script = JSStringCreateWithUTF8CString(scriptBuilder.toString().utf8().data()); - exception = nullptr; - shouldTerminateCallbackWasCalled = false; - - auto startTime = currentCPUTime(); - scriptResult = JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception); - auto endTime = currentCPUTime(); - - if (((endTime - startTime) >= milliseconds(timeAfterWatchdogShouldHaveFired)) || !shouldTerminateCallbackWasCalled) { - if (!((endTime - startTime) < milliseconds(timeAfterWatchdogShouldHaveFired))) - printf("FAIL: %s script did not time out as expected.\n", tierOptions.tier); - if (!shouldTerminateCallbackWasCalled) - printf("FAIL: %s script timeout callback was not called.\n", tierOptions.tier); - failed = true; - } - - if (exception) - printf("PASS: %s TerminatedExecutionException was not catchable as expected.\n", tierOptions.tier); - else { - printf("FAIL: %s TerminatedExecutionException was caught.\n", tierOptions.tier); - failed = true; - } - - testResetAfterTimeout(failed); - } - - /* Test script timeout with no callback: */ - timeLimit = (100 + tierAdjustmentMillis) / 1000.0; - JSContextGroupSetExecutionTimeLimit(contextGroup, timeLimit, 0, 0); - { - unsigned timeAfterWatchdogShouldHaveFired = 150 + tierAdjustmentMillis; - - StringBuilder scriptBuilder; - scriptBuilder.append("function foo() { var startTime = currentCPUTime(); while (true) { for (var i = 0; i < 1000; i++); if (currentCPUTime() - startTime > "); - scriptBuilder.appendNumber(timeAfterWatchdogShouldHaveFired / 1000.0); - scriptBuilder.append(") break; } } foo();"); - - JSStringRef script = JSStringCreateWithUTF8CString(scriptBuilder.toString().utf8().data()); - exception = nullptr; - shouldTerminateCallbackWasCalled = false; - - auto startTime = currentCPUTime(); - scriptResult = JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception); - auto endTime = currentCPUTime(); - - if (((endTime - startTime) < milliseconds(timeAfterWatchdogShouldHaveFired)) && !shouldTerminateCallbackWasCalled) - printf("PASS: %s script timed out as expected when no callback is specified.\n", tierOptions.tier); - else { - if ((endTime - startTime) >= milliseconds(timeAfterWatchdogShouldHaveFired)) - printf("FAIL: %s script did not time out as expected when no callback is specified.\n", tierOptions.tier); - else - printf("FAIL: %s script called stale callback function.\n", tierOptions.tier); - failed = true; - } - - if (!exception) { - printf("FAIL: %s TerminatedExecutionException was not thrown.\n", tierOptions.tier); - failed = true; - } - - testResetAfterTimeout(failed); - } - - /* Test script timeout cancellation: */ - timeLimit = (100 + tierAdjustmentMillis) / 1000.0; - JSContextGroupSetExecutionTimeLimit(contextGroup, timeLimit, cancelTerminateCallback, 0); - { - unsigned timeAfterWatchdogShouldHaveFired = 150 + tierAdjustmentMillis; - - StringBuilder scriptBuilder; - scriptBuilder.append("function foo() { var startTime = currentCPUTime(); while (true) { for (var i = 0; i < 1000; i++); if (currentCPUTime() - startTime > "); - scriptBuilder.appendNumber(timeAfterWatchdogShouldHaveFired / 1000.0); - scriptBuilder.append(") break; } } foo();"); - - JSStringRef script = JSStringCreateWithUTF8CString(scriptBuilder.toString().utf8().data()); - exception = nullptr; - cancelTerminateCallbackWasCalled = false; - - auto startTime = currentCPUTime(); - scriptResult = JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception); - auto endTime = currentCPUTime(); - - if (((endTime - startTime) >= milliseconds(timeAfterWatchdogShouldHaveFired)) && cancelTerminateCallbackWasCalled && !exception) - printf("PASS: %s script timeout was cancelled as expected.\n", tierOptions.tier); - else { - if (((endTime - startTime) < milliseconds(timeAfterWatchdogShouldHaveFired)) || exception) - printf("FAIL: %s script timeout was not cancelled.\n", tierOptions.tier); - if (!cancelTerminateCallbackWasCalled) - printf("FAIL: %s script timeout callback was not called.\n", tierOptions.tier); - failed = true; - } - - if (exception) { - printf("FAIL: %s Unexpected TerminatedExecutionException thrown.\n", tierOptions.tier); - failed = true; - } - } - - /* Test script timeout extension: */ - timeLimit = (100 + tierAdjustmentMillis) / 1000.0; - JSContextGroupSetExecutionTimeLimit(contextGroup, timeLimit, extendTerminateCallback, 0); - { - unsigned timeBeforeExtendedDeadline = 200 + tierAdjustmentMillis; - unsigned timeAfterExtendedDeadline = 400 + tierAdjustmentMillis; - unsigned maxBusyLoopTime = 600 + tierAdjustmentMillis; - - StringBuilder scriptBuilder; - scriptBuilder.append("function foo() { var startTime = currentCPUTime(); while (true) { for (var i = 0; i < 1000; i++); if (currentCPUTime() - startTime > "); - scriptBuilder.appendNumber(maxBusyLoopTime / 1000.0); // in seconds. - scriptBuilder.append(") break; } } foo();"); - - JSStringRef script = JSStringCreateWithUTF8CString(scriptBuilder.toString().utf8().data()); - exception = nullptr; - extendTerminateCallbackCalled = 0; - - auto startTime = currentCPUTime(); - scriptResult = JSEvaluateScript(context, script, nullptr, nullptr, 1, &exception); - auto endTime = currentCPUTime(); - auto deltaTime = endTime - startTime; - - if ((deltaTime >= milliseconds(timeBeforeExtendedDeadline)) && (deltaTime < milliseconds(timeAfterExtendedDeadline)) && (extendTerminateCallbackCalled == 2) && exception) - printf("PASS: %s script timeout was extended as expected.\n", tierOptions.tier); - else { - if (deltaTime < milliseconds(timeBeforeExtendedDeadline)) - printf("FAIL: %s script timeout was not extended as expected.\n", tierOptions.tier); - else if (deltaTime >= milliseconds(timeAfterExtendedDeadline)) - printf("FAIL: %s script did not timeout.\n", tierOptions.tier); - - if (extendTerminateCallbackCalled < 1) - printf("FAIL: %s script timeout callback was not called.\n", tierOptions.tier); - if (extendTerminateCallbackCalled < 2) - printf("FAIL: %s script timeout callback was not called after timeout extension.\n", tierOptions.tier); - - if (!exception) - printf("FAIL: %s TerminatedExecutionException was not thrown during timeout extension test.\n", tierOptions.tier); - - failed = true; - } - } - - JSGlobalContextRelease(context); - - Options::setOptions(savedOptionsBuilder.toString().ascii().data()); - } - - return failed; -} diff --git a/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.h b/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.h deleted file mode 100644 index 8294a86a6..000000000 --- a/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2015 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#ifndef ExecutionTimeLimitTest_h -#define ExecutionTimeLimitTest_h - -#ifdef __cplusplus -extern "C" { -#endif - -/* Returns 1 if failures were encountered. Else, returns 0. */ -int testExecutionTimeLimit(); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* ExecutionTimeLimitTest_h */ diff --git a/Source/JavaScriptCore/API/tests/GlobalContextWithFinalizerTest.cpp b/Source/JavaScriptCore/API/tests/GlobalContextWithFinalizerTest.cpp deleted file mode 100644 index 7023bc365..000000000 --- a/Source/JavaScriptCore/API/tests/GlobalContextWithFinalizerTest.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2015 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#include "config.h" -#include "GlobalContextWithFinalizerTest.h" - -#include "JavaScriptCore.h" -#include - -static bool failed = true; - -static void finalize(JSObjectRef) -{ - failed = false; -} - -int testGlobalContextWithFinalizer() -{ - JSClassDefinition def = kJSClassDefinitionEmpty; - def.className = "testClass"; - def.finalize = finalize; - JSClassRef classRef = JSClassCreate(&def); - - JSGlobalContextRef ref = JSGlobalContextCreateInGroup(nullptr, classRef); - JSGlobalContextRelease(ref); - JSClassRelease(classRef); - - if (failed) - printf("FAIL: JSGlobalContextRef did not call its JSClassRef finalizer.\n"); - else - printf("PASS: JSGlobalContextRef called its JSClassRef finalizer as expected.\n"); - - return failed; -} diff --git a/Source/JavaScriptCore/API/tests/GlobalContextWithFinalizerTest.h b/Source/JavaScriptCore/API/tests/GlobalContextWithFinalizerTest.h deleted file mode 100644 index 55b439fff..000000000 --- a/Source/JavaScriptCore/API/tests/GlobalContextWithFinalizerTest.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2015 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#ifndef GlobalContextWithFinalizerTest_h -#define GlobalContextWithFinalizerTest_h - -#include "JSContextRefPrivate.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* Returns 1 if failures were encountered. Else, returns 0. */ -int testGlobalContextWithFinalizer(); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* GlobalContextWithFinalizerTest_h */ diff --git a/Source/JavaScriptCore/API/tests/JSExportTests.h b/Source/JavaScriptCore/API/tests/JSExportTests.h deleted file mode 100644 index 9d501ee7e..000000000 --- a/Source/JavaScriptCore/API/tests/JSExportTests.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2014 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#import -#import - -#if JSC_OBJC_API_ENABLED - -void runJSExportTests(); - -#endif // JSC_OBJC_API_ENABLED - diff --git a/Source/JavaScriptCore/API/tests/JSNode.c b/Source/JavaScriptCore/API/tests/JSNode.c index d0a0dc3ec..d9a40bea6 100644 --- a/Source/JavaScriptCore/API/tests/JSNode.c +++ b/Source/JavaScriptCore/API/tests/JSNode.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include - #include "JSNode.h" #include "JSNodeList.h" #include "JSObjectRef.h" diff --git a/Source/JavaScriptCore/API/tests/JSNode.h b/Source/JavaScriptCore/API/tests/JSNode.h index a6aee2f7b..7725733ca 100644 --- a/Source/JavaScriptCore/API/tests/JSNode.h +++ b/Source/JavaScriptCore/API/tests/JSNode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 diff --git a/Source/JavaScriptCore/API/tests/JSNodeList.c b/Source/JavaScriptCore/API/tests/JSNodeList.c index f037e094a..61d7041a4 100644 --- a/Source/JavaScriptCore/API/tests/JSNodeList.c +++ b/Source/JavaScriptCore/API/tests/JSNodeList.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -23,8 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include - #include "JSNode.h" #include "JSNodeList.h" #include "JSObjectRef.h" diff --git a/Source/JavaScriptCore/API/tests/JSNodeList.h b/Source/JavaScriptCore/API/tests/JSNodeList.h index d3eb52bb9..f9309142e 100644 --- a/Source/JavaScriptCore/API/tests/JSNodeList.h +++ b/Source/JavaScriptCore/API/tests/JSNodeList.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 diff --git a/Source/JavaScriptCore/API/tests/Node.c b/Source/JavaScriptCore/API/tests/Node.c index db687e952..913da0a2a 100644 --- a/Source/JavaScriptCore/API/tests/Node.c +++ b/Source/JavaScriptCore/API/tests/Node.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 diff --git a/Source/JavaScriptCore/API/tests/Node.h b/Source/JavaScriptCore/API/tests/Node.h index 41b5d493a..e9250b3ae 100644 --- a/Source/JavaScriptCore/API/tests/Node.h +++ b/Source/JavaScriptCore/API/tests/Node.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 diff --git a/Source/JavaScriptCore/API/tests/NodeList.c b/Source/JavaScriptCore/API/tests/NodeList.c index 69f4cd5c4..ae4c17062 100644 --- a/Source/JavaScriptCore/API/tests/NodeList.c +++ b/Source/JavaScriptCore/API/tests/NodeList.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 diff --git a/Source/JavaScriptCore/API/tests/NodeList.h b/Source/JavaScriptCore/API/tests/NodeList.h index 020b76f59..25b95bf4d 100644 --- a/Source/JavaScriptCore/API/tests/NodeList.h +++ b/Source/JavaScriptCore/API/tests/NodeList.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,10 +10,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 diff --git a/Source/JavaScriptCore/API/tests/Regress141275.h b/Source/JavaScriptCore/API/tests/Regress141275.h deleted file mode 100644 index bf3492afa..000000000 --- a/Source/JavaScriptCore/API/tests/Regress141275.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2015 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#import -#import - -#if JSC_OBJC_API_ENABLED - -void runRegress141275(); - -#endif // JSC_OBJC_API_ENABLED - diff --git a/Source/JavaScriptCore/API/tests/Regress141809.h b/Source/JavaScriptCore/API/tests/Regress141809.h deleted file mode 100644 index 43b099c94..000000000 --- a/Source/JavaScriptCore/API/tests/Regress141809.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2015 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * 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 INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY 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 INC. OR ITS 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. - */ - -#import -#import - -#if JSC_OBJC_API_ENABLED - -void runRegress141809(); - -#endif // JSC_OBJC_API_ENABLED - diff --git a/Source/JavaScriptCore/API/tests/minidom.c b/Source/JavaScriptCore/API/tests/minidom.c index 02b41a9c7..f4ccf91e4 100644 --- a/Source/JavaScriptCore/API/tests/minidom.c +++ b/Source/JavaScriptCore/API/tests/minidom.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. * Copyright (C) 2007 Alp Toker * * Redistribution and use in source and binary forms, with or without @@ -11,10 +11,10 @@ * 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 INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * 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 INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, 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 @@ -24,8 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include - #include "JSContextRef.h" #include "JSNode.h" #include "JSObjectRef.h" diff --git a/Source/JavaScriptCore/API/tests/minidom.html b/Source/JavaScriptCore/API/tests/minidom.html deleted file mode 100644 index 7ea474752..000000000 --- a/Source/JavaScriptCore/API/tests/minidom.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - 

-
-
diff --git a/Source/JavaScriptCore/API/tests/minidom.js b/Source/JavaScriptCore/API/tests/minidom.js
deleted file mode 100644
index 85134d7cb..000000000
--- a/Source/JavaScriptCore/API/tests/minidom.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    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 INC. ``AS IS'' AND ANY
- * 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 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
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-function shouldBe(a, b)
-{
-    var evalA;
-    try {
-        evalA = eval(a);
-    } catch(e) {
-        evalA = e;
-    }
-    
-    if (evalA == b || isNaN(evalA) && typeof evalA == 'number' && isNaN(b) && typeof b == 'number')
-        print("PASS: " + a + " should be " + b + " and is.", "green");
-    else
-        print("__FAIL__: " + a + " should be " + b + " but instead is " + evalA + ".", "red");
-}
-
-function test()
-{
-    print("Node is " + Node);
-    for (var p in Node)
-        print(p + ": " + Node[p]);
-    
-    node = new Node();
-    print("node is " + node);
-    for (var p in node)
-        print(p + ": " + node[p]);
-
-    child1 = new Node();
-    child2 = new Node();
-    child3 = new Node();
-    
-    node.appendChild(child1);
-    node.appendChild(child2);
-
-    var childNodes = node.childNodes;
-    
-    for (var i = 0; i < childNodes.length + 1; i++) {
-        print("item " + i + ": " + childNodes.item(i));
-    }
-    
-    for (var i = 0; i < childNodes.length + 1; i++) {
-        print(i + ": " + childNodes[i]);
-    }
-
-    node.removeChild(child1);
-    node.replaceChild(child3, child2);
-    
-    for (var i = 0; i < childNodes.length + 1; i++) {
-        print("item " + i + ": " + childNodes.item(i));
-    }
-
-    for (var i = 0; i < childNodes.length + 1; i++) {
-        print(i + ": " + childNodes[i]);
-    }
-
-    try {
-        node.appendChild(null);
-    } catch(e) {
-        print("caught: " + e);
-    }
-    
-    try {
-        var o = new Object();
-        o.appendChild = node.appendChild;
-        o.appendChild(node);
-    } catch(e) {
-        print("caught: " + e);
-    }
-    
-    try {
-        node.appendChild();
-    } catch(e) {
-        print("caught: " + e);
-    }
-    
-    oldNodeType = node.nodeType;
-    node.nodeType = 1;
-    shouldBe("node.nodeType", oldNodeType);
-    
-    shouldBe("node instanceof Node", true);
-    shouldBe("new Object() instanceof Node", false);
-    
-    print(Node);
-}
-
-test();
diff --git a/Source/JavaScriptCore/API/tests/testapi.c b/Source/JavaScriptCore/API/tests/testapi.c
deleted file mode 100644
index 81cbc408a..000000000
--- a/Source/JavaScriptCore/API/tests/testapi.c
+++ /dev/null
@@ -1,1993 +0,0 @@
-/*
- * Copyright (C) 2006, 2015 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    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 INC. ``AS IS'' AND ANY
- * 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 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
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include 
-
-#include "JavaScriptCore.h"
-#include "JSBasePrivate.h"
-#include "JSContextRefPrivate.h"
-#include "JSObjectRefPrivate.h"
-#include "JSScriptRefPrivate.h"
-#include "JSStringRefPrivate.h"
-#include 
-#define ASSERT_DISABLED 0
-#include 
-
-#if OS(WINDOWS)
-#include 
-#endif
-
-#include "CompareAndSwapTest.h"
-#include "CustomGlobalObjectClassTest.h"
-#include "GlobalContextWithFinalizerTest.h"
-
-#include "ExecutionTimeLimitTest.h"
-
-#if JSC_OBJC_API_ENABLED
-void testObjectiveCAPI(void);
-#endif
-
-bool assertTrue(bool value, const char* message);
-extern void JSSynchronousGarbageCollectForDebugging(JSContextRef);
-
-static JSGlobalContextRef context;
-int failed;
-static void assertEqualsAsBoolean(JSValueRef value, bool expectedValue)
-{
-    if (JSValueToBoolean(context, value) != expectedValue) {
-        fprintf(stderr, "assertEqualsAsBoolean failed: %p, %d\n", value, expectedValue);
-        failed = 1;
-    }
-}
-
-static void assertEqualsAsNumber(JSValueRef value, double expectedValue)
-{
-    double number = JSValueToNumber(context, value, NULL);
-
-    // FIXME  - On i386 the isnan(double) macro tries to map to the isnan(float) function,
-    // causing a build break with -Wshorten-64-to-32 enabled.  The issue is known by the appropriate team.
-    // After that's resolved, we can remove these casts
-    if (number != expectedValue && !(isnan((float)number) && isnan((float)expectedValue))) {
-        fprintf(stderr, "assertEqualsAsNumber failed: %p, %lf\n", value, expectedValue);
-        failed = 1;
-    }
-}
-
-static void assertEqualsAsUTF8String(JSValueRef value, const char* expectedValue)
-{
-    JSStringRef valueAsString = JSValueToStringCopy(context, value, NULL);
-
-    size_t jsSize = JSStringGetMaximumUTF8CStringSize(valueAsString);
-    char* jsBuffer = (char*)malloc(jsSize);
-    JSStringGetUTF8CString(valueAsString, jsBuffer, jsSize);
-
-    unsigned i;
-    for (i = 0; jsBuffer[i]; i++) {
-        if (jsBuffer[i] != expectedValue[i]) {
-            fprintf(stderr, "assertEqualsAsUTF8String failed at character %d: %c(%d) != %c(%d)\n", i, jsBuffer[i], jsBuffer[i], expectedValue[i], expectedValue[i]);
-            fprintf(stderr, "value: %s\n", jsBuffer);
-            fprintf(stderr, "expectedValue: %s\n", expectedValue);
-            failed = 1;
-        }
-    }
-
-    if (jsSize < strlen(jsBuffer) + 1) {
-        fprintf(stderr, "assertEqualsAsUTF8String failed: jsSize was too small\n");
-        failed = 1;
-    }
-
-    free(jsBuffer);
-    JSStringRelease(valueAsString);
-}
-
-static void assertEqualsAsCharactersPtr(JSValueRef value, const char* expectedValue)
-{
-    JSStringRef valueAsString = JSValueToStringCopy(context, value, NULL);
-
-    size_t jsLength = JSStringGetLength(valueAsString);
-    const JSChar* jsBuffer = JSStringGetCharactersPtr(valueAsString);
-
-    CFStringRef expectedValueAsCFString = CFStringCreateWithCString(kCFAllocatorDefault, 
-                                                                    expectedValue,
-                                                                    kCFStringEncodingUTF8);    
-    CFIndex cfLength = CFStringGetLength(expectedValueAsCFString);
-    UniChar* cfBuffer = (UniChar*)malloc(cfLength * sizeof(UniChar));
-    CFStringGetCharacters(expectedValueAsCFString, CFRangeMake(0, cfLength), cfBuffer);
-    CFRelease(expectedValueAsCFString);
-
-    if (memcmp(jsBuffer, cfBuffer, cfLength * sizeof(UniChar)) != 0) {
-        fprintf(stderr, "assertEqualsAsCharactersPtr failed: jsBuffer != cfBuffer\n");
-        failed = 1;
-    }
-    
-    if (jsLength != (size_t)cfLength) {
-#if OS(WINDOWS)
-        fprintf(stderr, "assertEqualsAsCharactersPtr failed: jsLength(%Iu) != cfLength(%Iu)\n", jsLength, (size_t)cfLength);
-#else
-        fprintf(stderr, "assertEqualsAsCharactersPtr failed: jsLength(%zu) != cfLength(%zu)\n", jsLength, (size_t)cfLength);
-#endif
-        failed = 1;
-    }
-
-    free(cfBuffer);
-    JSStringRelease(valueAsString);
-}
-
-static bool timeZoneIsPST()
-{
-    char timeZoneName[70];
-    struct tm gtm;
-    memset(>m, 0, sizeof(gtm));
-    strftime(timeZoneName, sizeof(timeZoneName), "%Z", >m);
-
-    return 0 == strcmp("PST", timeZoneName);
-}
-
-static JSValueRef jsGlobalValue; // non-stack value for testing JSValueProtect()
-
-/* MyObject pseudo-class */
-
-static bool MyObject_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(object);
-
-    if (JSStringIsEqualToUTF8CString(propertyName, "alwaysOne")
-        || JSStringIsEqualToUTF8CString(propertyName, "cantFind")
-        || JSStringIsEqualToUTF8CString(propertyName, "throwOnGet")
-        || JSStringIsEqualToUTF8CString(propertyName, "myPropertyName")
-        || JSStringIsEqualToUTF8CString(propertyName, "hasPropertyLie")
-        || JSStringIsEqualToUTF8CString(propertyName, "0")) {
-        return true;
-    }
-    
-    return false;
-}
-
-static JSValueRef MyObject_getProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(object);
-    
-    if (JSStringIsEqualToUTF8CString(propertyName, "alwaysOne")) {
-        return JSValueMakeNumber(context, 1);
-    }
-    
-    if (JSStringIsEqualToUTF8CString(propertyName, "myPropertyName")) {
-        return JSValueMakeNumber(context, 1);
-    }
-
-    if (JSStringIsEqualToUTF8CString(propertyName, "cantFind")) {
-        return JSValueMakeUndefined(context);
-    }
-    
-    if (JSStringIsEqualToUTF8CString(propertyName, "hasPropertyLie")) {
-        return 0;
-    }
-
-    if (JSStringIsEqualToUTF8CString(propertyName, "throwOnGet")) {
-        return JSEvaluateScript(context, JSStringCreateWithUTF8CString("throw 'an exception'"), object, JSStringCreateWithUTF8CString("test script"), 1, exception);
-    }
-
-    if (JSStringIsEqualToUTF8CString(propertyName, "0")) {
-        *exception = JSValueMakeNumber(context, 1);
-        return JSValueMakeNumber(context, 1);
-    }
-    
-    return JSValueMakeNull(context);
-}
-
-static bool MyObject_setProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSValueRef* exception)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(value);
-    UNUSED_PARAM(exception);
-
-    if (JSStringIsEqualToUTF8CString(propertyName, "cantSet"))
-        return true; // pretend we set the property in order to swallow it
-    
-    if (JSStringIsEqualToUTF8CString(propertyName, "throwOnSet")) {
-        JSEvaluateScript(context, JSStringCreateWithUTF8CString("throw 'an exception'"), object, JSStringCreateWithUTF8CString("test script"), 1, exception);
-    }
-    
-    return false;
-}
-
-static bool MyObject_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(object);
-    
-    if (JSStringIsEqualToUTF8CString(propertyName, "cantDelete"))
-        return true;
-    
-    if (JSStringIsEqualToUTF8CString(propertyName, "throwOnDelete")) {
-        JSEvaluateScript(context, JSStringCreateWithUTF8CString("throw 'an exception'"), object, JSStringCreateWithUTF8CString("test script"), 1, exception);
-        return false;
-    }
-
-    return false;
-}
-
-static void MyObject_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef propertyNames)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(object);
-    
-    JSStringRef propertyName;
-    
-    propertyName = JSStringCreateWithUTF8CString("alwaysOne");
-    JSPropertyNameAccumulatorAddName(propertyNames, propertyName);
-    JSStringRelease(propertyName);
-    
-    propertyName = JSStringCreateWithUTF8CString("myPropertyName");
-    JSPropertyNameAccumulatorAddName(propertyNames, propertyName);
-    JSStringRelease(propertyName);
-}
-
-static JSValueRef MyObject_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(thisObject);
-    UNUSED_PARAM(exception);
-
-    if (argumentCount > 0 && JSValueIsString(context, arguments[0]) && JSStringIsEqualToUTF8CString(JSValueToStringCopy(context, arguments[0], 0), "throwOnCall")) {
-        JSEvaluateScript(context, JSStringCreateWithUTF8CString("throw 'an exception'"), object, JSStringCreateWithUTF8CString("test script"), 1, exception);
-        return JSValueMakeUndefined(context);
-    }
-
-    if (argumentCount > 0 && JSValueIsStrictEqual(context, arguments[0], JSValueMakeNumber(context, 0)))
-        return JSValueMakeNumber(context, 1);
-    
-    return JSValueMakeUndefined(context);
-}
-
-static JSObjectRef MyObject_callAsConstructor(JSContextRef context, JSObjectRef object, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(object);
-
-    if (argumentCount > 0 && JSValueIsString(context, arguments[0]) && JSStringIsEqualToUTF8CString(JSValueToStringCopy(context, arguments[0], 0), "throwOnConstruct")) {
-        JSEvaluateScript(context, JSStringCreateWithUTF8CString("throw 'an exception'"), object, JSStringCreateWithUTF8CString("test script"), 1, exception);
-        return object;
-    }
-
-    if (argumentCount > 0 && JSValueIsStrictEqual(context, arguments[0], JSValueMakeNumber(context, 0)))
-        return JSValueToObject(context, JSValueMakeNumber(context, 1), exception);
-    
-    return JSValueToObject(context, JSValueMakeNumber(context, 0), exception);
-}
-
-static bool MyObject_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef possibleValue, JSValueRef* exception)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(constructor);
-
-    if (JSValueIsString(context, possibleValue) && JSStringIsEqualToUTF8CString(JSValueToStringCopy(context, possibleValue, 0), "throwOnHasInstance")) {
-        JSEvaluateScript(context, JSStringCreateWithUTF8CString("throw 'an exception'"), constructor, JSStringCreateWithUTF8CString("test script"), 1, exception);
-        return false;
-    }
-
-    JSStringRef numberString = JSStringCreateWithUTF8CString("Number");
-    JSObjectRef numberConstructor = JSValueToObject(context, JSObjectGetProperty(context, JSContextGetGlobalObject(context), numberString, exception), exception);
-    JSStringRelease(numberString);
-
-    return JSValueIsInstanceOfConstructor(context, possibleValue, numberConstructor, exception);
-}
-
-static JSValueRef MyObject_convertToType(JSContextRef context, JSObjectRef object, JSType type, JSValueRef* exception)
-{
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(exception);
-    
-    switch (type) {
-    case kJSTypeNumber:
-        return JSValueMakeNumber(context, 1);
-    case kJSTypeString:
-        {
-            JSStringRef string = JSStringCreateWithUTF8CString("MyObjectAsString");
-            JSValueRef result = JSValueMakeString(context, string);
-            JSStringRelease(string);
-            return result;
-        }
-    default:
-        break;
-    }
-
-    // string conversion -- forward to default object class
-    return JSValueMakeNull(context);
-}
-
-static JSValueRef MyObject_convertToTypeWrapper(JSContextRef context, JSObjectRef object, JSType type, JSValueRef* exception)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(type);
-    UNUSED_PARAM(exception);
-    // Forward to default object class
-    return 0;
-}
-
-static bool MyObject_set_nullGetForwardSet(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSValueRef* exception)
-{
-    UNUSED_PARAM(ctx);
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(propertyName);
-    UNUSED_PARAM(value);
-    UNUSED_PARAM(exception);
-    return false; // Forward to parent class.
-}
-
-static JSStaticValue evilStaticValues[] = {
-    { "nullGetSet", 0, 0, kJSPropertyAttributeNone },
-    { "nullGetForwardSet", 0, MyObject_set_nullGetForwardSet, kJSPropertyAttributeNone },
-    { 0, 0, 0, 0 }
-};
-
-static JSStaticFunction evilStaticFunctions[] = {
-    { "nullCall", 0, kJSPropertyAttributeNone },
-    { 0, 0, 0 }
-};
-
-JSClassDefinition MyObject_definition = {
-    0,
-    kJSClassAttributeNone,
-    
-    "MyObject",
-    NULL,
-    
-    evilStaticValues,
-    evilStaticFunctions,
-    
-    NULL,
-    NULL,
-    MyObject_hasProperty,
-    MyObject_getProperty,
-    MyObject_setProperty,
-    MyObject_deleteProperty,
-    MyObject_getPropertyNames,
-    MyObject_callAsFunction,
-    MyObject_callAsConstructor,
-    MyObject_hasInstance,
-    MyObject_convertToType,
-};
-
-JSClassDefinition MyObject_convertToTypeWrapperDefinition = {
-    0,
-    kJSClassAttributeNone,
-    
-    "MyObject",
-    NULL,
-    
-    NULL,
-    NULL,
-    
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    MyObject_convertToTypeWrapper,
-};
-
-JSClassDefinition MyObject_nullWrapperDefinition = {
-    0,
-    kJSClassAttributeNone,
-    
-    "MyObject",
-    NULL,
-    
-    NULL,
-    NULL,
-    
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-};
-
-static JSClassRef MyObject_class(JSContextRef context)
-{
-    UNUSED_PARAM(context);
-
-    static JSClassRef jsClass;
-    if (!jsClass) {
-        JSClassRef baseClass = JSClassCreate(&MyObject_definition);
-        MyObject_convertToTypeWrapperDefinition.parentClass = baseClass;
-        JSClassRef wrapperClass = JSClassCreate(&MyObject_convertToTypeWrapperDefinition);
-        MyObject_nullWrapperDefinition.parentClass = wrapperClass;
-        jsClass = JSClassCreate(&MyObject_nullWrapperDefinition);
-    }
-
-    return jsClass;
-}
-
-static JSValueRef PropertyCatchalls_getProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(propertyName);
-    UNUSED_PARAM(exception);
-
-    if (JSStringIsEqualToUTF8CString(propertyName, "x")) {
-        static size_t count;
-        if (count++ < 5)
-            return NULL;
-
-        // Swallow all .x gets after 5, returning null.
-        return JSValueMakeNull(context);
-    }
-
-    if (JSStringIsEqualToUTF8CString(propertyName, "y")) {
-        static size_t count;
-        if (count++ < 5)
-            return NULL;
-
-        // Swallow all .y gets after 5, returning null.
-        return JSValueMakeNull(context);
-    }
-    
-    if (JSStringIsEqualToUTF8CString(propertyName, "z")) {
-        static size_t count;
-        if (count++ < 5)
-            return NULL;
-
-        // Swallow all .y gets after 5, returning null.
-        return JSValueMakeNull(context);
-    }
-
-    return NULL;
-}
-
-static bool PropertyCatchalls_setProperty(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSValueRef* exception)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(propertyName);
-    UNUSED_PARAM(value);
-    UNUSED_PARAM(exception);
-
-    if (JSStringIsEqualToUTF8CString(propertyName, "x")) {
-        static size_t count;
-        if (count++ < 5)
-            return false;
-
-        // Swallow all .x sets after 4.
-        return true;
-    }
-
-    if (JSStringIsEqualToUTF8CString(propertyName, "make_throw") || JSStringIsEqualToUTF8CString(propertyName, "0")) {
-        *exception = JSValueMakeNumber(context, 5);
-        return true;
-    }
-
-    return false;
-}
-
-static void PropertyCatchalls_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef propertyNames)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(object);
-
-    static size_t count;
-    static const char* numbers[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-    
-    // Provide a property of a different name every time.
-    JSStringRef propertyName = JSStringCreateWithUTF8CString(numbers[count++ % 10]);
-    JSPropertyNameAccumulatorAddName(propertyNames, propertyName);
-    JSStringRelease(propertyName);
-}
-
-JSClassDefinition PropertyCatchalls_definition = {
-    0,
-    kJSClassAttributeNone,
-    
-    "PropertyCatchalls",
-    NULL,
-    
-    NULL,
-    NULL,
-    
-    NULL,
-    NULL,
-    NULL,
-    PropertyCatchalls_getProperty,
-    PropertyCatchalls_setProperty,
-    NULL,
-    PropertyCatchalls_getPropertyNames,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-};
-
-static JSClassRef PropertyCatchalls_class(JSContextRef context)
-{
-    UNUSED_PARAM(context);
-
-    static JSClassRef jsClass;
-    if (!jsClass)
-        jsClass = JSClassCreate(&PropertyCatchalls_definition);
-    
-    return jsClass;
-}
-
-static bool EvilExceptionObject_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef possibleValue, JSValueRef* exception)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(constructor);
-    
-    JSStringRef hasInstanceName = JSStringCreateWithUTF8CString("hasInstance");
-    JSValueRef hasInstance = JSObjectGetProperty(context, constructor, hasInstanceName, exception);
-    JSStringRelease(hasInstanceName);
-    if (!hasInstance)
-        return false;
-    JSObjectRef function = JSValueToObject(context, hasInstance, exception);
-    JSValueRef result = JSObjectCallAsFunction(context, function, constructor, 1, &possibleValue, exception);
-    return result && JSValueToBoolean(context, result);
-}
-
-static JSValueRef EvilExceptionObject_convertToType(JSContextRef context, JSObjectRef object, JSType type, JSValueRef* exception)
-{
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(exception);
-    JSStringRef funcName;
-    switch (type) {
-    case kJSTypeNumber:
-        funcName = JSStringCreateWithUTF8CString("toNumber");
-        break;
-    case kJSTypeString:
-        funcName = JSStringCreateWithUTF8CString("toStringExplicit");
-        break;
-    default:
-        return JSValueMakeNull(context);
-    }
-    
-    JSValueRef func = JSObjectGetProperty(context, object, funcName, exception);
-    JSStringRelease(funcName);    
-    JSObjectRef function = JSValueToObject(context, func, exception);
-    if (!function)
-        return JSValueMakeNull(context);
-    JSValueRef value = JSObjectCallAsFunction(context, function, object, 0, NULL, exception);
-    if (!value) {
-        JSStringRef errorString = JSStringCreateWithUTF8CString("convertToType failed"); 
-        JSValueRef errorStringRef = JSValueMakeString(context, errorString);
-        JSStringRelease(errorString);
-        return errorStringRef;
-    }
-    return value;
-}
-
-JSClassDefinition EvilExceptionObject_definition = {
-    0,
-    kJSClassAttributeNone,
-
-    "EvilExceptionObject",
-    NULL,
-
-    NULL,
-    NULL,
-
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    EvilExceptionObject_hasInstance,
-    EvilExceptionObject_convertToType,
-};
-
-static JSClassRef EvilExceptionObject_class(JSContextRef context)
-{
-    UNUSED_PARAM(context);
-    
-    static JSClassRef jsClass;
-    if (!jsClass)
-        jsClass = JSClassCreate(&EvilExceptionObject_definition);
-    
-    return jsClass;
-}
-
-JSClassDefinition EmptyObject_definition = {
-    0,
-    kJSClassAttributeNone,
-    
-    NULL,
-    NULL,
-    
-    NULL,
-    NULL,
-    
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-};
-
-static JSClassRef EmptyObject_class(JSContextRef context)
-{
-    UNUSED_PARAM(context);
-    
-    static JSClassRef jsClass;
-    if (!jsClass)
-        jsClass = JSClassCreate(&EmptyObject_definition);
-    
-    return jsClass;
-}
-
-
-static JSValueRef Base_get(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
-{
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(propertyName);
-    UNUSED_PARAM(exception);
-
-    return JSValueMakeNumber(ctx, 1); // distinguish base get form derived get
-}
-
-static bool Base_set(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSValueRef* exception)
-{
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(propertyName);
-    UNUSED_PARAM(value);
-
-    *exception = JSValueMakeNumber(ctx, 1); // distinguish base set from derived set
-    return true;
-}
-
-static JSValueRef Base_callAsFunction(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    UNUSED_PARAM(function);
-    UNUSED_PARAM(thisObject);
-    UNUSED_PARAM(argumentCount);
-    UNUSED_PARAM(arguments);
-    UNUSED_PARAM(exception);
-    
-    return JSValueMakeNumber(ctx, 1); // distinguish base call from derived call
-}
-
-static JSValueRef Base_returnHardNull(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    UNUSED_PARAM(ctx);
-    UNUSED_PARAM(function);
-    UNUSED_PARAM(thisObject);
-    UNUSED_PARAM(argumentCount);
-    UNUSED_PARAM(arguments);
-    UNUSED_PARAM(exception);
-    
-    return 0; // should convert to undefined!
-}
-
-static JSStaticFunction Base_staticFunctions[] = {
-    { "baseProtoDup", NULL, kJSPropertyAttributeNone },
-    { "baseProto", Base_callAsFunction, kJSPropertyAttributeNone },
-    { "baseHardNull", Base_returnHardNull, kJSPropertyAttributeNone },
-    { 0, 0, 0 }
-};
-
-static JSStaticValue Base_staticValues[] = {
-    { "baseDup", Base_get, Base_set, kJSPropertyAttributeNone },
-    { "baseOnly", Base_get, Base_set, kJSPropertyAttributeNone },
-    { 0, 0, 0, 0 }
-};
-
-static bool TestInitializeFinalize;
-static void Base_initialize(JSContextRef context, JSObjectRef object)
-{
-    UNUSED_PARAM(context);
-
-    if (TestInitializeFinalize) {
-        ASSERT((void*)1 == JSObjectGetPrivate(object));
-        JSObjectSetPrivate(object, (void*)2);
-    }
-}
-
-static unsigned Base_didFinalize;
-static void Base_finalize(JSObjectRef object)
-{
-    UNUSED_PARAM(object);
-    if (TestInitializeFinalize) {
-        ASSERT((void*)4 == JSObjectGetPrivate(object));
-        Base_didFinalize = true;
-    }
-}
-
-static JSClassRef Base_class(JSContextRef context)
-{
-    UNUSED_PARAM(context);
-
-    static JSClassRef jsClass;
-    if (!jsClass) {
-        JSClassDefinition definition = kJSClassDefinitionEmpty;
-        definition.staticValues = Base_staticValues;
-        definition.staticFunctions = Base_staticFunctions;
-        definition.initialize = Base_initialize;
-        definition.finalize = Base_finalize;
-        jsClass = JSClassCreate(&definition);
-    }
-    return jsClass;
-}
-
-static JSValueRef Derived_get(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
-{
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(propertyName);
-    UNUSED_PARAM(exception);
-
-    return JSValueMakeNumber(ctx, 2); // distinguish base get form derived get
-}
-
-static bool Derived_set(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSValueRef* exception)
-{
-    UNUSED_PARAM(ctx);
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(propertyName);
-    UNUSED_PARAM(value);
-
-    *exception = JSValueMakeNumber(ctx, 2); // distinguish base set from derived set
-    return true;
-}
-
-static JSValueRef Derived_callAsFunction(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    UNUSED_PARAM(function);
-    UNUSED_PARAM(thisObject);
-    UNUSED_PARAM(argumentCount);
-    UNUSED_PARAM(arguments);
-    UNUSED_PARAM(exception);
-    
-    return JSValueMakeNumber(ctx, 2); // distinguish base call from derived call
-}
-
-static JSStaticFunction Derived_staticFunctions[] = {
-    { "protoOnly", Derived_callAsFunction, kJSPropertyAttributeNone },
-    { "protoDup", NULL, kJSPropertyAttributeNone },
-    { "baseProtoDup", Derived_callAsFunction, kJSPropertyAttributeNone },
-    { 0, 0, 0 }
-};
-
-static JSStaticValue Derived_staticValues[] = {
-    { "derivedOnly", Derived_get, Derived_set, kJSPropertyAttributeNone },
-    { "protoDup", Derived_get, Derived_set, kJSPropertyAttributeNone },
-    { "baseDup", Derived_get, Derived_set, kJSPropertyAttributeNone },
-    { 0, 0, 0, 0 }
-};
-
-static void Derived_initialize(JSContextRef context, JSObjectRef object)
-{
-    UNUSED_PARAM(context);
-
-    if (TestInitializeFinalize) {
-        ASSERT((void*)2 == JSObjectGetPrivate(object));
-        JSObjectSetPrivate(object, (void*)3);
-    }
-}
-
-static void Derived_finalize(JSObjectRef object)
-{
-    if (TestInitializeFinalize) {
-        ASSERT((void*)3 == JSObjectGetPrivate(object));
-        JSObjectSetPrivate(object, (void*)4);
-    }
-}
-
-static JSClassRef Derived_class(JSContextRef context)
-{
-    static JSClassRef jsClass;
-    if (!jsClass) {
-        JSClassDefinition definition = kJSClassDefinitionEmpty;
-        definition.parentClass = Base_class(context);
-        definition.staticValues = Derived_staticValues;
-        definition.staticFunctions = Derived_staticFunctions;
-        definition.initialize = Derived_initialize;
-        definition.finalize = Derived_finalize;
-        jsClass = JSClassCreate(&definition);
-    }
-    return jsClass;
-}
-
-static JSClassRef Derived2_class(JSContextRef context)
-{
-    static JSClassRef jsClass;
-    if (!jsClass) {
-        JSClassDefinition definition = kJSClassDefinitionEmpty;
-        definition.parentClass = Derived_class(context);
-        jsClass = JSClassCreate(&definition);
-    }
-    return jsClass;
-}
-
-static JSValueRef print_callAsFunction(JSContextRef ctx, JSObjectRef functionObject, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    UNUSED_PARAM(functionObject);
-    UNUSED_PARAM(thisObject);
-    UNUSED_PARAM(exception);
-
-    ASSERT(JSContextGetGlobalContext(ctx) == context);
-    
-    if (argumentCount > 0) {
-        JSStringRef string = JSValueToStringCopy(ctx, arguments[0], NULL);
-        size_t sizeUTF8 = JSStringGetMaximumUTF8CStringSize(string);
-        char* stringUTF8 = (char*)malloc(sizeUTF8);
-        JSStringGetUTF8CString(string, stringUTF8, sizeUTF8);
-        printf("%s\n", stringUTF8);
-        free(stringUTF8);
-        JSStringRelease(string);
-    }
-    
-    return JSValueMakeUndefined(ctx);
-}
-
-static JSObjectRef myConstructor_callAsConstructor(JSContextRef context, JSObjectRef constructorObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    UNUSED_PARAM(constructorObject);
-    UNUSED_PARAM(exception);
-    
-    JSObjectRef result = JSObjectMake(context, NULL, NULL);
-    if (argumentCount > 0) {
-        JSStringRef value = JSStringCreateWithUTF8CString("value");
-        JSObjectSetProperty(context, result, value, arguments[0], kJSPropertyAttributeNone, NULL);
-        JSStringRelease(value);
-    }
-    
-    return result;
-}
-
-static JSObjectRef myBadConstructor_callAsConstructor(JSContextRef context, JSObjectRef constructorObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(constructorObject);
-    UNUSED_PARAM(argumentCount);
-    UNUSED_PARAM(arguments);
-    UNUSED_PARAM(exception);
-    
-    return 0;
-}
-
-
-static void globalObject_initialize(JSContextRef context, JSObjectRef object)
-{
-    UNUSED_PARAM(object);
-    // Ensure that an execution context is passed in
-    ASSERT(context);
-
-    JSObjectRef globalObject = JSContextGetGlobalObject(context);
-    ASSERT(globalObject);
-
-    // Ensure that the standard global properties have been set on the global object
-    JSStringRef array = JSStringCreateWithUTF8CString("Array");
-    JSObjectRef arrayConstructor = JSValueToObject(context, JSObjectGetProperty(context, globalObject, array, NULL), NULL);
-    JSStringRelease(array);
-
-    UNUSED_PARAM(arrayConstructor);
-    ASSERT(arrayConstructor);
-}
-
-static JSValueRef globalObject_get(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
-{
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(propertyName);
-    UNUSED_PARAM(exception);
-
-    return JSValueMakeNumber(ctx, 3);
-}
-
-static bool globalObject_set(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSValueRef* exception)
-{
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(propertyName);
-    UNUSED_PARAM(value);
-
-    *exception = JSValueMakeNumber(ctx, 3);
-    return true;
-}
-
-static JSValueRef globalObject_call(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    UNUSED_PARAM(function);
-    UNUSED_PARAM(thisObject);
-    UNUSED_PARAM(argumentCount);
-    UNUSED_PARAM(arguments);
-    UNUSED_PARAM(exception);
-
-    return JSValueMakeNumber(ctx, 3);
-}
-
-static JSValueRef functionGC(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    UNUSED_PARAM(function);
-    UNUSED_PARAM(thisObject);
-    UNUSED_PARAM(argumentCount);
-    UNUSED_PARAM(arguments);
-    UNUSED_PARAM(exception);
-    JSGarbageCollect(context);
-    return JSValueMakeUndefined(context);
-}
-
-static JSStaticValue globalObject_staticValues[] = {
-    { "globalStaticValue", globalObject_get, globalObject_set, kJSPropertyAttributeNone },
-    { 0, 0, 0, 0 }
-};
-
-static JSStaticFunction globalObject_staticFunctions[] = {
-    { "globalStaticFunction", globalObject_call, kJSPropertyAttributeNone },
-    { "globalStaticFunction2", globalObject_call, kJSPropertyAttributeNone },
-    { "gc", functionGC, kJSPropertyAttributeNone },
-    { 0, 0, 0 }
-};
-
-static char* createStringWithContentsOfFile(const char* fileName);
-
-static void testInitializeFinalize()
-{
-    JSObjectRef o = JSObjectMake(context, Derived_class(context), (void*)1);
-    UNUSED_PARAM(o);
-    ASSERT(JSObjectGetPrivate(o) == (void*)3);
-}
-
-static JSValueRef jsNumberValue =  NULL;
-
-static JSObjectRef aHeapRef = NULL;
-
-static void makeGlobalNumberValue(JSContextRef context) {
-    JSValueRef v = JSValueMakeNumber(context, 420);
-    JSValueProtect(context, v);
-    jsNumberValue = v;
-    v = NULL;
-}
-
-bool assertTrue(bool value, const char* message)
-{
-    if (!value) {
-        if (message)
-            fprintf(stderr, "assertTrue failed: '%s'\n", message);
-        else
-            fprintf(stderr, "assertTrue failed.\n");
-        failed = 1;
-    }
-    return value;
-}
-
-static bool checkForCycleInPrototypeChain()
-{
-    bool result = true;
-    JSGlobalContextRef context = JSGlobalContextCreate(0);
-    JSObjectRef object1 = JSObjectMake(context, /* jsClass */ 0, /* data */ 0);
-    JSObjectRef object2 = JSObjectMake(context, /* jsClass */ 0, /* data */ 0);
-    JSObjectRef object3 = JSObjectMake(context, /* jsClass */ 0, /* data */ 0);
-
-    JSObjectSetPrototype(context, object1, JSValueMakeNull(context));
-    ASSERT(JSValueIsNull(context, JSObjectGetPrototype(context, object1)));
-
-    // object1 -> object1
-    JSObjectSetPrototype(context, object1, object1);
-    result &= assertTrue(JSValueIsNull(context, JSObjectGetPrototype(context, object1)), "It is possible to assign self as a prototype");
-
-    // object1 -> object2 -> object1
-    JSObjectSetPrototype(context, object2, object1);
-    ASSERT(JSValueIsStrictEqual(context, JSObjectGetPrototype(context, object2), object1));
-    JSObjectSetPrototype(context, object1, object2);
-    result &= assertTrue(JSValueIsNull(context, JSObjectGetPrototype(context, object1)), "It is possible to close a prototype chain cycle");
-
-    // object1 -> object2 -> object3 -> object1
-    JSObjectSetPrototype(context, object2, object3);
-    ASSERT(JSValueIsStrictEqual(context, JSObjectGetPrototype(context, object2), object3));
-    JSObjectSetPrototype(context, object1, object2);
-    ASSERT(JSValueIsStrictEqual(context, JSObjectGetPrototype(context, object1), object2));
-    JSObjectSetPrototype(context, object3, object1);
-    result &= assertTrue(!JSValueIsStrictEqual(context, JSObjectGetPrototype(context, object3), object1), "It is possible to close a prototype chain cycle");
-
-    JSValueRef exception;
-    JSStringRef code = JSStringCreateWithUTF8CString("o = { }; p = { }; o.__proto__ = p; p.__proto__ = o");
-    JSStringRef file = JSStringCreateWithUTF8CString("");
-    result &= assertTrue(!JSEvaluateScript(context, code, /* thisObject*/ 0, file, 1, &exception)
-                         , "An exception should be thrown");
-
-    JSStringRelease(code);
-    JSStringRelease(file);
-    JSGlobalContextRelease(context);
-    return result;
-}
-
-static JSValueRef valueToObjectExceptionCallAsFunction(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
-    UNUSED_PARAM(function);
-    UNUSED_PARAM(thisObject);
-    UNUSED_PARAM(argumentCount);
-    UNUSED_PARAM(arguments);
-    JSValueRef jsUndefined = JSValueMakeUndefined(JSContextGetGlobalContext(ctx));
-    JSValueToObject(JSContextGetGlobalContext(ctx), jsUndefined, exception);
-    
-    return JSValueMakeUndefined(ctx);
-}
-static bool valueToObjectExceptionTest()
-{
-    JSGlobalContextRef testContext;
-    JSClassDefinition globalObjectClassDefinition = kJSClassDefinitionEmpty;
-    globalObjectClassDefinition.initialize = globalObject_initialize;
-    globalObjectClassDefinition.staticValues = globalObject_staticValues;
-    globalObjectClassDefinition.staticFunctions = globalObject_staticFunctions;
-    globalObjectClassDefinition.attributes = kJSClassAttributeNoAutomaticPrototype;
-    JSClassRef globalObjectClass = JSClassCreate(&globalObjectClassDefinition);
-    testContext = JSGlobalContextCreateInGroup(NULL, globalObjectClass);
-    JSObjectRef globalObject = JSContextGetGlobalObject(testContext);
-
-    JSStringRef valueToObject = JSStringCreateWithUTF8CString("valueToObject");
-    JSObjectRef valueToObjectFunction = JSObjectMakeFunctionWithCallback(testContext, valueToObject, valueToObjectExceptionCallAsFunction);
-    JSObjectSetProperty(testContext, globalObject, valueToObject, valueToObjectFunction, kJSPropertyAttributeNone, NULL);
-    JSStringRelease(valueToObject);
-
-    JSStringRef test = JSStringCreateWithUTF8CString("valueToObject();");
-    JSEvaluateScript(testContext, test, NULL, NULL, 1, NULL);
-    
-    JSStringRelease(test);
-    JSClassRelease(globalObjectClass);
-    JSGlobalContextRelease(testContext);
-    
-    return true;
-}
-
-static bool globalContextNameTest()
-{
-    bool result = true;
-    JSGlobalContextRef context = JSGlobalContextCreate(0);
-
-    JSStringRef str = JSGlobalContextCopyName(context);
-    result &= assertTrue(!str, "Default context name is NULL");
-
-    JSStringRef name1 = JSStringCreateWithUTF8CString("name1");
-    JSStringRef name2 = JSStringCreateWithUTF8CString("name2");
-
-    JSGlobalContextSetName(context, name1);
-    JSStringRef fetchName1 = JSGlobalContextCopyName(context);
-    JSGlobalContextSetName(context, name2);
-    JSStringRef fetchName2 = JSGlobalContextCopyName(context);
-    JSGlobalContextSetName(context, NULL);
-    JSStringRef fetchName3 = JSGlobalContextCopyName(context);
-
-    result &= assertTrue(JSStringIsEqual(name1, fetchName1), "Unexpected Context name");
-    result &= assertTrue(JSStringIsEqual(name2, fetchName2), "Unexpected Context name");
-    result &= assertTrue(!JSStringIsEqual(fetchName1, fetchName2), "Unexpected Context name");
-    result &= assertTrue(!fetchName3, "Unexpected Context name");
-
-    JSStringRelease(name1);
-    JSStringRelease(name2);
-    JSStringRelease(fetchName1);
-    JSStringRelease(fetchName2);
-
-    return result;
-}
-
-static void checkConstnessInJSObjectNames()
-{
-    JSStaticFunction fun;
-    fun.name = "something";
-    JSStaticValue val;
-    val.name = "something";
-}
-
-
-int main(int argc, char* argv[])
-{
-#if OS(WINDOWS)
-#if defined(_M_X64) || defined(__x86_64__)
-    // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
-    // if the feature has been disabled in firmware. This causes us to crash
-    // in some of the math functions. For now, we disable those optimizations
-    // because Microsoft is not going to fix the problem in VS2013.
-    // FIXME: http://webkit.org/b/141449: Remove this workaround when we switch to VS2015+.
-    _set_FMA3_enable(0);
-#endif
-
-    // Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
-    // testing/debugging, as it causes the post-mortem debugger not to be invoked. We reset the
-    // error mode here to work around Cygwin's behavior. See .
-    ::SetErrorMode(0);
-#endif
-
-    testCompareAndSwap();
-
-#if JSC_OBJC_API_ENABLED
-    testObjectiveCAPI();
-#endif
-
-    const char *scriptPath = "testapi.js";
-    if (argc > 1) {
-        scriptPath = argv[1];
-    }
-    
-    // Test garbage collection with a fresh context
-    context = JSGlobalContextCreateInGroup(NULL, NULL);
-    TestInitializeFinalize = true;
-    testInitializeFinalize();
-    JSGlobalContextRelease(context);
-    TestInitializeFinalize = false;
-
-    ASSERT(Base_didFinalize);
-
-    JSClassDefinition globalObjectClassDefinition = kJSClassDefinitionEmpty;
-    globalObjectClassDefinition.initialize = globalObject_initialize;
-    globalObjectClassDefinition.staticValues = globalObject_staticValues;
-    globalObjectClassDefinition.staticFunctions = globalObject_staticFunctions;
-    globalObjectClassDefinition.attributes = kJSClassAttributeNoAutomaticPrototype;
-    JSClassRef globalObjectClass = JSClassCreate(&globalObjectClassDefinition);
-    context = JSGlobalContextCreateInGroup(NULL, globalObjectClass);
-
-    JSContextGroupRef contextGroup = JSContextGetGroup(context);
-    
-    JSGlobalContextRetain(context);
-    JSGlobalContextRelease(context);
-    ASSERT(JSContextGetGlobalContext(context) == context);
-    
-    JSReportExtraMemoryCost(context, 0);
-    JSReportExtraMemoryCost(context, 1);
-    JSReportExtraMemoryCost(context, 1024);
-
-    JSObjectRef globalObject = JSContextGetGlobalObject(context);
-    ASSERT(JSValueIsObject(context, globalObject));
-    
-    JSValueRef jsUndefined = JSValueMakeUndefined(context);
-    JSValueRef jsNull = JSValueMakeNull(context);
-    JSValueRef jsTrue = JSValueMakeBoolean(context, true);
-    JSValueRef jsFalse = JSValueMakeBoolean(context, false);
-    JSValueRef jsZero = JSValueMakeNumber(context, 0);
-    JSValueRef jsOne = JSValueMakeNumber(context, 1);
-    JSValueRef jsOneThird = JSValueMakeNumber(context, 1.0 / 3.0);
-    JSObjectRef jsObjectNoProto = JSObjectMake(context, NULL, NULL);
-    JSObjectSetPrototype(context, jsObjectNoProto, JSValueMakeNull(context));
-
-    JSObjectSetPrivate(globalObject, (void*)123);
-    if (JSObjectGetPrivate(globalObject) != (void*)123) {
-        printf("FAIL: Didn't return private data when set by JSObjectSetPrivate().\n");
-        failed = 1;
-    } else
-        printf("PASS: returned private data when set by JSObjectSetPrivate().\n");
-
-    // FIXME: test funny utf8 characters
-    JSStringRef jsEmptyIString = JSStringCreateWithUTF8CString("");
-    JSValueRef jsEmptyString = JSValueMakeString(context, jsEmptyIString);
-    
-    JSStringRef jsOneIString = JSStringCreateWithUTF8CString("1");
-    JSValueRef jsOneString = JSValueMakeString(context, jsOneIString);
-
-    UniChar singleUniChar = 65; // Capital A
-    CFMutableStringRef cfString = 
-        CFStringCreateMutableWithExternalCharactersNoCopy(kCFAllocatorDefault,
-                                                          &singleUniChar,
-                                                          1,
-                                                          1,
-                                                          kCFAllocatorNull);
-
-    JSStringRef jsCFIString = JSStringCreateWithCFString(cfString);
-    JSValueRef jsCFString = JSValueMakeString(context, jsCFIString);
-    
-    CFStringRef cfEmptyString = CFStringCreateWithCString(kCFAllocatorDefault, "", kCFStringEncodingUTF8);
-    
-    JSStringRef jsCFEmptyIString = JSStringCreateWithCFString(cfEmptyString);
-    JSValueRef jsCFEmptyString = JSValueMakeString(context, jsCFEmptyIString);
-
-    CFIndex cfStringLength = CFStringGetLength(cfString);
-    UniChar* buffer = (UniChar*)malloc(cfStringLength * sizeof(UniChar));
-    CFStringGetCharacters(cfString, 
-                          CFRangeMake(0, cfStringLength), 
-                          buffer);
-    JSStringRef jsCFIStringWithCharacters = JSStringCreateWithCharacters((JSChar*)buffer, cfStringLength);
-    JSValueRef jsCFStringWithCharacters = JSValueMakeString(context, jsCFIStringWithCharacters);
-    
-    JSStringRef jsCFEmptyIStringWithCharacters = JSStringCreateWithCharacters((JSChar*)buffer, CFStringGetLength(cfEmptyString));
-    free(buffer);
-    JSValueRef jsCFEmptyStringWithCharacters = JSValueMakeString(context, jsCFEmptyIStringWithCharacters);
-
-    JSChar constantString[] = { 'H', 'e', 'l', 'l', 'o', };
-    JSStringRef constantStringRef = JSStringCreateWithCharactersNoCopy(constantString, sizeof(constantString) / sizeof(constantString[0]));
-    ASSERT(JSStringGetCharactersPtr(constantStringRef) == constantString);
-    JSStringRelease(constantStringRef);
-
-    ASSERT(JSValueGetType(context, NULL) == kJSTypeNull);
-    ASSERT(JSValueGetType(context, jsUndefined) == kJSTypeUndefined);
-    ASSERT(JSValueGetType(context, jsNull) == kJSTypeNull);
-    ASSERT(JSValueGetType(context, jsTrue) == kJSTypeBoolean);
-    ASSERT(JSValueGetType(context, jsFalse) == kJSTypeBoolean);
-    ASSERT(JSValueGetType(context, jsZero) == kJSTypeNumber);
-    ASSERT(JSValueGetType(context, jsOne) == kJSTypeNumber);
-    ASSERT(JSValueGetType(context, jsOneThird) == kJSTypeNumber);
-    ASSERT(JSValueGetType(context, jsEmptyString) == kJSTypeString);
-    ASSERT(JSValueGetType(context, jsOneString) == kJSTypeString);
-    ASSERT(JSValueGetType(context, jsCFString) == kJSTypeString);
-    ASSERT(JSValueGetType(context, jsCFStringWithCharacters) == kJSTypeString);
-    ASSERT(JSValueGetType(context, jsCFEmptyString) == kJSTypeString);
-    ASSERT(JSValueGetType(context, jsCFEmptyStringWithCharacters) == kJSTypeString);
-
-    ASSERT(!JSValueIsBoolean(context, NULL));
-    ASSERT(!JSValueIsObject(context, NULL));
-    ASSERT(!JSValueIsArray(context, NULL));
-    ASSERT(!JSValueIsDate(context, NULL));
-    ASSERT(!JSValueIsString(context, NULL));
-    ASSERT(!JSValueIsNumber(context, NULL));
-    ASSERT(!JSValueIsUndefined(context, NULL));
-    ASSERT(JSValueIsNull(context, NULL));
-    ASSERT(!JSObjectCallAsFunction(context, NULL, NULL, 0, NULL, NULL));
-    ASSERT(!JSObjectCallAsConstructor(context, NULL, 0, NULL, NULL));
-    ASSERT(!JSObjectIsConstructor(context, NULL));
-    ASSERT(!JSObjectIsFunction(context, NULL));
-
-    JSStringRef nullString = JSStringCreateWithUTF8CString(0);
-    const JSChar* characters = JSStringGetCharactersPtr(nullString);
-    if (characters) {
-        printf("FAIL: Didn't return null when accessing character pointer of a null String.\n");
-        failed = 1;
-    } else
-        printf("PASS: returned null when accessing character pointer of a null String.\n");
-
-    JSStringRef emptyString = JSStringCreateWithCFString(CFSTR(""));
-    characters = JSStringGetCharactersPtr(emptyString);
-    if (!characters) {
-        printf("FAIL: Returned null when accessing character pointer of an empty String.\n");
-        failed = 1;
-    } else
-        printf("PASS: returned empty when accessing character pointer of an empty String.\n");
-
-    size_t length = JSStringGetLength(nullString);
-    if (length) {
-        printf("FAIL: Didn't return 0 length for null String.\n");
-        failed = 1;
-    } else
-        printf("PASS: returned 0 length for null String.\n");
-    JSStringRelease(nullString);
-
-    length = JSStringGetLength(emptyString);
-    if (length) {
-        printf("FAIL: Didn't return 0 length for empty String.\n");
-        failed = 1;
-    } else
-        printf("PASS: returned 0 length for empty String.\n");
-    JSStringRelease(emptyString);
-
-    JSObjectRef propertyCatchalls = JSObjectMake(context, PropertyCatchalls_class(context), NULL);
-    JSStringRef propertyCatchallsString = JSStringCreateWithUTF8CString("PropertyCatchalls");
-    JSObjectSetProperty(context, globalObject, propertyCatchallsString, propertyCatchalls, kJSPropertyAttributeNone, NULL);
-    JSStringRelease(propertyCatchallsString);
-
-    JSObjectRef myObject = JSObjectMake(context, MyObject_class(context), NULL);
-    JSStringRef myObjectIString = JSStringCreateWithUTF8CString("MyObject");
-    JSObjectSetProperty(context, globalObject, myObjectIString, myObject, kJSPropertyAttributeNone, NULL);
-    JSStringRelease(myObjectIString);
-    
-    JSObjectRef EvilExceptionObject = JSObjectMake(context, EvilExceptionObject_class(context), NULL);
-    JSStringRef EvilExceptionObjectIString = JSStringCreateWithUTF8CString("EvilExceptionObject");
-    JSObjectSetProperty(context, globalObject, EvilExceptionObjectIString, EvilExceptionObject, kJSPropertyAttributeNone, NULL);
-    JSStringRelease(EvilExceptionObjectIString);
-    
-    JSObjectRef EmptyObject = JSObjectMake(context, EmptyObject_class(context), NULL);
-    JSStringRef EmptyObjectIString = JSStringCreateWithUTF8CString("EmptyObject");
-    JSObjectSetProperty(context, globalObject, EmptyObjectIString, EmptyObject, kJSPropertyAttributeNone, NULL);
-    JSStringRelease(EmptyObjectIString);
-    
-    JSStringRef lengthStr = JSStringCreateWithUTF8CString("length");
-    JSObjectRef aStackRef = JSObjectMakeArray(context, 0, 0, 0);
-    aHeapRef = aStackRef;
-    JSObjectSetProperty(context, aHeapRef, lengthStr, JSValueMakeNumber(context, 10), 0, 0);
-    JSStringRef privatePropertyName = JSStringCreateWithUTF8CString("privateProperty");
-    if (!JSObjectSetPrivateProperty(context, myObject, privatePropertyName, aHeapRef)) {
-        printf("FAIL: Could not set private property.\n");
-        failed = 1;
-    } else
-        printf("PASS: Set private property.\n");
-    aStackRef = 0;
-    if (JSObjectSetPrivateProperty(context, aHeapRef, privatePropertyName, aHeapRef)) {
-        printf("FAIL: JSObjectSetPrivateProperty should fail on non-API objects.\n");
-        failed = 1;
-    } else
-        printf("PASS: Did not allow JSObjectSetPrivateProperty on a non-API object.\n");
-    if (JSObjectGetPrivateProperty(context, myObject, privatePropertyName) != aHeapRef) {
-        printf("FAIL: Could not retrieve private property.\n");
-        failed = 1;
-    } else
-        printf("PASS: Retrieved private property.\n");
-    if (JSObjectGetPrivateProperty(context, aHeapRef, privatePropertyName)) {
-        printf("FAIL: JSObjectGetPrivateProperty should return NULL when called on a non-API object.\n");
-        failed = 1;
-    } else
-        printf("PASS: JSObjectGetPrivateProperty return NULL.\n");
-
-    if (JSObjectGetProperty(context, myObject, privatePropertyName, 0) == aHeapRef) {
-        printf("FAIL: Accessed private property through ordinary property lookup.\n");
-        failed = 1;
-    } else
-        printf("PASS: Cannot access private property through ordinary property lookup.\n");
-
-    JSGarbageCollect(context);
-
-    for (int i = 0; i < 10000; i++)
-        JSObjectMake(context, 0, 0);
-
-    aHeapRef = JSValueToObject(context, JSObjectGetPrivateProperty(context, myObject, privatePropertyName), 0);
-    if (JSValueToNumber(context, JSObjectGetProperty(context, aHeapRef, lengthStr, 0), 0) != 10) {
-        printf("FAIL: Private property has been collected.\n");
-        failed = 1;
-    } else
-        printf("PASS: Private property does not appear to have been collected.\n");
-    JSStringRelease(lengthStr);
-
-    if (!JSObjectSetPrivateProperty(context, myObject, privatePropertyName, 0)) {
-        printf("FAIL: Could not set private property to NULL.\n");
-        failed = 1;
-    } else
-        printf("PASS: Set private property to NULL.\n");
-    if (JSObjectGetPrivateProperty(context, myObject, privatePropertyName)) {
-        printf("FAIL: Could not retrieve private property.\n");
-        failed = 1;
-    } else
-        printf("PASS: Retrieved private property.\n");
-
-    JSStringRef nullJSON = JSStringCreateWithUTF8CString(0);
-    JSValueRef nullJSONObject = JSValueMakeFromJSONString(context, nullJSON);
-    if (nullJSONObject) {
-        printf("FAIL: Did not parse null String as JSON correctly\n");
-        failed = 1;
-    } else
-        printf("PASS: Parsed null String as JSON correctly.\n");
-    JSStringRelease(nullJSON);
-
-    JSStringRef validJSON = JSStringCreateWithUTF8CString("{\"aProperty\":true}");
-    JSValueRef jsonObject = JSValueMakeFromJSONString(context, validJSON);
-    JSStringRelease(validJSON);
-    if (!JSValueIsObject(context, jsonObject)) {
-        printf("FAIL: Did not parse valid JSON correctly\n");
-        failed = 1;
-    } else
-        printf("PASS: Parsed valid JSON string.\n");
-    JSStringRef propertyName = JSStringCreateWithUTF8CString("aProperty");
-    assertEqualsAsBoolean(JSObjectGetProperty(context, JSValueToObject(context, jsonObject, 0), propertyName, 0), true);
-    JSStringRelease(propertyName);
-    JSStringRef invalidJSON = JSStringCreateWithUTF8CString("fail!");
-    if (JSValueMakeFromJSONString(context, invalidJSON)) {
-        printf("FAIL: Should return null for invalid JSON data\n");
-        failed = 1;
-    } else
-        printf("PASS: Correctly returned null for invalid JSON data.\n");
-    JSValueRef exception;
-    JSStringRef str = JSValueCreateJSONString(context, jsonObject, 0, 0);
-    if (!JSStringIsEqualToUTF8CString(str, "{\"aProperty\":true}")) {
-        printf("FAIL: Did not correctly serialise with indent of 0.\n");
-        failed = 1;
-    } else
-        printf("PASS: Correctly serialised with indent of 0.\n");
-    JSStringRelease(str);
-
-    str = JSValueCreateJSONString(context, jsonObject, 4, 0);
-    if (!JSStringIsEqualToUTF8CString(str, "{\n    \"aProperty\": true\n}")) {
-        printf("FAIL: Did not correctly serialise with indent of 4.\n");
-        failed = 1;
-    } else
-        printf("PASS: Correctly serialised with indent of 4.\n");
-    JSStringRelease(str);
-
-    str = JSStringCreateWithUTF8CString("({get a(){ throw '';}})");
-    JSValueRef unstringifiableObj = JSEvaluateScript(context, str, NULL, NULL, 1, NULL);
-    JSStringRelease(str);
-    
-    str = JSValueCreateJSONString(context, unstringifiableObj, 4, 0);
-    if (str) {
-        printf("FAIL: Didn't return null when attempting to serialize unserializable value.\n");
-        JSStringRelease(str);
-        failed = 1;
-    } else
-        printf("PASS: returned null when attempting to serialize unserializable value.\n");
-    
-    str = JSValueCreateJSONString(context, unstringifiableObj, 4, &exception);
-    if (str) {
-        printf("FAIL: Didn't return null when attempting to serialize unserializable value.\n");
-        JSStringRelease(str);
-        failed = 1;
-    } else
-        printf("PASS: returned null when attempting to serialize unserializable value.\n");
-    if (!exception) {
-        printf("FAIL: Did not set exception on serialisation error\n");
-        failed = 1;
-    } else
-        printf("PASS: set exception on serialisation error\n");
-    // Conversions that throw exceptions
-    exception = NULL;
-    ASSERT(NULL == JSValueToObject(context, jsNull, &exception));
-    ASSERT(exception);
-    
-    exception = NULL;
-    // FIXME  - On i386 the isnan(double) macro tries to map to the isnan(float) function,
-    // causing a build break with -Wshorten-64-to-32 enabled.  The issue is known by the appropriate team.
-    // After that's resolved, we can remove these casts
-    ASSERT(isnan((float)JSValueToNumber(context, jsObjectNoProto, &exception)));
-    ASSERT(exception);
-
-    exception = NULL;
-    ASSERT(!JSValueToStringCopy(context, jsObjectNoProto, &exception));
-    ASSERT(exception);
-    
-    ASSERT(JSValueToBoolean(context, myObject));
-    
-    exception = NULL;
-    ASSERT(!JSValueIsEqual(context, jsObjectNoProto, JSValueMakeNumber(context, 1), &exception));
-    ASSERT(exception);
-    
-    exception = NULL;
-    JSObjectGetPropertyAtIndex(context, myObject, 0, &exception);
-    ASSERT(1 == JSValueToNumber(context, exception, NULL));
-
-    assertEqualsAsBoolean(jsUndefined, false);
-    assertEqualsAsBoolean(jsNull, false);
-    assertEqualsAsBoolean(jsTrue, true);
-    assertEqualsAsBoolean(jsFalse, false);
-    assertEqualsAsBoolean(jsZero, false);
-    assertEqualsAsBoolean(jsOne, true);
-    assertEqualsAsBoolean(jsOneThird, true);
-    assertEqualsAsBoolean(jsEmptyString, false);
-    assertEqualsAsBoolean(jsOneString, true);
-    assertEqualsAsBoolean(jsCFString, true);
-    assertEqualsAsBoolean(jsCFStringWithCharacters, true);
-    assertEqualsAsBoolean(jsCFEmptyString, false);
-    assertEqualsAsBoolean(jsCFEmptyStringWithCharacters, false);
-    
-    assertEqualsAsNumber(jsUndefined, nan(""));
-    assertEqualsAsNumber(jsNull, 0);
-    assertEqualsAsNumber(jsTrue, 1);
-    assertEqualsAsNumber(jsFalse, 0);
-    assertEqualsAsNumber(jsZero, 0);
-    assertEqualsAsNumber(jsOne, 1);
-    assertEqualsAsNumber(jsOneThird, 1.0 / 3.0);
-    assertEqualsAsNumber(jsEmptyString, 0);
-    assertEqualsAsNumber(jsOneString, 1);
-    assertEqualsAsNumber(jsCFString, nan(""));
-    assertEqualsAsNumber(jsCFStringWithCharacters, nan(""));
-    assertEqualsAsNumber(jsCFEmptyString, 0);
-    assertEqualsAsNumber(jsCFEmptyStringWithCharacters, 0);
-    ASSERT(sizeof(JSChar) == sizeof(UniChar));
-    
-    assertEqualsAsCharactersPtr(jsUndefined, "undefined");
-    assertEqualsAsCharactersPtr(jsNull, "null");
-    assertEqualsAsCharactersPtr(jsTrue, "true");
-    assertEqualsAsCharactersPtr(jsFalse, "false");
-    assertEqualsAsCharactersPtr(jsZero, "0");
-    assertEqualsAsCharactersPtr(jsOne, "1");
-    assertEqualsAsCharactersPtr(jsOneThird, "0.3333333333333333");
-    assertEqualsAsCharactersPtr(jsEmptyString, "");
-    assertEqualsAsCharactersPtr(jsOneString, "1");
-    assertEqualsAsCharactersPtr(jsCFString, "A");
-    assertEqualsAsCharactersPtr(jsCFStringWithCharacters, "A");
-    assertEqualsAsCharactersPtr(jsCFEmptyString, "");
-    assertEqualsAsCharactersPtr(jsCFEmptyStringWithCharacters, "");
-    
-    assertEqualsAsUTF8String(jsUndefined, "undefined");
-    assertEqualsAsUTF8String(jsNull, "null");
-    assertEqualsAsUTF8String(jsTrue, "true");
-    assertEqualsAsUTF8String(jsFalse, "false");
-    assertEqualsAsUTF8String(jsZero, "0");
-    assertEqualsAsUTF8String(jsOne, "1");
-    assertEqualsAsUTF8String(jsOneThird, "0.3333333333333333");
-    assertEqualsAsUTF8String(jsEmptyString, "");
-    assertEqualsAsUTF8String(jsOneString, "1");
-    assertEqualsAsUTF8String(jsCFString, "A");
-    assertEqualsAsUTF8String(jsCFStringWithCharacters, "A");
-    assertEqualsAsUTF8String(jsCFEmptyString, "");
-    assertEqualsAsUTF8String(jsCFEmptyStringWithCharacters, "");
-    
-    checkConstnessInJSObjectNames();
-    
-    ASSERT(JSValueIsStrictEqual(context, jsTrue, jsTrue));
-    ASSERT(!JSValueIsStrictEqual(context, jsOne, jsOneString));
-
-    ASSERT(JSValueIsEqual(context, jsOne, jsOneString, NULL));
-    ASSERT(!JSValueIsEqual(context, jsTrue, jsFalse, NULL));
-    
-    CFStringRef cfJSString = JSStringCopyCFString(kCFAllocatorDefault, jsCFIString);
-    CFStringRef cfJSEmptyString = JSStringCopyCFString(kCFAllocatorDefault, jsCFEmptyIString);
-    ASSERT(CFEqual(cfJSString, cfString));
-    ASSERT(CFEqual(cfJSEmptyString, cfEmptyString));
-    CFRelease(cfJSString);
-    CFRelease(cfJSEmptyString);
-
-    CFRelease(cfString);
-    CFRelease(cfEmptyString);
-    
-    jsGlobalValue = JSObjectMake(context, NULL, NULL);
-    makeGlobalNumberValue(context);
-    JSValueProtect(context, jsGlobalValue);
-    JSGarbageCollect(context);
-    ASSERT(JSValueIsObject(context, jsGlobalValue));
-    JSValueUnprotect(context, jsGlobalValue);
-    JSValueUnprotect(context, jsNumberValue);
-
-    JSStringRef goodSyntax = JSStringCreateWithUTF8CString("x = 1;");
-    const char* badSyntaxConstant = "x := 1;";
-    JSStringRef badSyntax = JSStringCreateWithUTF8CString(badSyntaxConstant);
-    ASSERT(JSCheckScriptSyntax(context, goodSyntax, NULL, 0, NULL));
-    ASSERT(!JSCheckScriptSyntax(context, badSyntax, NULL, 0, NULL));
-    ASSERT(!JSScriptCreateFromString(contextGroup, 0, 0, badSyntax, 0, 0));
-    ASSERT(!JSScriptCreateReferencingImmortalASCIIText(contextGroup, 0, 0, badSyntaxConstant, strlen(badSyntaxConstant), 0, 0));
-
-    JSValueRef result;
-    JSValueRef v;
-    JSObjectRef o;
-    JSStringRef string;
-
-    result = JSEvaluateScript(context, goodSyntax, NULL, NULL, 1, NULL);
-    ASSERT(result);
-    ASSERT(JSValueIsEqual(context, result, jsOne, NULL));
-
-    exception = NULL;
-    result = JSEvaluateScript(context, badSyntax, NULL, NULL, 1, &exception);
-    ASSERT(!result);
-    ASSERT(JSValueIsObject(context, exception));
-    
-    JSStringRef array = JSStringCreateWithUTF8CString("Array");
-    JSObjectRef arrayConstructor = JSValueToObject(context, JSObjectGetProperty(context, globalObject, array, NULL), NULL);
-    JSStringRelease(array);
-    result = JSObjectCallAsConstructor(context, arrayConstructor, 0, NULL, NULL);
-    ASSERT(result);
-    ASSERT(JSValueIsObject(context, result));
-    ASSERT(JSValueIsInstanceOfConstructor(context, result, arrayConstructor, NULL));
-    ASSERT(!JSValueIsInstanceOfConstructor(context, JSValueMakeNull(context), arrayConstructor, NULL));
-
-    o = JSValueToObject(context, result, NULL);
-    exception = NULL;
-    ASSERT(JSValueIsUndefined(context, JSObjectGetPropertyAtIndex(context, o, 0, &exception)));
-    ASSERT(!exception);
-    
-    JSObjectSetPropertyAtIndex(context, o, 0, JSValueMakeNumber(context, 1), &exception);
-    ASSERT(!exception);
-    
-    exception = NULL;
-    ASSERT(1 == JSValueToNumber(context, JSObjectGetPropertyAtIndex(context, o, 0, &exception), &exception));
-    ASSERT(!exception);
-
-    JSStringRef functionBody;
-    JSObjectRef function;
-    
-    exception = NULL;
-    functionBody = JSStringCreateWithUTF8CString("rreturn Array;");
-    JSStringRef line = JSStringCreateWithUTF8CString("line");
-    ASSERT(!JSObjectMakeFunction(context, NULL, 0, NULL, functionBody, NULL, 1, &exception));
-    ASSERT(JSValueIsObject(context, exception));
-    v = JSObjectGetProperty(context, JSValueToObject(context, exception, NULL), line, NULL);
-    assertEqualsAsNumber(v, 2);
-    JSStringRelease(functionBody);
-    JSStringRelease(line);
-
-    exception = NULL;
-    functionBody = JSStringCreateWithUTF8CString("rreturn Array;");
-    line = JSStringCreateWithUTF8CString("line");
-    ASSERT(!JSObjectMakeFunction(context, NULL, 0, NULL, functionBody, NULL, -42, &exception));
-    ASSERT(JSValueIsObject(context, exception));
-    v = JSObjectGetProperty(context, JSValueToObject(context, exception, NULL), line, NULL);
-    assertEqualsAsNumber(v, 2);
-    JSStringRelease(functionBody);
-    JSStringRelease(line);
-
-    exception = NULL;
-    functionBody = JSStringCreateWithUTF8CString("// Line one.\nrreturn Array;");
-    line = JSStringCreateWithUTF8CString("line");
-    ASSERT(!JSObjectMakeFunction(context, NULL, 0, NULL, functionBody, NULL, 1, &exception));
-    ASSERT(JSValueIsObject(context, exception));
-    v = JSObjectGetProperty(context, JSValueToObject(context, exception, NULL), line, NULL);
-    assertEqualsAsNumber(v, 3);
-    JSStringRelease(functionBody);
-    JSStringRelease(line);
-
-    exception = NULL;
-    functionBody = JSStringCreateWithUTF8CString("return Array;");
-    function = JSObjectMakeFunction(context, NULL, 0, NULL, functionBody, NULL, 1, &exception);
-    JSStringRelease(functionBody);
-    ASSERT(!exception);
-    ASSERT(JSObjectIsFunction(context, function));
-    v = JSObjectCallAsFunction(context, function, NULL, 0, NULL, NULL);
-    ASSERT(v);
-    ASSERT(JSValueIsEqual(context, v, arrayConstructor, NULL));
-    
-    exception = NULL;
-    function = JSObjectMakeFunction(context, NULL, 0, NULL, jsEmptyIString, NULL, 0, &exception);
-    ASSERT(!exception);
-    v = JSObjectCallAsFunction(context, function, NULL, 0, NULL, &exception);
-    ASSERT(v && !exception);
-    ASSERT(JSValueIsUndefined(context, v));
-    
-    exception = NULL;
-    v = NULL;
-    JSStringRef foo = JSStringCreateWithUTF8CString("foo");
-    JSStringRef argumentNames[] = { foo };
-    functionBody = JSStringCreateWithUTF8CString("return foo;");
-    function = JSObjectMakeFunction(context, foo, 1, argumentNames, functionBody, NULL, 1, &exception);
-    ASSERT(function && !exception);
-    JSValueRef arguments[] = { JSValueMakeNumber(context, 2) };
-    JSObjectCallAsFunction(context, function, NULL, 1, arguments, &exception);
-    JSStringRelease(foo);
-    JSStringRelease(functionBody);
-    
-    string = JSValueToStringCopy(context, function, NULL);
-    assertEqualsAsUTF8String(JSValueMakeString(context, string), "function foo(foo) {\nreturn foo;\n}");
-    JSStringRelease(string);
-
-    JSStringRef print = JSStringCreateWithUTF8CString("print");
-    JSObjectRef printFunction = JSObjectMakeFunctionWithCallback(context, print, print_callAsFunction);
-    JSObjectSetProperty(context, globalObject, print, printFunction, kJSPropertyAttributeNone, NULL); 
-    JSStringRelease(print);
-    
-    ASSERT(!JSObjectSetPrivate(printFunction, (void*)1));
-    ASSERT(!JSObjectGetPrivate(printFunction));
-
-    JSStringRef myConstructorIString = JSStringCreateWithUTF8CString("MyConstructor");
-    JSObjectRef myConstructor = JSObjectMakeConstructor(context, NULL, myConstructor_callAsConstructor);
-    JSObjectSetProperty(context, globalObject, myConstructorIString, myConstructor, kJSPropertyAttributeNone, NULL);
-    JSStringRelease(myConstructorIString);
-    
-    JSStringRef myBadConstructorIString = JSStringCreateWithUTF8CString("MyBadConstructor");
-    JSObjectRef myBadConstructor = JSObjectMakeConstructor(context, NULL, myBadConstructor_callAsConstructor);
-    JSObjectSetProperty(context, globalObject, myBadConstructorIString, myBadConstructor, kJSPropertyAttributeNone, NULL);
-    JSStringRelease(myBadConstructorIString);
-    
-    ASSERT(!JSObjectSetPrivate(myConstructor, (void*)1));
-    ASSERT(!JSObjectGetPrivate(myConstructor));
-    
-    string = JSStringCreateWithUTF8CString("Base");
-    JSObjectRef baseConstructor = JSObjectMakeConstructor(context, Base_class(context), NULL);
-    JSObjectSetProperty(context, globalObject, string, baseConstructor, kJSPropertyAttributeNone, NULL);
-    JSStringRelease(string);
-    
-    string = JSStringCreateWithUTF8CString("Derived");
-    JSObjectRef derivedConstructor = JSObjectMakeConstructor(context, Derived_class(context), NULL);
-    JSObjectSetProperty(context, globalObject, string, derivedConstructor, kJSPropertyAttributeNone, NULL);
-    JSStringRelease(string);
-    
-    string = JSStringCreateWithUTF8CString("Derived2");
-    JSObjectRef derived2Constructor = JSObjectMakeConstructor(context, Derived2_class(context), NULL);
-    JSObjectSetProperty(context, globalObject, string, derived2Constructor, kJSPropertyAttributeNone, NULL);
-    JSStringRelease(string);
-
-    o = JSObjectMake(context, NULL, NULL);
-    JSObjectSetProperty(context, o, jsOneIString, JSValueMakeNumber(context, 1), kJSPropertyAttributeNone, NULL);
-    JSObjectSetProperty(context, o, jsCFIString,  JSValueMakeNumber(context, 1), kJSPropertyAttributeDontEnum, NULL);
-    JSPropertyNameArrayRef nameArray = JSObjectCopyPropertyNames(context, o);
-    size_t expectedCount = JSPropertyNameArrayGetCount(nameArray);
-    size_t count;
-    for (count = 0; count < expectedCount; ++count)
-        JSPropertyNameArrayGetNameAtIndex(nameArray, count);
-    JSPropertyNameArrayRelease(nameArray);
-    ASSERT(count == 1); // jsCFString should not be enumerated
-
-    JSValueRef argumentsArrayValues[] = { JSValueMakeNumber(context, 10), JSValueMakeNumber(context, 20) };
-    o = JSObjectMakeArray(context, sizeof(argumentsArrayValues) / sizeof(JSValueRef), argumentsArrayValues, NULL);
-    string = JSStringCreateWithUTF8CString("length");
-    v = JSObjectGetProperty(context, o, string, NULL);
-    assertEqualsAsNumber(v, 2);
-    v = JSObjectGetPropertyAtIndex(context, o, 0, NULL);
-    assertEqualsAsNumber(v, 10);
-    v = JSObjectGetPropertyAtIndex(context, o, 1, NULL);
-    assertEqualsAsNumber(v, 20);
-
-    o = JSObjectMakeArray(context, 0, NULL, NULL);
-    v = JSObjectGetProperty(context, o, string, NULL);
-    assertEqualsAsNumber(v, 0);
-    JSStringRelease(string);
-
-    JSValueRef argumentsDateValues[] = { JSValueMakeNumber(context, 0) };
-    o = JSObjectMakeDate(context, 1, argumentsDateValues, NULL);
-    if (timeZoneIsPST())
-        assertEqualsAsUTF8String(o, "Wed Dec 31 1969 16:00:00 GMT-0800 (PST)");
-
-    string = JSStringCreateWithUTF8CString("an error message");
-    JSValueRef argumentsErrorValues[] = { JSValueMakeString(context, string) };
-    o = JSObjectMakeError(context, 1, argumentsErrorValues, NULL);
-    assertEqualsAsUTF8String(o, "Error: an error message");
-    JSStringRelease(string);
-
-    string = JSStringCreateWithUTF8CString("foo");
-    JSStringRef string2 = JSStringCreateWithUTF8CString("gi");
-    JSValueRef argumentsRegExpValues[] = { JSValueMakeString(context, string), JSValueMakeString(context, string2) };
-    o = JSObjectMakeRegExp(context, 2, argumentsRegExpValues, NULL);
-    assertEqualsAsUTF8String(o, "/foo/gi");
-    JSStringRelease(string);
-    JSStringRelease(string2);
-
-    JSClassDefinition nullDefinition = kJSClassDefinitionEmpty;
-    nullDefinition.attributes = kJSClassAttributeNoAutomaticPrototype;
-    JSClassRef nullClass = JSClassCreate(&nullDefinition);
-    JSClassRelease(nullClass);
-    
-    nullDefinition = kJSClassDefinitionEmpty;
-    nullClass = JSClassCreate(&nullDefinition);
-    JSClassRelease(nullClass);
-
-    functionBody = JSStringCreateWithUTF8CString("return this;");
-    function = JSObjectMakeFunction(context, NULL, 0, NULL, functionBody, NULL, 1, NULL);
-    JSStringRelease(functionBody);
-    v = JSObjectCallAsFunction(context, function, NULL, 0, NULL, NULL);
-    ASSERT(JSValueIsEqual(context, v, globalObject, NULL));
-    v = JSObjectCallAsFunction(context, function, o, 0, NULL, NULL);
-    ASSERT(JSValueIsEqual(context, v, o, NULL));
-
-    functionBody = JSStringCreateWithUTF8CString("return eval(\"this\");");
-    function = JSObjectMakeFunction(context, NULL, 0, NULL, functionBody, NULL, 1, NULL);
-    JSStringRelease(functionBody);
-    v = JSObjectCallAsFunction(context, function, NULL, 0, NULL, NULL);
-    ASSERT(JSValueIsEqual(context, v, globalObject, NULL));
-    v = JSObjectCallAsFunction(context, function, o, 0, NULL, NULL);
-    ASSERT(JSValueIsEqual(context, v, o, NULL));
-
-    const char* thisScript = "this;";
-    JSStringRef script = JSStringCreateWithUTF8CString(thisScript);
-    v = JSEvaluateScript(context, script, NULL, NULL, 1, NULL);
-    ASSERT(JSValueIsEqual(context, v, globalObject, NULL));
-    v = JSEvaluateScript(context, script, o, NULL, 1, NULL);
-    ASSERT(JSValueIsEqual(context, v, o, NULL));
-    JSStringRelease(script);
-
-    JSScriptRef scriptObject = JSScriptCreateReferencingImmortalASCIIText(contextGroup, 0, 0, thisScript, strlen(thisScript), 0, 0);
-    v = JSScriptEvaluate(context, scriptObject, NULL, NULL);
-    ASSERT(JSValueIsEqual(context, v, globalObject, NULL));
-    v = JSScriptEvaluate(context, scriptObject, o, NULL);
-    ASSERT(JSValueIsEqual(context, v, o, NULL));
-    JSScriptRelease(scriptObject);
-
-    script = JSStringCreateWithUTF8CString("eval(this);");
-    v = JSEvaluateScript(context, script, NULL, NULL, 1, NULL);
-    ASSERT(JSValueIsEqual(context, v, globalObject, NULL));
-    v = JSEvaluateScript(context, script, o, NULL, 1, NULL);
-    ASSERT(JSValueIsEqual(context, v, o, NULL));
-    JSStringRelease(script);
-
-    script = JSStringCreateWithUTF8CString("[ ]");
-    v = JSEvaluateScript(context, script, NULL, NULL, 1, NULL);
-    ASSERT(JSValueIsArray(context, v));
-    JSStringRelease(script);
-
-    script = JSStringCreateWithUTF8CString("new Date");
-    v = JSEvaluateScript(context, script, NULL, NULL, 1, NULL);
-    ASSERT(JSValueIsDate(context, v));
-    JSStringRelease(script);
-
-    exception = NULL;
-    script = JSStringCreateWithUTF8CString("rreturn Array;");
-    JSStringRef sourceURL = JSStringCreateWithUTF8CString("file:///foo/bar.js");
-    JSStringRef sourceURLKey = JSStringCreateWithUTF8CString("sourceURL");
-    JSEvaluateScript(context, script, NULL, sourceURL, 1, &exception);
-    ASSERT(exception);
-    v = JSObjectGetProperty(context, JSValueToObject(context, exception, NULL), sourceURLKey, NULL);
-    assertEqualsAsUTF8String(v, "file:///foo/bar.js");
-    JSStringRelease(script);
-    JSStringRelease(sourceURL);
-    JSStringRelease(sourceURLKey);
-
-    // Verify that creating a constructor for a class with no static functions does not trigger
-    // an assert inside putDirect or lead to a crash during GC. 
-    nullDefinition = kJSClassDefinitionEmpty;
-    nullClass = JSClassCreate(&nullDefinition);
-    JSObjectMakeConstructor(context, nullClass, 0);
-    JSClassRelease(nullClass);
-
-    char* scriptUTF8 = createStringWithContentsOfFile(scriptPath);
-    if (!scriptUTF8) {
-        printf("FAIL: Test script could not be loaded.\n");
-        failed = 1;
-    } else {
-        JSStringRef url = JSStringCreateWithUTF8CString(scriptPath);
-        JSStringRef script = JSStringCreateWithUTF8CString(scriptUTF8);
-        JSStringRef errorMessage = 0;
-        int errorLine = 0;
-        JSScriptRef scriptObject = JSScriptCreateFromString(contextGroup, url, 1, script, &errorMessage, &errorLine);
-        ASSERT((!scriptObject) != (!errorMessage));
-        if (!scriptObject) {
-            printf("FAIL: Test script did not parse\n\t%s:%d\n\t", scriptPath, errorLine);
-            CFStringRef errorCF = JSStringCopyCFString(kCFAllocatorDefault, errorMessage);
-            CFShow(errorCF);
-            CFRelease(errorCF);
-            JSStringRelease(errorMessage);
-            failed = 1;
-        }
-
-        JSStringRelease(script);
-        exception = NULL;
-        result = scriptObject ? JSScriptEvaluate(context, scriptObject, 0, &exception) : 0;
-        if (result && JSValueIsUndefined(context, result))
-            printf("PASS: Test script executed successfully.\n");
-        else {
-            printf("FAIL: Test script returned unexpected value:\n");
-            JSStringRef exceptionIString = JSValueToStringCopy(context, exception, NULL);
-            CFStringRef exceptionCF = JSStringCopyCFString(kCFAllocatorDefault, exceptionIString);
-            CFShow(exceptionCF);
-            CFRelease(exceptionCF);
-            JSStringRelease(exceptionIString);
-            failed = 1;
-        }
-        JSScriptRelease(scriptObject);
-        free(scriptUTF8);
-    }
-
-    // Check Promise is not exposed.
-    {
-        JSObjectRef globalObject = JSContextGetGlobalObject(context);
-        {
-            JSStringRef promiseProperty = JSStringCreateWithUTF8CString("Promise");
-            ASSERT(JSObjectHasProperty(context, globalObject, promiseProperty));
-            JSStringRelease(promiseProperty);
-        }
-        {
-            JSStringRef script = JSStringCreateWithUTF8CString("typeof Promise");
-            JSStringRef function = JSStringCreateWithUTF8CString("function");
-            JSValueRef value = JSEvaluateScript(context, script, NULL, NULL, 1, NULL);
-            ASSERT(JSValueIsString(context, value));
-            JSStringRef valueAsString = JSValueToStringCopy(context, value, NULL);
-            ASSERT(JSStringIsEqual(valueAsString, function));
-            JSStringRelease(valueAsString);
-            JSStringRelease(function);
-            JSStringRelease(script);
-        }
-        printf("PASS: Promise is exposed under JSContext API.\n");
-    }
-
-    // Check microtasks.
-    {
-        JSGlobalContextRef context = JSGlobalContextCreateInGroup(NULL, NULL);
-        {
-            JSObjectRef globalObject = JSContextGetGlobalObject(context);
-            JSValueRef exception;
-            JSStringRef code = JSStringCreateWithUTF8CString("result = 0; Promise.resolve(42).then(function (value) { result = value; });");
-            JSStringRef file = JSStringCreateWithUTF8CString("");
-            assertTrue(JSEvaluateScript(context, code, globalObject, file, 1, &exception), "An exception should not be thrown");
-            JSStringRelease(code);
-            JSStringRelease(file);
-
-            JSStringRef resultProperty = JSStringCreateWithUTF8CString("result");
-            ASSERT(JSObjectHasProperty(context, globalObject, resultProperty));
-
-            JSValueRef resultValue = JSObjectGetProperty(context, globalObject, resultProperty, &exception);
-            assertEqualsAsNumber(resultValue, 42);
-            JSStringRelease(resultProperty);
-        }
-        JSGlobalContextRelease(context);
-    }
-
-    failed = testExecutionTimeLimit() || failed;
-    failed = testGlobalContextWithFinalizer() || failed;
-
-    // Clear out local variables pointing at JSObjectRefs to allow their values to be collected
-    function = NULL;
-    v = NULL;
-    o = NULL;
-    globalObject = NULL;
-    myConstructor = NULL;
-
-    JSStringRelease(jsEmptyIString);
-    JSStringRelease(jsOneIString);
-    JSStringRelease(jsCFIString);
-    JSStringRelease(jsCFEmptyIString);
-    JSStringRelease(jsCFIStringWithCharacters);
-    JSStringRelease(jsCFEmptyIStringWithCharacters);
-    JSStringRelease(goodSyntax);
-    JSStringRelease(badSyntax);
-
-    JSGlobalContextRelease(context);
-    JSClassRelease(globalObjectClass);
-
-    // Test for an infinite prototype chain that used to be created. This test
-    // passes if the call to JSObjectHasProperty() does not hang.
-
-    JSClassDefinition prototypeLoopClassDefinition = kJSClassDefinitionEmpty;
-    prototypeLoopClassDefinition.staticFunctions = globalObject_staticFunctions;
-    JSClassRef prototypeLoopClass = JSClassCreate(&prototypeLoopClassDefinition);
-    JSGlobalContextRef prototypeLoopContext = JSGlobalContextCreateInGroup(NULL, prototypeLoopClass);
-
-    JSStringRef nameProperty = JSStringCreateWithUTF8CString("name");
-    JSObjectHasProperty(prototypeLoopContext, JSContextGetGlobalObject(prototypeLoopContext), nameProperty);
-
-    JSGlobalContextRelease(prototypeLoopContext);
-    JSClassRelease(prototypeLoopClass);
-
-    printf("PASS: Infinite prototype chain does not occur.\n");
-
-    if (checkForCycleInPrototypeChain())
-        printf("PASS: A cycle in a prototype chain can't be created.\n");
-    else {
-        printf("FAIL: A cycle in a prototype chain can be created.\n");
-        failed = true;
-    }
-    if (valueToObjectExceptionTest())
-        printf("PASS: throwException did not crash when handling an error with appendMessageToError set and no codeBlock available.\n");
-
-    if (globalContextNameTest())
-        printf("PASS: global context name behaves as expected.\n");
-
-    customGlobalObjectClassTest();
-    globalObjectSetPrototypeTest();
-    globalObjectPrivatePropertyTest();
-
-    if (failed) {
-        printf("FAIL: Some tests failed.\n");
-        return 1;
-    }
-
-    printf("PASS: Program exited normally.\n");
-    return 0;
-}
-
-static char* createStringWithContentsOfFile(const char* fileName)
-{
-    char* buffer;
-    
-    size_t buffer_size = 0;
-    size_t buffer_capacity = 1024;
-    buffer = (char*)malloc(buffer_capacity);
-    
-    FILE* f = fopen(fileName, "r");
-    if (!f) {
-        fprintf(stderr, "Could not open file: %s\n", fileName);
-        free(buffer);
-        return 0;
-    }
-    
-    while (!feof(f) && !ferror(f)) {
-        buffer_size += fread(buffer + buffer_size, 1, buffer_capacity - buffer_size, f);
-        if (buffer_size == buffer_capacity) { // guarantees space for trailing '\0'
-            buffer_capacity *= 2;
-            buffer = (char*)realloc(buffer, buffer_capacity);
-            ASSERT(buffer);
-        }
-        
-        ASSERT(buffer_size < buffer_capacity);
-    }
-    fclose(f);
-    buffer[buffer_size] = '\0';
-    
-    return buffer;
-}
-
-#if OS(WINDOWS)
-extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(int argc, const char* argv[])
-{
-    return main(argc, const_cast(argv));
-}
-#endif
diff --git a/Source/JavaScriptCore/API/tests/testapi.js b/Source/JavaScriptCore/API/tests/testapi.js
deleted file mode 100644
index 88d3701c2..000000000
--- a/Source/JavaScriptCore/API/tests/testapi.js
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    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 INC. ``AS IS'' AND ANY
- * 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 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
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-function bludgeonArguments() { if (0) arguments; return function g() {} }
-h = bludgeonArguments();
-gc();
-
-var failed = false;
-function pass(msg)
-{
-    print("PASS: " + msg, "green");
-}
-
-function fail(msg)
-{
-    print("FAIL: " + msg, "red");
-    failed = true;
-}
-
-function shouldBe(a, b)
-{
-    var evalA;
-    try {
-        evalA = eval(a);
-    } catch(e) {
-        evalA = e;
-    }
-    
-    if (evalA == b || isNaN(evalA) && typeof evalA == 'number' && isNaN(b) && typeof b == 'number')
-        pass(a + " should be " + b + " and is.");
-    else
-        fail(a + " should be " + b + " but instead is " + evalA + ".");
-}
-
-function shouldThrow(a)
-{
-    var evalA;
-    try {
-        eval(a);
-    } catch(e) {
-        pass(a + " threw: " + e);
-        return;
-    }
-
-    fail(a + " did not throw an exception.");
-}
-
-function globalStaticFunction()
-{
-    return 4;
-}
-
-shouldBe("globalStaticValue", 3);
-shouldBe("globalStaticFunction()", 4);
-shouldBe("this.globalStaticFunction()", 4);
-
-function globalStaticFunction2() {
-    return 10;
-}
-shouldBe("globalStaticFunction2();", 10);
-this.globalStaticFunction2 = function() { return 20; }
-shouldBe("globalStaticFunction2();", 20);
-shouldBe("this.globalStaticFunction2();", 20);
-
-function iAmNotAStaticFunction() { return 10; }
-shouldBe("iAmNotAStaticFunction();", 10);
-this.iAmNotAStaticFunction = function() { return 20; }
-shouldBe("iAmNotAStaticFunction();", 20);
-
-shouldBe("typeof MyObject", "function"); // our object implements 'call'
-MyObject.cantFind = 1;
-shouldBe("MyObject.cantFind", undefined);
-MyObject.regularType = 1;
-shouldBe("MyObject.regularType", 1);
-MyObject.alwaysOne = 2;
-shouldBe("MyObject.alwaysOne", 1);
-MyObject.cantDelete = 1;
-delete MyObject.cantDelete;
-shouldBe("MyObject.cantDelete", 1);
-shouldBe("delete MyObject.throwOnDelete", "an exception");
-MyObject.cantSet = 1;
-shouldBe("MyObject.cantSet", undefined);
-shouldBe("MyObject.throwOnGet", "an exception");
-shouldBe("MyObject.throwOnSet = 5", "an exception");
-shouldBe("MyObject('throwOnCall')", "an exception");
-shouldBe("new MyObject('throwOnConstruct')", "an exception");
-shouldBe("'throwOnHasInstance' instanceof MyObject", "an exception");
-
-MyObject.nullGetForwardSet = 1;
-shouldBe("MyObject.nullGetForwardSet", 1);
-
-var foundMyPropertyName = false;
-var foundRegularType = false;
-for (var p in MyObject) {
-    if (p == "myPropertyName")
-        foundMyPropertyName = true;
-    if (p == "regularType")
-        foundRegularType = true;
-}
-
-if (foundMyPropertyName)
-    pass("MyObject.myPropertyName was enumerated");
-else
-    fail("MyObject.myPropertyName was not enumerated");
-
-if (foundRegularType)
-    pass("MyObject.regularType was enumerated");
-else
-    fail("MyObject.regularType was not enumerated");
-
-var alwaysOneDescriptor = Object.getOwnPropertyDescriptor(MyObject, "alwaysOne");
-shouldBe('typeof alwaysOneDescriptor', "object");
-shouldBe('alwaysOneDescriptor.value', MyObject.alwaysOne);
-shouldBe('alwaysOneDescriptor.configurable', true);
-shouldBe('alwaysOneDescriptor.enumerable', false); // Actually it is.
-var cantFindDescriptor = Object.getOwnPropertyDescriptor(MyObject, "cantFind");
-shouldBe('typeof cantFindDescriptor', "object");
-shouldBe('cantFindDescriptor.value', MyObject.cantFind);
-shouldBe('cantFindDescriptor.configurable', true);
-shouldBe('cantFindDescriptor.enumerable', false);
-try {
-    // If getOwnPropertyDescriptor() returned an access descriptor, this wouldn't throw.
-    Object.getOwnPropertyDescriptor(MyObject, "throwOnGet");
-} catch (e) {
-    pass("getting property descriptor of throwOnGet threw exception");
-}
-var myPropertyNameDescriptor = Object.getOwnPropertyDescriptor(MyObject, "myPropertyName");
-shouldBe('typeof myPropertyNameDescriptor', "object");
-shouldBe('myPropertyNameDescriptor.value', MyObject.myPropertyName);
-shouldBe('myPropertyNameDescriptor.configurable', true);
-shouldBe('myPropertyNameDescriptor.enumerable', false); // Actually it is.
-try {
-    // if getOwnPropertyDescriptor() returned an access descriptor, this wouldn't throw.
-    Object.getOwnPropertyDescriptor(MyObject, "hasPropertyLie");
-} catch (e) {
-    pass("getting property descriptor of hasPropertyLie threw exception");
-}
-shouldBe('Object.getOwnPropertyDescriptor(MyObject, "doesNotExist")', undefined);
-
-myObject = new MyObject();
-
-shouldBe("delete MyObject.regularType", true);
-shouldBe("MyObject.regularType", undefined);
-shouldBe("MyObject(0)", 1);
-shouldBe("MyObject()", undefined);
-shouldBe("typeof myObject", "object");
-shouldBe("MyObject ? 1 : 0", true); // toBoolean
-shouldBe("+MyObject", 1); // toNumber
-shouldBe("(Object.prototype.toString.call(MyObject))", "[object MyObject]"); // Object.prototype.toString
-shouldBe("(MyObject.toString())", "[object MyObject]"); // toString
-shouldBe("String(MyObject)", "MyObjectAsString"); // toString
-shouldBe("MyObject - 0", 1); // toNumber
-shouldBe("MyObject.valueOf()", 1); // valueOf
-
-shouldBe("typeof MyConstructor", "object");
-constructedObject = new MyConstructor(1);
-shouldBe("typeof constructedObject", "object");
-shouldBe("constructedObject.value", 1);
-shouldBe("myObject instanceof MyObject", true);
-shouldBe("(new Object()) instanceof MyObject", false);
-
-shouldThrow("new MyBadConstructor()");
-
-MyObject.nullGetSet = 1;
-shouldBe("MyObject.nullGetSet", 1);
-shouldThrow("MyObject.nullCall()");
-shouldThrow("MyObject.hasPropertyLie");
-
-derived = new Derived();
-
-shouldBe("derived instanceof Derived", true);
-shouldBe("derived instanceof Base", true);
-
-// base properties and functions return 1 when called/gotten; derived, 2
-shouldBe("derived.baseProtoDup()", 2);
-shouldBe("derived.baseProto()", 1);
-shouldBe("derived.baseDup", 2);
-shouldBe("derived.baseOnly", 1);
-shouldBe("derived.protoOnly()", 2);
-shouldBe("derived.protoDup", 2);
-shouldBe("derived.derivedOnly", 2)
-
-shouldBe("derived.baseHardNull()", undefined)
-
-// base properties throw 1 when set; derived, 2
-shouldBe("derived.baseDup = 0", 2);
-shouldBe("derived.baseOnly = 0", 1);
-shouldBe("derived.derivedOnly = 0", 2)
-shouldBe("derived.protoDup = 0", 2);
-
-derived2 = new Derived2();
-
-shouldBe("derived2 instanceof Derived2", true);
-shouldBe("derived2 instanceof Derived", true);
-shouldBe("derived2 instanceof Base", true);
-
-// base properties and functions return 1 when called/gotten; derived, 2
-shouldBe("derived2.baseProtoDup()", 2);
-shouldBe("derived2.baseProto()", 1);
-shouldBe("derived2.baseDup", 2);
-shouldBe("derived2.baseOnly", 1);
-shouldBe("derived2.protoOnly()", 2);
-shouldBe("derived2.protoDup", 2);
-shouldBe("derived2.derivedOnly", 2)
-
-// base properties throw 1 when set; derived, 2
-shouldBe("derived2.baseDup = 0", 2);
-shouldBe("derived2.baseOnly = 0", 1);
-shouldBe("derived2.derivedOnly = 0", 2)
-shouldBe("derived2.protoDup = 0", 2);
-
-shouldBe('Object.getOwnPropertyDescriptor(derived, "baseProto")', undefined);
-shouldBe('Object.getOwnPropertyDescriptor(derived, "baseProtoDup")', undefined);
-var baseDupDescriptor = Object.getOwnPropertyDescriptor(derived, "baseDup");
-shouldBe('typeof baseDupDescriptor', "object");
-shouldBe('baseDupDescriptor.value', derived.baseDup);
-shouldBe('baseDupDescriptor.configurable', true);
-shouldBe('baseDupDescriptor.enumerable', false);
-var baseOnlyDescriptor = Object.getOwnPropertyDescriptor(derived, "baseOnly");
-shouldBe('typeof baseOnlyDescriptor', "object");
-shouldBe('baseOnlyDescriptor.value', derived.baseOnly);
-shouldBe('baseOnlyDescriptor.configurable', true);
-shouldBe('baseOnlyDescriptor.enumerable', false);
-shouldBe('Object.getOwnPropertyDescriptor(derived, "protoOnly")', undefined);
-var protoDupDescriptor = Object.getOwnPropertyDescriptor(derived, "protoDup");
-shouldBe('typeof protoDupDescriptor', "object");
-shouldBe('protoDupDescriptor.value', derived.protoDup);
-shouldBe('protoDupDescriptor.configurable', true);
-shouldBe('protoDupDescriptor.enumerable', false);
-var derivedOnlyDescriptor = Object.getOwnPropertyDescriptor(derived, "derivedOnly");
-shouldBe('typeof derivedOnlyDescriptor', "object");
-shouldBe('derivedOnlyDescriptor.value', derived.derivedOnly);
-shouldBe('derivedOnlyDescriptor.configurable', true);
-shouldBe('derivedOnlyDescriptor.enumerable', false);
-
-shouldBe("undefined instanceof MyObject", false);
-EvilExceptionObject.hasInstance = function f() { return f(); };
-EvilExceptionObject.__proto__ = undefined;
-shouldThrow("undefined instanceof EvilExceptionObject");
-EvilExceptionObject.hasInstance = function () { return true; };
-shouldBe("undefined instanceof EvilExceptionObject", true);
-
-EvilExceptionObject.toNumber = function f() { return f(); }
-shouldThrow("EvilExceptionObject*5");
-EvilExceptionObject.toStringExplicit = function f() { return f(); }
-shouldThrow("String(EvilExceptionObject)");
-
-shouldBe("console", "[object Console]");
-shouldBe("typeof console.log", "function");
-
-shouldBe("EmptyObject", "[object CallbackObject]");
-
-for (var i = 0; i < 6; ++i)
-    PropertyCatchalls.x = i;
-shouldBe("PropertyCatchalls.x", 4);
-
-for (var i = 0; i < 6; ++i)
-    var x = PropertyCatchalls.x;
-shouldBe("x", null);
-var make_throw = 'make_throw';
-shouldThrow("PropertyCatchalls[make_throw]=1");
-make_throw = 0;
-shouldThrow("PropertyCatchalls[make_throw]=1");
-
-for (var i = 0; i < 10; ++i) {
-    for (var p in PropertyCatchalls) {
-        if (p == "x")
-            continue;
-        shouldBe("p", i % 10);
-        break;
-    }
-}
-
-PropertyCatchalls.__proto__ = { y: 1 };
-for (var i = 0; i < 6; ++i)
-    var y = PropertyCatchalls.y;
-shouldBe("y", null);
-
-var o = { __proto__: PropertyCatchalls };
-for (var i = 0; i < 6; ++i)
-    var z = PropertyCatchalls.z;
-shouldBe("z", null);
-
-if (failed)
-    throw "Some tests failed";
-- 
cgit v1.2.1