Changeset 241929 in webkit

Timestamp:

Feb 21, 2019 8:21:54 PM (5 years ago)

Author:

sbarati@apple.com

Message:

Update JSScript SPI based on feedback
​https://bugs.webkit.org/show_bug.cgi?id=194517

Reviewed by Keith Miller.

This patch updates the JSScript SPI in the following ways:

• JSScript can now represent both modules and programs. This is a property

of the script determined during creation.

• JSScript now takes a sourceURL during construction. For modules, this acts

as the module identifier.

• JSScript now has SPI for writing the cache out to disk. We don't do this

automatically.

• JSScript will load the bytecode cache on creation if it exists.
• We retrofit these new requirements on the prior JSScript SPI that

we're going to remove as soon as we can: ​https://bugs.webkit.org/show_bug.cgi?id=194909.
Previous SPI assumes all JSScripts are modules. Previous SPI also assigns
a sourceURL to the JSScript based on what the module loader decided the
identifier should be. We'll remove this once we remove the old SPI.

This patch also adds SPI to JSContext to evaluate a JSScript. For modules,
this is like returning the result of doing dynamic import. For programs,
this does normal program evaluation.

This patch also fixes a bug in generateBytecode/generateModuleBytecode where
we would try to cache the bytecode even if recursivelyGenerateUnlinkedCodeBlock
returned null. E.g, if the script had a syntax error.

When writing tests, I also discovered that someone previously broke
testapi. This patch also fixes those failures. They were broken when
we switched to using a testapiScripts directory to hold our test .js
scripts.

• API/JSAPIGlobalObject.h:
• API/JSAPIGlobalObject.mm:

(JSC::JSAPIGlobalObject::moduleLoaderResolve):
(JSC::JSAPIGlobalObject::moduleLoaderFetch):
(JSC::JSAPIGlobalObject::loadAndEvaluateJSScriptModule):

• API/JSBase.cpp:

(JSEvaluateScriptInternal):
(JSEvaluateScript):

• API/JSBaseInternal.h: Added.
• API/JSContext.mm:

(-[JSContext evaluateScript:withSourceURL:]):
(-[JSContext evaluateJSScript:]):

• API/JSContextPrivate.h:
• API/JSScript.h:
• API/JSScript.mm:

(+[JSScript scriptWithSource:inVirtualMachine:]):
(+[JSScript scriptFromASCIIFile:inVirtualMachine:withCodeSigning:andBytecodeCache:]):
(createError):
(+[JSScript scriptOfType:inVirtualMachine:withSourceURL:andSource:andBytecodeCache:error:]):
(+[JSScript scriptOfType:inVirtualMachine:memoryMappedFromASCIIFile:withSourceURL:andBytecodeCache:error:]):
(-[JSScript cacheBytecodeWithError:]):
(-[JSScript sourceURL]):
(-[JSScript type]):
(-[JSScript jsSourceCode]):
(-[JSScript writeCache:]):
(-[JSScript setSourceURL:]):
(-[JSScript forceRecreateJSSourceCode]):
(-[JSScript writeCache]): Deleted.
(-[JSScript jsSourceCode:]): Deleted.

• API/JSScriptInternal.h:
• API/tests/FunctionOverridesTest.cpp:

(testFunctionOverrides):

• API/tests/testapi.c:

(main):

• API/tests/testapi.mm:

(tempFile):
(testModuleBytecodeCache):
(testProgramBytecodeCache):
(testBytecodeCacheWithSyntaxError):
(testProgramJSScriptException):
(testLoadBasicFileLegacySPI):
(+[JSContextMemoryMappedLoaderDelegate newContext]):
(-[JSContextMemoryMappedLoaderDelegate context:fetchModuleForIdentifier:withResolveHandler:andRejectHandler:]):
(testLoadBasicFile):
(+[JSContextAugmentedLoaderDelegate newContext]):
(-[JSContextAugmentedLoaderDelegate context:fetchModuleForIdentifier:withResolveHandler:andRejectHandler:]):
(testJSScriptURL):
(testObjectiveCAPI):
(testBytecodeCache): Deleted.

• API/tests/testapiScripts/foo.js: Added.
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/Completion.cpp:

(JSC::generateBytecode):
(JSC::generateModuleBytecode):

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSAPIGlobalObject.h (modified) (2 diffs)
• API/JSAPIGlobalObject.mm (modified) (5 diffs)
• API/JSBase.cpp (modified) (4 diffs)
• API/JSBaseInternal.h (copied) (copied from trunk/Source/JavaScriptCore/API/tests/testIncludes.m) (1 diff)
• API/JSContext.mm (modified) (2 diffs)
• API/JSContextPrivate.h (modified) (1 diff)
• API/JSScript.h (modified) (1 diff)
• API/JSScript.mm (modified) (8 diffs)
• API/JSScriptInternal.h (modified) (1 diff)
• API/tests/FunctionOverridesTest.cpp (modified) (1 diff)
• API/tests/testIncludes.m (modified) (1 diff)
• API/tests/testapi.c (modified) (6 diffs)
• API/tests/testapi.mm (modified) (8 diffs)
• API/tests/testapiScripts/foo.js (copied) (copied from trunk/Source/JavaScriptCore/API/tests/testIncludes.m) (1 diff)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (8 diffs)
• config.h (modified) (1 diff)
• runtime/Completion.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/JSAPIGlobalObject.h

@@ -28 +28 @@
 #include "JSGlobalObject.h"
 
+OBJC_CLASS JSScript;
+
 namespace JSC {
 
@@ -56 +58 @@
     static JSObject* moduleLoaderCreateImportMetaProperties(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSModuleRecord*, JSValue);
 
+    JSValue loadAndEvaluateJSScriptModule(const JSLockHolder&, JSScript *);
+
 private:
     JSAPIGlobalObject(VM& vm, Structure* structure)

trunk/Source/JavaScriptCore/API/JSAPIGlobalObject.mm

@@ -35 +35 @@
 #import "Exception.h"
 #import "JSContextInternal.h"
+#import "JSInternalPromise.h"
 #import "JSInternalPromiseDeferred.h"
 #import "JSNativeStdFunction.h"
+#import "JSPromiseDeferred.h"
 #import "JSScriptInternal.h"
 #import "JSSourceCode.h"
@@ -44 +46 @@
 #import "ObjectConstructor.h"
 #import "SourceOrigin.h"
-
 #import <wtf/URL.h>
 
@@ -76 +77 @@
     String name =  key.toWTFString(exec);
 
-    URL referrerURL(URL(), jsCast<JSString*>(referrer)->tryGetValue());
-    RELEASE_ASSERT(referrerURL.isValid());
-
-    URL url = URL(referrerURL, name);
-    if (url.isValid())
-        return Identifier::fromString(exec, url);
+    if (JSString* referrerString = jsDynamicCast<JSString*>(vm, referrer)) {
+        String value = referrerString->value(exec);
+        URL referrerURL({ }, value);
+        RETURN_IF_EXCEPTION(scope, { });
+        RELEASE_ASSERT(referrerURL.isValid());
+
+        URL url = URL(referrerURL, name);
+        if (url.isValid())
+            return Identifier::fromString(exec, url);
+    } else {
+        URL url = URL({ }, name);
+        if (url.isValid())
+            return Identifier::fromString(exec, url);
+    }
 
     throwVMError(exec, scope, "Could not form valid URL from identifier and base"_s);
@@ -163 +172 @@
 
     auto deferredPromise = Strong<JSInternalPromiseDeferred>(vm, deferred);
-    auto strongKey = Strong<JSString>(vm, jsSecureCast<JSString*>(vm, key));
     auto* resolve = JSNativeStdFunction::create(vm, globalObject, 1, "resolve", [=] (ExecState* exec) {
         // This captures the globalObject but that's ok because our structure keeps it alive anyway.
+        VM& vm = exec->vm();
         JSContext *context = [JSContext contextWithJSGlobalContextRef:toGlobalRef(globalObject->globalExec())];
         id script = valueToObject(context, toRef(exec, exec->argument(0)));
 
         MarkedArgumentBuffer args;
-        if (UNLIKELY(![script isKindOfClass:[JSScript class]])) {
-            args.append(createTypeError(exec, "First argument of resolution callback is not a JSScript"));
+
+        auto rejectPromise = [&] (String message) {
+            args.append(createTypeError(exec, message));
             call(exec, deferredPromise->JSPromiseDeferred::reject(), args, "This should never be seen...");
             return encodedJSUndefined();
+        };
+
+        if (UNLIKELY(![script isKindOfClass:[JSScript class]]))
+            return rejectPromise("First argument of resolution callback is not a JSScript"_s);
+
+        JSScript* jsScript = static_cast<JSScript *>(script);
+
+        JSSourceCode* source = [jsScript jsSourceCode];
+        if (UNLIKELY([jsScript type] != kJSScriptTypeModule))
+            return rejectPromise("The JSScript that was provided did not have expected type of kJSScriptTypeModule."_s);
+
+        // FIXME: The SPI we're deprecating did not require sourceURL, so we just
+        // ignore this check for such use cases until we can remove that SPI. Once
+        // we do that, we can remove the null check for sourceURL:
+        // https://bugs.webkit.org/show_bug.cgi?id=194909
+        if (NSURL *sourceURL = [jsScript sourceURL]) {
+            String oldModuleKey { [sourceURL absoluteString] };
+            if (UNLIKELY(Identifier::fromString(&vm, oldModuleKey) != moduleKey))
+                return rejectPromise(makeString("The same JSScript was provided for two different identifiers, previously: ", oldModuleKey, " and now: ", moduleKey.string()));
+        } else {
+            [jsScript setSourceURL:[NSURL URLWithString:static_cast<NSString *>(moduleKey.string())]];
+            source = [jsScript forceRecreateJSSourceCode];
         }
 
-        args.append([static_cast<JSScript *>(script) jsSourceCode:moduleKey]);
+        args.append(source);
         call(exec, deferredPromise->JSPromiseDeferred::resolve(), args, "This should never be seen...");
         return encodedJSUndefined();
@@ -211 +243 @@
 }
 
+JSValue JSAPIGlobalObject::loadAndEvaluateJSScriptModule(const JSLockHolder&, JSScript *script)
+{
+    ASSERT(script.type == kJSScriptTypeModule);
+    VM& vm = this->vm();
+    ExecState* exec = globalExec();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    Identifier key = Identifier::fromString(exec, String { [[script sourceURL] absoluteString] });
+    JSInternalPromise* promise = importModule(exec, key, jsUndefined(), jsUndefined());
+    RETURN_IF_EXCEPTION(scope, { });
+    auto result = JSPromiseDeferred::tryCreate(exec, this);
+    RETURN_IF_EXCEPTION(scope, { });
+    result->resolve(exec, promise);
+    return result->promise();
+}
+
 }
 

trunk/Source/JavaScriptCore/API/JSBase.cpp

@@ -26 +26 @@
 #include "config.h"
 #include "JSBase.h"
+#include "JSBaseInternal.h"
 #include "JSBasePrivate.h"
 
@@ -48 +49 @@
 using namespace JSC;
 
-JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef thisObject, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
-{
-    if (!ctx) {
-        ASSERT_NOT_REACHED();
-        return 0;
-    }
-    ExecState* exec = toJS(ctx);
-    VM& vm = exec->vm();
-    JSLockHolder locker(vm);
+JSValueRef JSEvaluateScriptInternal(const JSLockHolder&, ExecState* exec, JSContextRef ctx, JSObjectRef thisObject, const SourceCode& source, JSValueRef* exception)
+{
+    UNUSED_PARAM(ctx);
 
     JSObject* jsThisObject = toJS(thisObject);
 
-    startingLineNumber = std::max(1, startingLineNumber);
-
     // evaluate sets "this" to the global object if it is NULL
+    VM& vm = exec->vm();
     JSGlobalObject* globalObject = vm.vmEntryGlobalObject(exec);
-    auto sourceURLString = sourceURL ? sourceURL->string() : String();
-    SourceCode source = makeSource(script->string(), SourceOrigin { sourceURLString }, URL({ }, sourceURLString), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber()));
-
     NakedPtr<Exception> evaluationException;
     JSValue returnValue = profiledEvaluate(globalObject->globalExec(), ProfilingReason::API, source, jsThisObject, evaluationException);
@@ -81 +72 @@
         globalObject->inspectorController().reportAPIException(exec, evaluationException);
 #endif
-        return 0;
+        return nullptr;
     }
 
@@ -89 +80 @@
     // happens, for example, when the only statement is an empty (';') statement
     return toRef(exec, jsUndefined());
+}
+
+JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef thisObject, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
+{
+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return nullptr;
+    }
+    ExecState* exec = toJS(ctx);
+    VM& vm = exec->vm();
+    JSLockHolder locker(vm);
+
+    startingLineNumber = std::max(1, startingLineNumber);
+
+    auto sourceURLString = sourceURL ? sourceURL->string() : String();
+    SourceCode source = makeSource(script->string(), SourceOrigin { sourceURLString }, URL({ }, sourceURLString), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber()));
+
+    return JSEvaluateScriptInternal(locker, exec, ctx, thisObject, source, exception);
 }
 

trunk/Source/JavaScriptCore/API/JSBaseInternal.h

@@ -21 +21 @@
  * 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. 
  */
 
+#pragma once
 
-// Since we include files that haven't passed through the rewriter we need to handle the non-rewritten values...
-#define JSC_API_AVAILABLE(...)
-#define JSC_CLASS_AVAILABLE(...)
-#define JSC_MAC_VERSION_TBA 0
-#define JSC_IOS_VERSION_TBA 0
+#include <JavaScriptCore/JSBase.h>
+#include <JavaScriptCore/WebKitAvailability.h>
 
-// umbrella header
-#import <JavaScriptCore/JavaScriptCore.h>
+namespace JSC {
+class JSLockHolder;
+class ExecState;
+}
 
-// private headers
-#import <JavaScriptCore/JSContextPrivate.h>
-#import <JavaScriptCore/JSScript.h>
-#import <JavaScriptCore/JSValuePrivate.h>
-#import <JavaScriptCore/JSVirtualMachinePrivate.h>
-
+extern "C" JSValueRef JSEvaluateScriptInternal(const JSC::JSLockHolder&, JSC::ExecState*, JSContextRef, JSObjectRef thisObject, const JSC::SourceCode&, JSValueRef* exception);

trunk/Source/JavaScriptCore/API/JSContext.mm

@@ -28 +28 @@
 #import "APICast.h"
 #import "Completion.h"
+#import "JSBaseInternal.h"
 #import "JSCInlines.h"
 #import "JSContextInternal.h"
@@ -113 +114 @@
     if (exceptionValue)
         return [self valueFromNotifyException:exceptionValue];
-
     return [JSValue valueWithJSValueRef:result inContext:self];
+}
+
+- (JSValue *)evaluateJSScript:(JSScript *)script
+{
+    JSC::ExecState* exec = toJS(m_context);
+    JSC::VM& vm = exec->vm();
+    JSC::JSLockHolder locker(vm);
+
+    if (script.type == kJSScriptTypeProgram) {
+        JSValueRef exceptionValue = nullptr;
+        JSValueRef result = JSEvaluateScriptInternal(locker, exec, m_context, nullptr, [script jsSourceCode]->sourceCode(), &exceptionValue);
+
+        if (exceptionValue)
+            return [self valueFromNotifyException:exceptionValue];
+        return [JSValue valueWithJSValueRef:result inContext:self];
+    }
+
+    auto* globalObject = JSC::jsDynamicCast<JSC::JSAPIGlobalObject*>(vm, exec->lexicalGlobalObject());
+    if (!globalObject)
+        return [JSValue valueWithNewPromiseRejectedWithReason:[JSValue valueWithNewErrorFromMessage:@"Context does not support module loading" inContext:self] inContext:self];
+
+    auto scope = DECLARE_CATCH_SCOPE(vm);
+    JSC::JSValue result = globalObject->loadAndEvaluateJSScriptModule(locker, script);
+    if (scope.exception()) {
+        JSValueRef exceptionValue = toRef(exec, scope.exception()->value());
+        scope.clearException();
+        return [JSValue valueWithNewPromiseRejectedWithReason:[JSValue valueWithJSValueRef:exceptionValue inContext:self] inContext:self];
+    }
+    return [JSValue valueWithJSValueRef:toRef(vm, result) inContext:self];
 }
 

trunk/Source/JavaScriptCore/API/JSContextPrivate.h

@@ -75 +75 @@
 @property (nonatomic, weak) id <JSModuleLoaderDelegate> moduleLoaderDelegate JSC_API_AVAILABLE(macosx(JSC_MAC_TBA), ios(JSC_IOS_TBA));
 
+/*!
+ @method
+ @abstract Run a JSScript.
+ @param script the JSScript to evaluate.
+ @discussion If the provided JSScript was created with kJSScriptTypeProgram, the script will run synchronously and return the result of evaluation.
+
+ Otherwise, if the script was created with kJSScriptTypeModule, the module will be run asynchronously and will return a promise resolved when the module and any transitive dependencies are loaded. The module loader will treat the script as if it had been returned from a delegate call to moduleLoaderDelegate. This mirrors the JavaScript dynamic import operation.
+ */
+- (JSValue *)evaluateJSScript:(JSScript *)script;
+
 @end
 

trunk/Source/JavaScriptCore/API/JSScript.h

@@ -32 +32 @@
 @class JSVirtualMachine;
 
+/*!
+ @enum JSScriptType
+ @abstract     A constant identifying the execution type of a JSScript.
+ @constant     kJSScriptTypeProgram  The type of a normal JavaScript program.
+ @constant     kJSScriptTypeModule   The type of a module JavaScript program.
+ */
+typedef NS_ENUM(NSInteger, JSScriptType) {
+    kJSScriptTypeProgram,
+    kJSScriptTypeModule,
+};
+
+
 JSC_CLASS_AVAILABLE(macosx(JSC_MAC_TBA), ios(JSC_IOS_TBA))
 @interface JSScript : NSObject
 
 /*!
+ This SPI is deprecated and should not be used. Use "scriptOfType:withSource:andSourceURL:andBytecodeCache:inVirtualMachine:error:" instead.
+ */
++ (nullable instancetype)scriptWithSource:(NSString *)source inVirtualMachine:(JSVirtualMachine *)vm JSC_API_DEPRECATED("Use +scriptOfType:withSource:andSourceURL:andBytecodeCache:inVirtualMachine:error: instead.", macosx(JSC_MAC_TBA, JSC_MAC_TBA), ios(JSC_IOS_TBA, JSC_IOS_TBA));
+
+/*!
+ This SPI is deprecated and should not be used. Use "scriptOfType:memoryMappedFromASCIIFile:withSourceURL:andBytecodeCache:inVirtualMachine:error:" instead.
+ */
++ (nullable instancetype)scriptFromASCIIFile:(NSURL *)filePath inVirtualMachine:(JSVirtualMachine *)vm withCodeSigning:(nullable NSURL *)codeSigningPath andBytecodeCache:(nullable NSURL *)cachePath JSC_API_DEPRECATED("Use +scriptOfType:memoryMappedFromASCIIFile:withSourceURL:andBytecodeCache:inVirtualMachine:error: instead.", macosx(JSC_MAC_TBA, JSC_MAC_TBA), ios(JSC_IOS_TBA, JSC_IOS_TBA));
+
+/*!
+ This API is deprecated and should not be used.
+ */
++ (nullable instancetype)scriptFromUTF8File:(NSURL *)filePath inVirtualMachine:(JSVirtualMachine *)vm withCodeSigning:(nullable NSURL *)codeSigningPath andBytecodeCache:(nullable NSURL *)cachePath JSC_API_DEPRECATED("Do not use this. Use +scriptOfType:memoryMappedFromASCIIFile:withSourceURL:andBytecodeCache:inVirtualMachine:error: or +scriptOfType:withSource:andSourceURL:andBytecodeCache:inVirtualMachine:error: instead", macosx(JSC_MAC_TBA, JSC_MAC_TBA), ios(JSC_IOS_TBA, JSC_IOS_TBA));
+
+/*!
  @method
  @abstract Create a JSScript for the specified virtual machine.
+ @param type The type of JavaScript source.
  @param source The source code to use when the script is evaluated by the JS vm.
+ @param sourceURL The source URL to associate with this script. For modules, this is the module identifier.
+ @param cachePath A URL containing the path where the VM should cache for future execution. On creation, we use this path to load the cached bytecode off disk. If the cached bytecode at this location is stale, you should delete that file before calling this constructor.
  @param vm The JSVirtualMachine the script can be evaluated in.
+ @param error A description of why the script could not be created if the result is nil.
  @result The new script.
+ @discussion The file at cachePath should not be externally modified for the lifecycle of vm.
  */
-+ (nullable instancetype)scriptWithSource:(NSString *)source inVirtualMachine:(JSVirtualMachine *)vm;
++ (nullable instancetype)scriptOfType:(JSScriptType)type withSource:(NSString *)source andSourceURL:(NSURL *)sourceURL andBytecodeCache:(nullable NSURL *)cachePath inVirtualMachine:(JSVirtualMachine *)vm error:(out NSError * _Nullable * _Nullable)error;
 
 /*!
  @method
  @abstract Create a JSScript for the specified virtual machine with a path to a codesigning and bytecode caching.
+ @param type The type of JavaScript source.
  @param filePath A URL containing the path to a JS source code file on disk.
+ @param sourceURL The source URL to associate with this script. For modules, this is the module identifier.
+ @param cachePath A URL containing the path where the VM should cache for future execution. On creation, we use this path to load the cached bytecode off disk. If the cached bytecode at this location is stale, you should delete that file before calling this constructor.
  @param vm The JSVirtualMachine the script can be evaluated in.
- @param codeSigningPath A URL containing the path to the codeSigning file for filePath on disk.
- @param cachePath A URL containing the path where the VM should cache for future execution.
+ @param error A description of why the script could not be created if the result is nil.
  @result The new script.
- @discussion the files at filePath, codeSigningPath, and cachePath should not be externally modified  for the lifecycle of vm. Note that codeSigningPath and cachePath are not used currently, but that will change in the near future.
+ @discussion The files at filePath and cachePath should not be externally modified for the lifecycle of vm. This method will file back the memory for the source.
 
  If the file at filePath is not ascii this method will return nil.
  */
-+ (nullable instancetype)scriptFromASCIIFile:(NSURL *)filePath inVirtualMachine:(JSVirtualMachine *)vm withCodeSigning:(nullable NSURL *)codeSigningPath andBytecodeCache:(nullable NSURL *)cachePath;
-
++ (nullable instancetype)scriptOfType:(JSScriptType)type memoryMappedFromASCIIFile:(NSURL *)filePath withSourceURL:(NSURL *)sourceURL andBytecodeCache:(nullable NSURL *)cachePath inVirtualMachine:(JSVirtualMachine *)vm error:(out NSError * _Nullable * _Nullable)error;
 
 /*!
- This is deprecated and is equivalent to scriptFromASCIIFile:inVirtualMachine:withCodeSigning:andBytecodeCache:.
+ @method
+ @abstract Cache the bytecode for this JSScript to disk at the path passed in during creation.
+ @param error A description of why the script could not be cached if the result is FALSE.
  */
-+ (nullable instancetype)scriptFromUTF8File:(NSURL *)filePath inVirtualMachine:(JSVirtualMachine *)vm withCodeSigning:(nullable NSURL *)codeSigningPath andBytecodeCache:(nullable NSURL *)cachePath;
+- (BOOL)cacheBytecodeWithError:(out NSError * _Nullable * _Nullable)error;
+
+/*!
+ @method
+ @abstract Returns the JSScriptType of this JSScript.
+ */
+- (JSScriptType)type;
+
+/*!
+ @method
+ @abstract Returns the sourceURL of this JSScript.
+ */
+- (NSURL *)sourceURL;
 
 @end

trunk/Source/JavaScriptCore/API/JSScript.mm

@@ -37 +37 @@
 #import "Symbol.h"
 #include <sys/stat.h>
+#include <wtf/FileSystem.h>
 
 #if JSC_OBJC_API_ENABLED
@@ -42 +43 @@
 @implementation JSScript {
     __weak JSVirtualMachine* m_virtualMachine;
+    JSScriptType m_type;
+    FileSystem::MappedFileData m_mappedSource;
     String m_source;
+    RetainPtr<NSURL> m_sourceURL;
     RetainPtr<NSURL> m_cachePath;
     JSC::CachedBytecode m_cachedBytecode;
@@ -54 +58 @@
     result->m_source = source;
     result->m_virtualMachine = vm;
+    result->m_type = kJSScriptTypeModule;
     return result;
 }
@@ -91 +96 @@
 + (instancetype)scriptFromASCIIFile:(NSURL *)filePath inVirtualMachine:(JSVirtualMachine *)vm withCodeSigning:(NSURL *)codeSigningPath andBytecodeCache:(NSURL *)cachePath
 {
-    // FIXME: This should check codeSigning.
     UNUSED_PARAM(codeSigningPath);
+    UNUSED_PARAM(cachePath);
+
     URL filePathURL([filePath absoluteURL]);
     if (!filePathURL.isLocalFile())
         return nil;
-    // FIXME: This should mmap the contents of the file instead of copying it into dirty memory.
+
     Vector<LChar> buffer;
     if (!fillBufferWithContentsOfFile(filePathURL.fileSystemPath(), buffer))
@@ -107 +113 @@
     result->m_virtualMachine = vm;
     result->m_source = String::fromUTF8WithLatin1Fallback(buffer.data(), buffer.size());
+    result->m_type = kJSScriptTypeModule;
+    return result;
+}
+
++ (instancetype)scriptFromUTF8File:(NSURL *)filePath inVirtualMachine:(JSVirtualMachine *)vm withCodeSigning:(NSURL *)codeSigningPath andBytecodeCache:(NSURL *)cachePath
+{
+    return [JSScript scriptFromASCIIFile:filePath inVirtualMachine:vm withCodeSigning:codeSigningPath andBytecodeCache:cachePath];
+}
+
+static JSScript *createError(NSString *message, NSError** error)
+{
+    if (error)
+        *error = [NSError errorWithDomain:@"JSScriptErrorDomain" code:1 userInfo:@{ @"message": message }];
+    return nil;
+}
+
++ (instancetype)scriptOfType:(JSScriptType)type withSource:(NSString *)source andSourceURL:(NSURL *)sourceURL andBytecodeCache:(NSURL *)cachePath inVirtualMachine:(JSVirtualMachine *)vm error:(out NSError **)error
+{
+    UNUSED_PARAM(error);
+    JSScript *result = [[[JSScript alloc] init] autorelease];
+    result->m_virtualMachine = vm;
+    result->m_type = type;
+    result->m_source = source;
+    result->m_sourceURL = sourceURL;
     result->m_cachePath = cachePath;
     [result readCache];
@@ -112 +142 @@
 }
 
-+ (instancetype)scriptFromUTF8File:(NSURL *)filePath inVirtualMachine:(JSVirtualMachine *)vm withCodeSigning:(NSURL *)codeSigningPath andBytecodeCache:(NSURL *)cachePath
-{
-    return [JSScript scriptFromASCIIFile:filePath inVirtualMachine:vm withCodeSigning:codeSigningPath andBytecodeCache:cachePath];
++ (instancetype)scriptOfType:(JSScriptType)type memoryMappedFromASCIIFile:(NSURL *)filePath withSourceURL:(NSURL *)sourceURL andBytecodeCache:(NSURL *)cachePath inVirtualMachine:(JSVirtualMachine *)vm error:(out NSError **)error
+{
+    UNUSED_PARAM(error);
+    URL filePathURL([filePath absoluteURL]);
+    if (!filePathURL.isLocalFile())
+        return createError([NSString stringWithFormat:@"File path %@ is not a local file", static_cast<NSString *>(filePathURL)], error);
+
+    bool success = false;
+    String systemPath = filePathURL.fileSystemPath();
+    FileSystem::MappedFileData fileData(systemPath, success);
+    if (!success)
+        return createError([NSString stringWithFormat:@"File at path %@ could not be mapped.", static_cast<NSString *>(systemPath)], error);
+
+    if (!charactersAreAllASCII(reinterpret_cast<const LChar*>(fileData.data()), fileData.size()))
+        return createError([NSString stringWithFormat:@"Not all characters in file at %@ are ASCII.", static_cast<NSString *>(systemPath)], error);
+
+    JSScript *result = [[[JSScript alloc] init] autorelease];
+    result->m_virtualMachine = vm;
+    result->m_type = type;
+    result->m_source = String(StringImpl::createWithoutCopying(bitwise_cast<const LChar*>(fileData.data()), fileData.size()));
+    result->m_mappedSource = WTFMove(fileData);
+    result->m_sourceURL = sourceURL;
+    result->m_cachePath = cachePath;
+    [result readCache];
+    return result;
 }
 
@@ -153 +205 @@
 }
 
-- (void)writeCache
-{
-    if (m_cachedBytecode.size() || !m_cachePath)
-        return;
-
-    JSC::ParserError error;
-    m_cachedBytecode = JSC::generateModuleBytecode(m_virtualMachine.vm, m_jsSourceCode->sourceCode(), error);
-    if (error.isValid())
-        return;
+- (BOOL)cacheBytecodeWithError:(NSError **)error
+{
+    String errorString { };
+    [self writeCache:errorString];
+    if (!errorString.isNull()) {
+        createError(errorString, error);
+        return NO;
+    }
+
+    return YES;
+}
+
+- (NSURL *)sourceURL
+{
+    return m_sourceURL.get();
+}
+
+- (JSScriptType)type
+{
+    return m_type;
+}
+
+@end
+
+@implementation JSScript(Internal)
+
+- (unsigned)hash
+{
+    return m_source.hash();
+}
+
+- (const String&)source
+{
+    return m_source;
+}
+
+- (const JSC::CachedBytecode*)cachedBytecode
+{
+    return &m_cachedBytecode;
+}
+
+- (JSC::JSSourceCode*)jsSourceCode
+{
+    if (m_jsSourceCode)
+        return m_jsSourceCode.get();
+
+    return [self forceRecreateJSSourceCode];
+}
+
+- (BOOL)writeCache:(String&)error
+{
+    if (m_cachedBytecode.size())
+        return YES;
+
+    if (!m_cachePath) {
+        error = "No cache was path provided during construction of this JSScript."_s;
+        return NO;
+    }
+
+    JSC::ParserError parserError;
+    switch (m_type) {
+    case kJSScriptTypeModule:
+        m_cachedBytecode = JSC::generateModuleBytecode(m_virtualMachine.vm, [self jsSourceCode]->sourceCode(), parserError);
+        break;
+    case kJSScriptTypeProgram:
+        m_cachedBytecode = JSC::generateBytecode(m_virtualMachine.vm, [self jsSourceCode]->sourceCode(), parserError);
+        break;
+    }
+
+    if (parserError.isValid()) {
+        m_cachedBytecode = { };
+        error = makeString("Unable to generate bytecode for this JSScript because of a parser error: ", parserError.message());
+        return NO;
+    }
+
     int fd = open([m_cachePath path].UTF8String, O_CREAT | O_WRONLY, 0666);
-    if (fd == -1)
-        return;
-    int rc = flock(fd, LOCK_EX | LOCK_NB);
-    if (!rc)
+    if (fd == -1) {
+        error = makeString("Unable to open file: ", [m_cachePath path].UTF8String, " due to error: ", strerror(errno));
+        return NO;
+    }
+    int returnCode = flock(fd, LOCK_EX | LOCK_NB);
+    if (returnCode)
+        error = "Unable to lock the cache file; it may already be in use."_s;
+    else
         write(fd, m_cachedBytecode.data(), m_cachedBytecode.size());
     close(fd);
-}
-
-@end
-
-@implementation JSScript(Internal)
-
-- (unsigned)hash
-{
-    return m_source.hash();
-}
-
-- (const String&)source
-{
-    return m_source;
-}
-
-- (const JSC::CachedBytecode*)cachedBytecode
-{
-    return &m_cachedBytecode;
-}
-
-- (JSC::JSSourceCode*)jsSourceCode:(const JSC::Identifier&)moduleKey
-{
-    if (m_jsSourceCode) {
-        ASSERT(moduleKey.impl() == m_moduleKey);
-        return m_jsSourceCode.get();
-    }
-
+    return !returnCode;
+}
+
+- (void)setSourceURL:(NSURL *)url
+{
+    m_sourceURL = url;
+}
+
+- (JSC::JSSourceCode*)forceRecreateJSSourceCode
+{
     JSC::VM& vm = m_virtualMachine.vm;
+    JSC::JSLockHolder locker(vm);
+
     TextPosition startPosition { };
-    Ref<JSScriptSourceProvider> sourceProvider = JSScriptSourceProvider::create(self, JSC::SourceOrigin(moduleKey.string()), URL({ }, moduleKey.string()), TextPosition(), JSC::SourceProviderSourceType::Module);
+
+    String url = String { [[self sourceURL] absoluteString] };
+    auto type = m_type == kJSScriptTypeModule ? JSC::SourceProviderSourceType::Module : JSC::SourceProviderSourceType::Program;
+    Ref<JSScriptSourceProvider> sourceProvider = JSScriptSourceProvider::create(self, JSC::SourceOrigin(url), URL({ }, url), startPosition, type);
     JSC::SourceCode sourceCode(WTFMove(sourceProvider), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt());
     JSC::JSSourceCode* jsSourceCode = JSC::JSSourceCode::create(vm, WTFMove(sourceCode));
     m_jsSourceCode.set(vm, jsSourceCode);
-    [self writeCache];
     return jsSourceCode;
 }
@@ -209 +317 @@
 @end
 
-
 #endif

trunk/Source/JavaScriptCore/API/JSScriptInternal.h

@@ -47 +47 @@
 - (unsigned)hash;
 - (const WTF::String&)source;
-- (const JSC::CachedBytecode*)cachedBytecode;
-- (JSC::JSSourceCode*)jsSourceCode:(const JSC::Identifier&)moduleKey;
+- (nullable const JSC::CachedBytecode*)cachedBytecode;
+- (JSC::JSSourceCode*)jsSourceCode;
+// FIXME: Remove this once we require sourceURL upon creation: https://bugs.webkit.org/show_bug.cgi?id=194909
+- (JSC::JSSourceCode*)forceRecreateJSSourceCode;
+- (BOOL)writeCache:(String&)error;
+- (void)setSourceURL:(NSURL *)url;
 
 @end

trunk/Source/JavaScriptCore/API/tests/FunctionOverridesTest.cpp

@@ -45 +45 @@
     const char* oldFunctionOverrides = Options::functionOverrides();
     
-    Options::functionOverrides() = "testapi-function-overrides.js";
+    Options::functionOverrides() = "./testapiScripts/testapi-function-overrides.js";
     JSC::FunctionOverrides::reinstallOverrides();
 

trunk/Source/JavaScriptCore/API/tests/testIncludes.m

@@ -27 +27 @@
 // Since we include files that haven't passed through the rewriter we need to handle the non-rewritten values...
 #define JSC_API_AVAILABLE(...)
+#define JSC_API_DEPRECATED(...)
 #define JSC_CLASS_AVAILABLE(...)
 #define JSC_MAC_VERSION_TBA 0

trunk/Source/JavaScriptCore/API/tests/testapi.c

@@ -41 +41 @@
 #include "JSStringRefPrivate.h"
 #include "JSWeakPrivate.h"
+#if !OS(WINDOWS)
+#include <libgen.h>
+#endif
+#include <limits.h>
 #include <math.h>
 #include <stdio.h>
@@ -46 +50 @@
 #include <string.h>
 #include <time.h>
+#if !OS(WINDOWS)
+#include <unistd.h>
+#endif
 #include <wtf/Assertions.h>
 
@@ -68 +75 @@
 
 #if JSC_OBJC_API_ENABLED
-void testObjectiveCAPI(void);
+void testObjectiveCAPI(const char*);
 #endif
 
@@ -1381 +1388 @@
 #endif
 
+#if !OS(WINDOWS)
+    char resolvedPath[PATH_MAX];
+    realpath(argv[0], resolvedPath); 
+    char* newCWD = dirname(resolvedPath);
+    if (chdir(newCWD))
+        fprintf(stdout, "Could not chdir to: %s\n", newCWD);
+#endif
+
+    const char* filter = argc > 1 ? argv[1] : NULL;
 #if JSC_OBJC_API_ENABLED
-    testObjectiveCAPI();
+    testObjectiveCAPI(filter);
 #endif
 
-    const char* filter = argc > 1 ? argv[1] : NULL;
     RELEASE_ASSERT(!testCAPIViaCpp(filter));
     if (filter)
@@ -1980 +1995 @@
     JSClassRelease(nullClass);
 
-    const char* scriptPath = "testapi.js";
+    const char* scriptPath = "./testapiScripts/testapi.js";
     char* scriptUTF8 = createStringWithContentsOfFile(scriptPath);
     if (!scriptUTF8) {
@@ -2083 +2098 @@
         JSGlobalContextRelease(context);
     }
-    failed = testTypedArrayCAPI() || failed;
-    failed = testExecutionTimeLimit() || failed;
-    failed = testFunctionOverrides() || failed;
-    failed = testGlobalContextWithFinalizer() || failed;
-    failed = testPingPongStackOverflow() || failed;
-    failed = testJSONParse() || failed;
-    failed = testJSObjectGetProxyTarget() || failed;
+    failed |= testTypedArrayCAPI();
+    failed |= testExecutionTimeLimit();
+    failed |= testFunctionOverrides();
+    failed |= testGlobalContextWithFinalizer();
+    failed |= testPingPongStackOverflow();
+    failed |= testJSONParse();
+    failed |= testJSObjectGetProxyTarget();
 
     // Clear out local variables pointing at JSObjectRefs to allow their values to be collected

trunk/Source/JavaScriptCore/API/tests/testapi.mm

@@ -42 +42 @@
 #import "Regress141809.h"
 
+#if __has_include(<libproc.h>)
+#define HAS_LIBPROC 1
+#import <libproc.h>
+#else
+#define HAS_LIBPROC 0
+#endif
 #import <pthread.h>
 #import <vector>
@@ -55 +61 @@
 
 extern int failed;
-extern "C" void testObjectiveCAPI(void);
+extern "C" void testObjectiveCAPI(const char*);
 extern "C" void checkResult(NSString *, bool);
 
@@ -1981 +1987 @@
 }
 
-static void testBytecodeCache()
-{
-    @autoreleasepool {
-        NSURL* tempDirectory = [NSURL fileURLWithPath:NSTemporaryDirectory() isDirectory:YES];
-
-        NSString* fooSource = @"import { n } from \"../foo.js\"; export let foo = n;";
-        NSString* barSource = @"import \"otherDirectory/baz.js\"; export let n = null;";
-        NSString* bazSource = @"import { foo } from \"../directory/bar.js\"; globalThis.ran = null; export let exp = foo;";
-
-        NSURL* fooPath = [tempDirectory URLByAppendingPathComponent:@"foo.js"];
-        NSURL* barPath = [tempDirectory URLByAppendingPathComponent:@"bar.js"];
-        NSURL* bazPath = [tempDirectory URLByAppendingPathComponent:@"baz.js"];
-
-        NSURL* fooCachePath = [tempDirectory URLByAppendingPathComponent:@"foo.js.cache"];
-        NSURL* barCachePath = [tempDirectory URLByAppendingPathComponent:@"bar.js.cache"];
-        NSURL* bazCachePath = [tempDirectory URLByAppendingPathComponent:@"baz.js.cache"];
+static NSURL *tempFile(NSString *string)
+{
+    NSURL* tempDirectory = [NSURL fileURLWithPath:NSTemporaryDirectory() isDirectory:YES];
+    return [tempDirectory URLByAppendingPathComponent:string];
+}
+
+static void testModuleBytecodeCache()
+{
+    @autoreleasepool {
+        NSString *fooSource = @"import 'otherDirectory/baz.js'; export let n = null;";
+        NSString *barSource = @"import { n } from '../foo.js'; export let foo = () => n;";
+        NSString *bazSource = @"import { foo } from '../directory/bar.js'; globalThis.ran = null; export let exp = foo();";
+
+        NSURL *fooPath = tempFile(@"foo.js");
+        NSURL *barPath = tempFile(@"bar.js");
+        NSURL *bazPath = tempFile(@"baz.js");
+
+        NSURL *fooCachePath = tempFile(@"foo.js.cache");
+        NSURL *barCachePath = tempFile(@"bar.js.cache");
+        NSURL *bazCachePath = tempFile(@"baz.js.cache");
+
+        NSURL *fooFakePath = [NSURL fileURLWithPath:@"/foo.js"];
+        NSURL *barFakePath = [NSURL fileURLWithPath:@"/directory/bar.js"];
+        NSURL *bazFakePath = [NSURL fileURLWithPath:@"/otherDirectory/baz.js"];
 
         [fooSource writeToURL:fooPath atomically:NO encoding:NSASCIIStringEncoding error:nil];
@@ -2004 +2018 @@
         auto block = ^(JSContext *context, JSValue *identifier, JSValue *resolve, JSValue *reject) {
             JSC::Options::forceDiskCache() = true;
-            if ([identifier isEqualToObject:@"file:///directory/bar.js"])
-                [resolve callWithArguments:@[[JSScript scriptFromASCIIFile:fooPath inVirtualMachine:context.virtualMachine withCodeSigning:nil andBytecodeCache:fooCachePath]]];
-            else if ([identifier isEqualToObject:@"file:///foo.js"])
-                [resolve callWithArguments:@[[JSScript scriptFromASCIIFile:barPath inVirtualMachine:context.virtualMachine withCodeSigning:nil andBytecodeCache:barCachePath]]];
-            else if ([identifier isEqualToObject:@"file:///otherDirectory/baz.js"])
-                [resolve callWithArguments:@[[JSScript scriptFromASCIIFile:bazPath inVirtualMachine:context.virtualMachine withCodeSigning:nil andBytecodeCache:bazCachePath]]];
-            else
+            JSScript *script = nil;
+            if ([identifier isEqualToObject:[fooFakePath absoluteString]])
+                script = [JSScript scriptOfType:kJSScriptTypeModule memoryMappedFromASCIIFile:fooPath withSourceURL:fooFakePath andBytecodeCache:fooCachePath inVirtualMachine:context.virtualMachine error:nil];
+            else if ([identifier isEqualToObject:[barFakePath absoluteString]])
+                script = [JSScript scriptOfType:kJSScriptTypeModule memoryMappedFromASCIIFile:barPath withSourceURL:barFakePath andBytecodeCache:barCachePath inVirtualMachine:context.virtualMachine error:nil];
+            else if ([identifier isEqualToObject:[bazFakePath absoluteString]])
+                script = [JSScript scriptOfType:kJSScriptTypeModule memoryMappedFromASCIIFile:bazPath withSourceURL:bazFakePath andBytecodeCache:bazCachePath inVirtualMachine:context.virtualMachine error:nil];
+
+            if (script) {
+                if (![script cacheBytecodeWithError:nil])
+                    CRASH();
+                [resolve callWithArguments:@[script]];
+            } else
                 [reject callWithArguments:@[[JSValue valueWithNewErrorFromMessage:@"Weird path" inContext:context]]];
         };
@@ -2024 +2044 @@
 
         NSFileManager* fileManager = [NSFileManager defaultManager];
-        [fileManager removeItemAtURL:fooPath error:nil];
-        [fileManager removeItemAtURL:barPath error:nil];
-        [fileManager removeItemAtURL:bazPath error:nil];
-        [fileManager removeItemAtURL:fooCachePath error:nil];
-        [fileManager removeItemAtURL:barCachePath error:nil];
-        [fileManager removeItemAtURL:bazCachePath error:nil];
+        BOOL removedAll = true;
+        removedAll &= [fileManager removeItemAtURL:fooPath error:nil];
+        removedAll &= [fileManager removeItemAtURL:barPath error:nil];
+        removedAll &= [fileManager removeItemAtURL:bazPath error:nil];
+        removedAll &= [fileManager removeItemAtURL:fooCachePath error:nil];
+        removedAll &= [fileManager removeItemAtURL:barCachePath error:nil];
+        removedAll &= [fileManager removeItemAtURL:bazCachePath error:nil];
+        checkResult(@"Removed all temp files created", removedAll);
+    }
+}
+
+static void testProgramBytecodeCache()
+{
+    @autoreleasepool {
+        NSString *fooSource = @"function foo() { return 42; }; function bar() { return 40; }; foo() + bar();";
+        NSURL *fooCachePath = tempFile(@"foo.js.cache");
+        JSContext *context = [[JSContext alloc] init];
+        JSScript *script = [JSScript scriptOfType:kJSScriptTypeProgram withSource:fooSource andSourceURL:[NSURL URLWithString:@"my-path"] andBytecodeCache:fooCachePath inVirtualMachine:context.virtualMachine error:nil];
+        RELEASE_ASSERT(script);
+        if (![script cacheBytecodeWithError:nil])
+            CRASH();
+
+        JSC::Options::forceDiskCache() = true;
+        JSValue *result = [context evaluateJSScript:script];
+        RELEASE_ASSERT(result);
+        RELEASE_ASSERT([result isNumber]);
+        checkResult(@"result of cached program is 40+42", [[result toNumber] intValue] == 40 + 42);
+        JSC::Options::forceDiskCache() = false;
+
+        NSFileManager* fileManager = [NSFileManager defaultManager];
+        BOOL removedAll = [fileManager removeItemAtURL:fooCachePath error:nil];
+        checkResult(@"Removed all temp files created", removedAll);
+    }
+}
+
+static void testBytecodeCacheWithSyntaxError(JSScriptType type)
+{
+    @autoreleasepool {
+        NSString *fooSource = @"this is a syntax error";
+        NSURL *fooCachePath = tempFile(@"foo.js.cache");
+        JSContext *context = [[JSContext alloc] init];
+        JSScript *script = [JSScript scriptOfType:type withSource:fooSource andSourceURL:[NSURL URLWithString:@"my-path"] andBytecodeCache:fooCachePath inVirtualMachine:context.virtualMachine error:nil];
+        RELEASE_ASSERT(script);
+        NSError *error = nil;
+        if ([script cacheBytecodeWithError:&error])
+            CRASH();
+        RELEASE_ASSERT(error);
+        checkResult(@"Got error when trying to cache bytecode for a script with a syntax error.", [[error description] containsString:@"Unable to generate bytecode for this JSScript because of a parser error"]);
+    }
+}
+
+static void testProgramJSScriptException()
+{
+    @autoreleasepool {
+        NSString *source = @"throw 42;";
+        JSContext *context = [[JSContext alloc] init];
+        JSScript *script = [JSScript scriptOfType:kJSScriptTypeProgram withSource:source andSourceURL:[NSURL URLWithString:@"my-path"] andBytecodeCache:nil inVirtualMachine:context.virtualMachine error:nil];
+        RELEASE_ASSERT(script);
+        __block bool handledException = false;
+        context.exceptionHandler = ^(JSContext *, JSValue *exception) {
+            handledException = true;
+            RELEASE_ASSERT([exception isNumber]);
+            checkResult(@"Program JSScript with exception should have the exception value be 42.", [[exception toNumber] intValue] == 42);
+        };
+
+        JSValue *result = [context evaluateJSScript:script];
+        RELEASE_ASSERT(result);
+        checkResult(@"Program JSScript with exception should return undefined.", [result isUndefined]);
+        checkResult(@"Program JSScript with exception should call exception handler.", handledException);
     }
 }
@@ -2079 +2162 @@
 @end
 
-static void testLoadBasicFile()
+static void testLoadBasicFileLegacySPI()
 {
     @autoreleasepool {
@@ -2090 +2173 @@
 }
 
-void testObjectiveCAPI()
+
+@interface JSContextMemoryMappedLoaderDelegate : JSContext <JSModuleLoaderDelegate>
+
++ (instancetype)newContext;
+
+@end
+
+@implementation JSContextMemoryMappedLoaderDelegate {
+}
+
++ (instancetype)newContext
+{
+    auto *result = [[JSContextMemoryMappedLoaderDelegate alloc] init];
+    return result;
+}
+
+- (void)context:(JSContext *)context fetchModuleForIdentifier:(JSValue *)identifier withResolveHandler:(JSValue *)resolve andRejectHandler:(JSValue *)reject
+{
+    NSURL *filePath = [NSURL URLWithString:[identifier toString]];
+    auto *script = [JSScript scriptOfType:kJSScriptTypeModule memoryMappedFromASCIIFile:filePath withSourceURL:filePath andBytecodeCache:nil inVirtualMachine:context.virtualMachine error:nil];
+    if (script)
+        [resolve callWithArguments:@[script]];
+    else
+        [reject callWithArguments:@[[JSValue valueWithNewErrorFromMessage:@"Unable to create Script" inContext:context]]];
+}
+
+@end
+
+static void testLoadBasicFile()
+{
+#if HAS_LIBPROC
+    size_t count = proc_pidinfo(getpid(), PROC_PIDLISTFDS, 0, 0, 0);
+#endif
+    @autoreleasepool {
+        auto *context = [JSContextMemoryMappedLoaderDelegate newContext];
+        context.moduleLoaderDelegate = context;
+        JSValue *promise = [context evaluateScript:@"import('./basic.js');" withSourceURL:resolvePathToScripts()];
+        JSValue *null = [JSValue valueWithNullInContext:context];
+#if HAS_LIBPROC
+        size_t afterCount = proc_pidinfo(getpid(), PROC_PIDLISTFDS, 0, 0, 0);
+        checkResult(@"JSScript should not hold a file descriptor", count == afterCount);
+#endif
+        checkModuleCodeRan(context, promise, null);
+    }
+#if HAS_LIBPROC
+    size_t after = proc_pidinfo(getpid(), PROC_PIDLISTFDS, 0, 0, 0);
+    checkResult(@"File descriptor count sholudn't change after context is dealloced", count == after);
+#endif
+}
+
+@interface JSContextAugmentedLoaderDelegate : JSContext <JSModuleLoaderDelegate>
+
++ (instancetype)newContext;
+
+@end
+
+@implementation JSContextAugmentedLoaderDelegate {
+}
+
++ (instancetype)newContext
+{
+    auto *result = [[JSContextAugmentedLoaderDelegate alloc] init];
+    return result;
+}
+
+- (void)context:(JSContext *)context fetchModuleForIdentifier:(JSValue *)identifier withResolveHandler:(JSValue *)resolve andRejectHandler:(JSValue *)reject
+{
+    UNUSED_PARAM(reject);
+
+    NSURL *filePath = [NSURL URLWithString:[identifier toString]];
+    NSString *pathString = [filePath absoluteString];
+    if ([pathString containsString:@"basic.js"] || [pathString containsString:@"foo.js"]) {
+        auto *script = [JSScript scriptOfType:kJSScriptTypeModule memoryMappedFromASCIIFile:filePath withSourceURL:filePath andBytecodeCache:nil inVirtualMachine:context.virtualMachine error:nil];
+        RELEASE_ASSERT(script);
+        [resolve callWithArguments:@[script]];
+        return;
+    }
+
+    if ([pathString containsString:@"bar.js"]) {
+        auto *script = [JSScript scriptOfType:kJSScriptTypeModule withSource:@"" andSourceURL:[NSURL fileURLWithPath:@"/not/path/to/bar.js"] andBytecodeCache:nil inVirtualMachine:context.virtualMachine error:nil];
+        RELEASE_ASSERT(script);
+        [resolve callWithArguments:@[script]];
+        return;
+    }
+
+    RELEASE_ASSERT_NOT_REACHED();
+}
+
+@end
+
+static void testJSScriptURL()
+{
+    @autoreleasepool {
+        auto *context = [JSContextAugmentedLoaderDelegate newContext];
+        context.moduleLoaderDelegate = context;
+        NSURL *basic = [NSURL URLWithString:@"./basic.js" relativeToURL:resolvePathToScripts()];
+        JSScript *script1 = [JSScript scriptOfType:kJSScriptTypeModule memoryMappedFromASCIIFile:basic withSourceURL:basic andBytecodeCache:nil inVirtualMachine:context.virtualMachine error:nil];
+
+        JSValue *result1 = [context evaluateJSScript:script1];
+        JSValue *null = [JSValue valueWithNullInContext:context];
+        checkModuleCodeRan(context, result1, null);
+
+        NSURL *foo = [NSURL URLWithString:@"./foo.js" relativeToURL:resolvePathToScripts()];
+        JSScript *script2 = [JSScript scriptOfType:kJSScriptTypeModule memoryMappedFromASCIIFile:foo withSourceURL:foo andBytecodeCache:nil inVirtualMachine:context.virtualMachine error:nil];
+        RELEASE_ASSERT(script2);
+        JSValue *result2 = [context evaluateJSScript:script2];
+
+        __block bool wasRejected = false;
+        [result2 invokeMethod:@"catch" withArguments:@[^(JSValue *reason) {
+            wasRejected = [reason isObject];
+            RELEASE_ASSERT([[reason toString] containsString:@"The same JSScript was provided for two different identifiers"]);
+        }]];
+
+        checkResult(@"Module JSScript imported with different identifiers is rejected", wasRejected);
+    }
+}
+
+#define RUN(test) do { \
+        if (!shouldRun(#test)) \
+            break; \
+        NSLog(@"%s...\n", #test); \
+        test; \
+        NSLog(@"%s: done.\n", #test); \
+    } while (false)
+
+void testObjectiveCAPI(const char* filter)
 {
     NSLog(@"Testing Objective-C API");
 
-    checkNegativeNSIntegers();
-    runJITThreadLimitTests();
-
-    testLoaderResolvesAbsoluteScriptURL();
-    testFetch();
-    testFetchWithTwoCycle();
-    testFetchWithThreeCycle();
-    testImportModuleTwice();
-    testBytecodeCache();
-
-    testLoaderRejectsNilScriptURL();
-    testLoaderRejectsFailedFetch();
+    auto shouldRun = [&] (const char* test) -> bool {
+        if (filter)
+            return strcasestr(test, filter);
+        return true;
+    };
+
+    RUN(checkNegativeNSIntegers());
+    RUN(runJITThreadLimitTests());
+
+    RUN(testLoaderResolvesAbsoluteScriptURL());
+    RUN(testFetch());
+    RUN(testFetchWithTwoCycle());
+    RUN(testFetchWithThreeCycle());
+    RUN(testImportModuleTwice());
+    RUN(testModuleBytecodeCache());
+    RUN(testProgramBytecodeCache());
+    RUN(testBytecodeCacheWithSyntaxError(kJSScriptTypeProgram));
+    RUN(testBytecodeCacheWithSyntaxError(kJSScriptTypeModule));
+    RUN(testProgramJSScriptException());
+
+    RUN(testLoaderRejectsNilScriptURL());
+    RUN(testLoaderRejectsFailedFetch());
+
+    RUN(testJSScriptURL());
 
     // File loading
-    testLoadBasicFile();
-
-    promiseWithExecutor(Resolution::ResolveEager);
-    promiseWithExecutor(Resolution::RejectEager);
-    promiseWithExecutor(Resolution::ResolveLate);
-    promiseWithExecutor(Resolution::RejectLate);
-    promiseRejectOnJSException();
-    promiseCreateResolved();
-    promiseCreateRejected();
-    parallelPromiseResolveTest();
+    RUN(testLoadBasicFileLegacySPI());
+    RUN(testLoadBasicFile());
+
+    RUN(promiseWithExecutor(Resolution::ResolveEager));
+    RUN(promiseWithExecutor(Resolution::RejectEager));
+    RUN(promiseWithExecutor(Resolution::ResolveLate));
+    RUN(promiseWithExecutor(Resolution::RejectLate));
+    RUN(promiseRejectOnJSException());
+    RUN(promiseCreateResolved());
+    RUN(promiseCreateRejected());
+    RUN(parallelPromiseResolveTest());
 
     testObjectiveCAPIMain();
@@ -2124 +2345 @@
 #else
 
-void testObjectiveCAPI()
+void testObjectiveCAPI(const char*)
 {
 }

trunk/Source/JavaScriptCore/API/tests/testapiScripts/foo.js

@@ -24 +24 @@
  */
 
-
-// Since we include files that haven't passed through the rewriter we need to handle the non-rewritten values...
-#define JSC_API_AVAILABLE(...)
-#define JSC_CLASS_AVAILABLE(...)
-#define JSC_MAC_VERSION_TBA 0
-#define JSC_IOS_VERSION_TBA 0
-
-// umbrella header
-#import <JavaScriptCore/JavaScriptCore.h>
-
-// private headers
-#import <JavaScriptCore/JSContextPrivate.h>
-#import <JavaScriptCore/JSScript.h>
-#import <JavaScriptCore/JSValuePrivate.h>
-#import <JavaScriptCore/JSVirtualMachinePrivate.h>
-
+import "./bar.js";

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-02-21  Saam Barati  <sbarati@apple.com>
+
+        Update JSScript SPI based on feedback
+        https://bugs.webkit.org/show_bug.cgi?id=194517
+
+        Reviewed by Keith Miller.
+
+        This patch updates the JSScript SPI in the following ways:
+        - JSScript can now represent both modules and programs. This is a property
+        of the script determined during creation.
+        - JSScript now takes a sourceURL during construction. For modules, this acts
+        as the module identifier.
+        - JSScript now has SPI for writing the cache out to disk. We don't do this
+        automatically.
+        - JSScript will load the bytecode cache on creation if it exists.
+        - We retrofit these new requirements on the prior JSScript SPI that
+        we're going to remove as soon as we can: https://bugs.webkit.org/show_bug.cgi?id=194909.
+        Previous SPI assumes all JSScripts are modules. Previous SPI also assigns
+        a sourceURL to the JSScript based on what the module loader decided the
+        identifier should be. We'll remove this once we remove the old SPI.
+        
+        This patch also adds SPI to JSContext to evaluate a JSScript. For modules,
+        this is like returning the result of doing dynamic import. For programs,
+        this does normal program evaluation.
+        
+        This patch also fixes a bug in generateBytecode/generateModuleBytecode where
+        we would try to cache the bytecode even if recursivelyGenerateUnlinkedCodeBlock
+        returned null. E.g, if the script had a syntax error.
+        
+        When writing tests, I also discovered that someone previously broke
+        testapi. This patch also fixes those failures. They were broken when
+        we switched to using a testapiScripts directory to hold our test .js
+        scripts. 
+
+        * API/JSAPIGlobalObject.h:
+        * API/JSAPIGlobalObject.mm:
+        (JSC::JSAPIGlobalObject::moduleLoaderResolve):
+        (JSC::JSAPIGlobalObject::moduleLoaderFetch):
+        (JSC::JSAPIGlobalObject::loadAndEvaluateJSScriptModule):
+        * API/JSBase.cpp:
+        (JSEvaluateScriptInternal):
+        (JSEvaluateScript):
+        * API/JSBaseInternal.h: Added.
+        * API/JSContext.mm:
+        (-[JSContext evaluateScript:withSourceURL:]):
+        (-[JSContext evaluateJSScript:]):
+        * API/JSContextPrivate.h:
+        * API/JSScript.h:
+        * API/JSScript.mm:
+        (+[JSScript scriptWithSource:inVirtualMachine:]):
+        (+[JSScript scriptFromASCIIFile:inVirtualMachine:withCodeSigning:andBytecodeCache:]):
+        (createError):
+        (+[JSScript scriptOfType:inVirtualMachine:withSourceURL:andSource:andBytecodeCache:error:]):
+        (+[JSScript scriptOfType:inVirtualMachine:memoryMappedFromASCIIFile:withSourceURL:andBytecodeCache:error:]):
+        (-[JSScript cacheBytecodeWithError:]):
+        (-[JSScript sourceURL]):
+        (-[JSScript type]):
+        (-[JSScript jsSourceCode]):
+        (-[JSScript writeCache:]):
+        (-[JSScript setSourceURL:]):
+        (-[JSScript forceRecreateJSSourceCode]):
+        (-[JSScript writeCache]): Deleted.
+        (-[JSScript jsSourceCode:]): Deleted.
+        * API/JSScriptInternal.h:
+        * API/tests/FunctionOverridesTest.cpp:
+        (testFunctionOverrides):
+        * API/tests/testapi.c:
+        (main):
+        * API/tests/testapi.mm:
+        (tempFile):
+        (testModuleBytecodeCache):
+        (testProgramBytecodeCache):
+        (testBytecodeCacheWithSyntaxError):
+        (testProgramJSScriptException):
+        (testLoadBasicFileLegacySPI):
+        (+[JSContextMemoryMappedLoaderDelegate newContext]):
+        (-[JSContextMemoryMappedLoaderDelegate context:fetchModuleForIdentifier:withResolveHandler:andRejectHandler:]):
+        (testLoadBasicFile):
+        (+[JSContextAugmentedLoaderDelegate newContext]):
+        (-[JSContextAugmentedLoaderDelegate context:fetchModuleForIdentifier:withResolveHandler:andRejectHandler:]):
+        (testJSScriptURL):
+        (testObjectiveCAPI):
+        (testBytecodeCache): Deleted.
+        * API/tests/testapiScripts/foo.js: Added.
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * runtime/Completion.cpp:
+        (JSC::generateBytecode):
+        (JSC::generateModuleBytecode):
+
 2019-02-21  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -885 +885 @@
                 52C0611F1AA51E1C00B4ADBA /* RuntimeType.h in Headers */ = {isa = PBXBuildFile; fileRef = 52C0611D1AA51E1B00B4ADBA /* RuntimeType.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 52C952B719A289850069B386 /* TypeProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 52C952B619A289850069B386 /* TypeProfiler.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                52D13091221CE176009C836C /* foo.js in Copy Support Script */ = {isa = PBXBuildFile; fileRef = 52D1308F221CE03A009C836C /* foo.js */; };
                 52F6C35E1E71EB080081F4CC /* WebAssemblyWrapperFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 52F6C35C1E71EB080081F4CC /* WebAssemblyWrapperFunction.h */; };
                 530A66B91FA3E78B0026A545 /* UnifiedSource3-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 530A66B11FA3E77A0026A545 /* UnifiedSource3-mm.mm */; };
@@ -1161 +1162 @@
                 7980C16D1E3A940E00B71615 /* DFGRegisteredStructureSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 7980C16B1E3A940E00B71615 /* DFGRegisteredStructureSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 7986943B1F8C0ACC009232AE /* StructureCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 7986943A1F8C0AC8009232AE /* StructureCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                79872C48221BBAF3008C6969 /* JSBaseInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 79872C47221BBAED008C6969 /* JSBaseInternal.h */; };
                 798937791DCAB57300F8D4FB /* JSFixedArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 798937771DCAB57300F8D4FB /* JSFixedArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 799EF7C41C56ED96002B0534 /* B3PCToOriginMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 799EF7C31C56ED96002B0534 /* B3PCToOriginMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2030 +2032 @@
                         dstSubfolderSpec = 16;
                         files = (
+                                52D13091221CE176009C836C /* foo.js in Copy Support Script */,
                                 53C3D5E521ECE7720087FDFC /* basic.js in Copy Support Script */,
                                 FECB8B2A1D25CB5A006F2463 /* testapi-function-overrides.js in Copy Support Script */,
@@ -3378 +3381 @@
                 52C952B619A289850069B386 /* TypeProfiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TypeProfiler.h; sourceTree = "<group>"; };
                 52C952B819A28A1C0069B386 /* TypeProfiler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TypeProfiler.cpp; sourceTree = "<group>"; };
+                52D1308F221CE03A009C836C /* foo.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = foo.js; sourceTree = "<group>"; };
                 52F6C35B1E71EB080081F4CC /* WebAssemblyWrapperFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebAssemblyWrapperFunction.cpp; path = js/WebAssemblyWrapperFunction.cpp; sourceTree = "<group>"; };
                 52F6C35C1E71EB080081F4CC /* WebAssemblyWrapperFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebAssemblyWrapperFunction.h; path = js/WebAssemblyWrapperFunction.h; sourceTree = "<group>"; };
@@ -3773 +3777 @@
                 798694391F8C0AC7009232AE /* StructureCache.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StructureCache.cpp; sourceTree = "<group>"; };
                 7986943A1F8C0AC8009232AE /* StructureCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StructureCache.h; sourceTree = "<group>"; };
+                79872C47221BBAED008C6969 /* JSBaseInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSBaseInternal.h; sourceTree = "<group>"; };
                 798937761DCAB57300F8D4FB /* JSFixedArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFixedArray.cpp; sourceTree = "<group>"; };
                 798937771DCAB57300F8D4FB /* JSFixedArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFixedArray.h; sourceTree = "<group>"; };
@@ -5996 +6001 @@
                                 1421359A0A677F4F00A8195E /* JSBase.cpp */,
                                 142711380A460BBB0080EEEA /* JSBase.h */,
+                                79872C47221BBAED008C6969 /* JSBaseInternal.h */,
                                 140D17D60E8AD4A9000CD17D /* JSBasePrivate.h */,
                                 1440F8AD0A508D200005F061 /* JSCallbackConstructor.cpp */,
@@ -6341 +6347 @@
                         children = (
                                 53C3D5E421ECE6CE0087FDFC /* basic.js */,
+                                52D1308F221CE03A009C836C /* foo.js */,
                         );
                         name = testapiScripts;
@@ -9759 +9766 @@
                                 0FF42749158EBE91004CB9FF /* udis86_types.h in Headers */,
                                 A7E5AB391799E4B200D2833D /* UDis86Disassembler.h in Headers */,
+                                79872C48221BBAF3008C6969 /* JSBaseInternal.h in Headers */,
                                 A7A8AF4117ADB5F3005AB174 /* Uint16Array.h in Headers */,
                                 866739D313BFDE710023D87C /* Uint16WithFraction.h in Headers */,

trunk/Source/JavaScriptCore/config.h

@@ -26 +26 @@
 #define JSC_API_AVAILABLE(...)
 #define JSC_CLASS_AVAILABLE(...) JS_EXPORT
+#define JSC_API_DEPRECATED(...)
 // Use zero since it will be less than any possible version number.
 #define JSC_MAC_VERSION_TBA 0

trunk/Source/JavaScriptCore/runtime/Completion.cpp

@@ -104 +104 @@
 
     UnlinkedCodeBlock* unlinkedCodeBlock = recursivelyGenerateUnlinkedCodeBlock<UnlinkedProgramCodeBlock>(vm, source, strictMode, scriptMode, debuggerMode, error, evalContextType, &variablesUnderTDZ);
+    if (!unlinkedCodeBlock)
+        return { };
     return serializeBytecode(vm, unlinkedCodeBlock, source, SourceCodeType::ProgramType, strictMode, scriptMode, debuggerMode);
 }
@@ -119 +121 @@
 
     UnlinkedCodeBlock* unlinkedCodeBlock = recursivelyGenerateUnlinkedCodeBlock<UnlinkedModuleProgramCodeBlock>(vm, source, strictMode, scriptMode, debuggerMode, error, evalContextType, &variablesUnderTDZ);
+    if (!unlinkedCodeBlock)
+        return { };
     return serializeBytecode(vm, unlinkedCodeBlock, source, SourceCodeType::ModuleType, strictMode, scriptMode, debuggerMode);
 }