Changeset 186966 in webkit for trunk/Source/JavaScriptCore/API

Timestamp:

Jul 17, 2015, 3:40:40 PM (10 years ago)

Author:

Yusuke Suzuki

Message:

Integrate automatic microtask draining into JSC framework and re-enable Promise
​https://bugs.webkit.org/show_bug.cgi?id=146828

Reviewed by Sam Weinig.

Source/JavaScriptCore:

Add automatic microtask draining system into JSC framework.
When the depth of VM lock becomes 0, before this, we drain the queued microtasks.
Enqueuing behavior can be injected by the JSGlobalObject's method table.
It is utilized in WebCore to post the microtask to WebCore's event loop.

In the case of JSC interactive shell, VM depth is always greater than 0.
So we manually drains the queued microtasks after evaluating the written line.

Since now JSC framework has the microtask queue, we can drain the queued microtasks.
So re-enable the Promise in the JSC framework context.

• API/JSContextRef.cpp:

(javaScriptRuntimeFlags): Deleted.

• API/tests/testapi.c:

(main):

• API/tests/testapi.mm:

(testObjectiveCAPIMain):

• jsc.cpp:

(runInteractive):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::queueMicrotask):

• runtime/JSLock.cpp:

(JSC::JSLock::willReleaseLock):

• runtime/VM.cpp:

(JSC::VM::queueMicrotask):
(JSC::VM::drainMicrotasks):
(JSC::QueuedTask::run):

• runtime/VM.h:

(JSC::QueuedTask::QueuedTask):

LayoutTests:

Add Promise tests mainly focusing on microtasks.
They can be executed in JSC shell. So they are locate in js/ directory (not js/dom).

• js/promise-nested-microtasks-expected.txt: Added.
• js/promise-nested-microtasks.html: Added.
• js/promise-resolve-in-non-dom-expected.txt: Added.
• js/promise-resolve-in-non-dom.html: Added.
• js/script-tests/promise-nested-microtasks.js: Added.

(Promise.resolve.then):

• js/script-tests/promise-resolve-non-dom.js: Added.

(value.then):

• resources/standalone-post.js:

Location:

trunk/Source/JavaScriptCore/API

Files:

• JSContextRef.cpp (modified) (1 diff)
• tests/testapi.c (modified) (1 diff)
• tests/testapi.mm (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSContextRef.cpp

@@ -60 +60 @@
 using namespace JSC;
 
-static RuntimeFlags javaScriptRuntimeFlags(const JSGlobalObject* globalObject)
-{
-    RuntimeFlags runtimeFlags = JSGlobalObject::javaScriptRuntimeFlags(globalObject);
-    runtimeFlags.setPromiseDisabled(true);
-    return runtimeFlags;
-}
-
-const GlobalObjectMethodTable JSC::javaScriptCoreAPIGlobalObjectMethodTable = { &JSGlobalObject::allowsAccessFrom, &JSGlobalObject::supportsProfiling, &JSGlobalObject::supportsRichSourceInfo, &JSGlobalObject::shouldInterruptScript, &javaScriptRuntimeFlags, nullptr, &JSGlobalObject::shouldInterruptScriptBeforeTimeout };
+const GlobalObjectMethodTable JSC::javaScriptCoreAPIGlobalObjectMethodTable = { &JSGlobalObject::allowsAccessFrom, &JSGlobalObject::supportsProfiling, &JSGlobalObject::supportsRichSourceInfo, &JSGlobalObject::shouldInterruptScript, &JSGlobalObject::javaScriptRuntimeFlags, nullptr, &JSGlobalObject::shouldInterruptScriptBeforeTimeout };
 
 // From the API's perspective, a context group remains alive iff

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

@@ -1855 +1855 @@
         {
             JSStringRef promiseProperty = JSStringCreateWithUTF8CString("Promise");
-            ASSERT(!JSObjectHasProperty(context, globalObject, promiseProperty));
+            ASSERT(JSObjectHasProperty(context, globalObject, promiseProperty));
             JSStringRelease(promiseProperty);
         }
         {
             JSStringRef script = JSStringCreateWithUTF8CString("typeof Promise");
-            JSStringRef undefined = JSStringCreateWithUTF8CString("undefined");
+            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, undefined));
+            ASSERT(JSStringIsEqual(valueAsString, function));
             JSStringRelease(valueAsString);
-            JSStringRelease(undefined);
+            JSStringRelease(function);
             JSStringRelease(script);
         }
-        printf("PASS: Promise is not exposed under JSContext API.\n");
+        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);
     }
 

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

@@ -541 +541 @@
     @autoreleasepool {
         JSContext *context = [[JSContext alloc] init];
-        checkResult(@"Promise is not exposed", [context[@"Promise"] isUndefined]);
+        checkResult(@"Promise is exposed", ![context[@"Promise"] isUndefined]);
         JSValue *result = [context evaluateScript:@"typeof Promise"];
-        checkResult(@"typeof Promise is 'undefined'", result.isString && [result isEqualToObject:@"undefined"]);
+        checkResult(@"typeof Promise is 'function'", result.isString && [result isEqualToObject:@"function"]);
+    }
+
+    @autoreleasepool {
+        JSVirtualMachine* vm = [[JSVirtualMachine alloc] init];
+        JSContext* context = [[JSContext alloc] initWithVirtualMachine:vm];
+        [context evaluateScript:@"result = 0; Promise.resolve(42).then(function (value) { result = value; });"];
+        checkResult(@"Microtask is drained", [context[@"result"]  isEqualToObject:@42]);
     }