Changeset 242982 in webkit

Timestamp:

Mar 14, 2019, 6:28:49 PM (7 years ago)

Author:

sbarati@apple.com

Message:

JSScript should have an accessor saying if it's cached or not
​https://bugs.webkit.org/show_bug.cgi?id=195783

Reviewed by Michael Saboff.

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

(-[JSScript isUsingBytecodeCache]):

• API/tests/testapi.mm:

(testIsUsingBytecodeCacheAccessor):
(testObjectiveCAPI):

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSScript.h (modified) (1 diff)
• API/JSScript.mm (modified) (1 diff)
• API/tests/testapi.mm (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSScript.h

@@ -101 +101 @@
 /*!
  @method
+ @abstract Returns true when evaluating this JSScript will use the bytecode cache. Returns false otherwise.
+ */
+- (BOOL)isUsingBytecodeCache;
+
+/*!
+ @method
  @abstract Returns the JSScriptType of this JSScript.
  */

trunk/Source/JavaScriptCore/API/JSScript.mm

@@ -221 +221 @@
 }
 
+- (BOOL)isUsingBytecodeCache
+{
+    return !!m_cachedBytecode.size();
+}
+
 - (NSURL *)sourceURL
 {

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

@@ -2238 +2238 @@
 }
 
+static void testIsUsingBytecodeCacheAccessor()
+{
+    NSURL* cachePath = tempFile(@"foo.program.cache");
+    NSURL* sourceURL = [NSURL URLWithString:@"my-path"];
+    NSString *source = @"function foo() { return 1337; } foo();";
+
+    @autoreleasepool {
+        JSVirtualMachine *vm = [[JSVirtualMachine alloc] init];
+        JSContext* context = [[JSContext alloc] initWithVirtualMachine:vm];
+        JSScript *script = [JSScript scriptOfType:kJSScriptTypeProgram withSource:source andSourceURL:sourceURL andBytecodeCache:cachePath inVirtualMachine:vm error:nil];
+        RELEASE_ASSERT(script);
+        checkResult(@"Should not yet be using the bytecode cache", ![script isUsingBytecodeCache]);
+        checkResult(@"Should be able to cache the script", [script cacheBytecodeWithError:nil]);
+        checkResult(@"Should now using the bytecode cache", [script isUsingBytecodeCache]);
+        JSC::Options::forceDiskCache() = true;
+        JSValue *result = [context evaluateJSScript:script];
+        JSC::Options::forceDiskCache() = false;
+        checkResult(@"Result should be 1337", [result isNumber] && [result toInt32] == 1337);
+    }
+
+    @autoreleasepool {
+        JSVirtualMachine *vm = [[JSVirtualMachine alloc] init];
+        JSContext* context = [[JSContext alloc] initWithVirtualMachine:vm];
+        JSScript *script = [JSScript scriptOfType:kJSScriptTypeProgram withSource:source andSourceURL:sourceURL andBytecodeCache:cachePath inVirtualMachine:vm error:nil];
+        RELEASE_ASSERT(script);
+        checkResult(@"Should be using the bytecode cache", [script isUsingBytecodeCache]);
+        JSValue *result = [context evaluateJSScript:script];
+        checkResult(@"Result should be 1337", [result isNumber] && [result toInt32] == 1337);
+    }
+
+    NSFileManager* fileManager = [NSFileManager defaultManager];
+    BOOL removedAll = [fileManager removeItemAtURL:cachePath error:nil];
+    checkResult(@"Successfully removed cache file", removedAll);
+}
+
 @interface JSContextFileLoaderDelegate : JSContext <JSModuleLoaderDelegate>
 
@@ -2447 +2482 @@
     RUN(testCacheFileFailsWhenItsAlreadyCached());
     RUN(testCanCacheManyFilesWithTheSameVM());
+    RUN(testIsUsingBytecodeCacheAccessor());
 
     RUN(testLoaderRejectsNilScriptURL());

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-03-14  Saam barati  <sbarati@apple.com>
+
+        JSScript should have an accessor saying if it's cached or not
+        https://bugs.webkit.org/show_bug.cgi?id=195783
+
+        Reviewed by Michael Saboff.
+
+        * API/JSScript.h:
+        * API/JSScript.mm:
+        (-[JSScript isUsingBytecodeCache]):
+        * API/tests/testapi.mm:
+        (testIsUsingBytecodeCacheAccessor):
+        (testObjectiveCAPI):
+
 2019-03-14  Saam barati  <sbarati@apple.com>