<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[278888] trunk/Source/JavaScriptCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/278888">278888</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2021-06-15 11:39:27 -0700 (Tue, 15 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Shouldn't drain the micro task queue when calling out to ObjC
https://bugs.webkit.org/show_bug.cgi?id=161942

Unreviewed, relanding <a href="http://trac.webkit.org/projects/webkit/changeset/278734">r278734</a>.


* API/tests/testapi.cpp:
(TestAPI::promiseDrainDoesNotEatExceptions):
(testCAPIViaCpp):
* API/tests/testapi.mm:
(testMicrotaskWithFunction):
(testObjectiveCAPI):
* runtime/JSLock.cpp:
(JSC::JSLock::willReleaseLock):
* runtime/ObjectPrototype.cpp:
(JSC::isPokerBros):
* runtime/VM.cpp:
(JSC::VM::didExhaustMicrotaskQueue):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIteststestapicpp">trunk/Source/JavaScriptCore/API/tests/testapi.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIteststestapimm">trunk/Source/JavaScriptCore/API/tests/testapi.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSLockcpp">trunk/Source/JavaScriptCore/runtime/JSLock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectPrototypecpp">trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIteststestapicpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/testapi.cpp (278887 => 278888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/testapi.cpp        2021-06-15 18:25:07 UTC (rev 278887)
+++ trunk/Source/JavaScriptCore/API/tests/testapi.cpp   2021-06-15 18:39:27 UTC (rev 278888)
</span><span class="lines">@@ -38,6 +38,10 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringCommon.h>
</span><span class="cx"> 
</span><ins>+#if PLATFORM(COCOA)
+#include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
+#endif
+
</ins><span class="cx"> extern "C" void configureJSCForTesting();
</span><span class="cx"> extern "C" int testCAPIViaCpp(const char* filter);
</span><span class="cx"> extern "C" void JSSynchronousGarbageCollectForDebugging(JSContextRef);
</span><span class="lines">@@ -147,6 +151,7 @@
</span><span class="cx">     void promiseUnhandledRejection();
</span><span class="cx">     void promiseUnhandledRejectionFromUnhandledRejectionCallback();
</span><span class="cx">     void promiseEarlyHandledRejections();
</span><ins>+    void promiseDrainDoesNotEatExceptions();
</ins><span class="cx">     void topCallFrameAccess();
</span><span class="cx">     void markedJSValueArrayAndGC();
</span><span class="cx">     void classDefinitionWithJSSubclass();
</span><span class="lines">@@ -609,6 +614,28 @@
</span><span class="cx">     check(!callbackCalled, "unhandled rejection callback should not be called for asynchronous early-handled rejection");
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void TestAPI::promiseDrainDoesNotEatExceptions()
+{
+#if PLATFORM(COCOA)
+    bool useLegacyDrain = false;
+#if PLATFORM(MAC)
+    useLegacyDrain = applicationSDKVersion() < DYLD_MACOSX_VERSION_12_00;
+#elif PLATFORM(WATCH)
+        // Don't check, JSC isn't API on watch anyway.
+#elif PLATFORM(IOS_FAMILY)
+    useLegacyDrain = applicationSDKVersion() < DYLD_IOS_VERSION_15_0;
+#else
+#error "Unsupported Cocoa Platform"
+#endif
+    if (useLegacyDrain)
+        return;
+#endif
+
+    ScriptResult result = callFunction("(function() { Promise.resolve().then(() => { throw 2; }); throw 1; })");
+    check(!result, "function should throw an error");
+    check(JSValueIsNumber(context, result.error()) && JSValueToNumber(context, result.error(), nullptr) == 1, "exception payload should have been 1");
+}
+
</ins><span class="cx"> void TestAPI::topCallFrameAccess()
</span><span class="cx"> {
</span><span class="cx">     {
</span><span class="lines">@@ -760,6 +787,7 @@
</span><span class="cx">     RUN(promiseRejectTrue());
</span><span class="cx">     RUN(promiseUnhandledRejection());
</span><span class="cx">     RUN(promiseUnhandledRejectionFromUnhandledRejectionCallback());
</span><ins>+    RUN(promiseDrainDoesNotEatExceptions());
</ins><span class="cx">     RUN(promiseEarlyHandledRejections());
</span><span class="cx">     RUN(markedJSValueArrayAndGC());
</span><span class="cx">     RUN(classDefinitionWithJSSubclass());
</span><span class="lines">@@ -766,10 +794,8 @@
</span><span class="cx">     RUN(proxyReturnedWithJSSubclassing());
</span><span class="cx">     RUN(testJSObjectSetOnGlobalObjectSubclassDefinition());
</span><span class="cx"> 
</span><del>-    if (tasks.isEmpty()) {
-        dataLogLn("Filtered all tests: ERROR");
-        return 1;
-    }
</del><ins>+    if (tasks.isEmpty())
+        return 0;
</ins><span class="cx"> 
</span><span class="cx">     Lock lock;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIteststestapimm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/testapi.mm (278887 => 278888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/testapi.mm 2021-06-15 18:25:07 UTC (rev 278887)
+++ trunk/Source/JavaScriptCore/API/tests/testapi.mm    2021-06-15 18:39:27 UTC (rev 278888)
</span><span class="lines">@@ -41,6 +41,11 @@
</span><span class="cx"> #import "Regress141809.h"
</span><span class="cx"> #import <wtf/spi/darwin/DataVaultSPI.h>
</span><span class="cx"> 
</span><ins>+
+#if PLATFORM(COCOA)
+#import <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
+#endif
+
</ins><span class="cx"> #if __has_include(<libproc.h>)
</span><span class="cx"> #define HAS_LIBPROC 1
</span><span class="cx"> #import <libproc.h>
</span><span class="lines">@@ -2730,6 +2735,40 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static void testMicrotaskWithFunction()
+{
+    @autoreleasepool {
+#if PLATFORM(COCOA)
+        bool useLegacyDrain = false;
+#if PLATFORM(MAC)
+        useLegacyDrain = applicationSDKVersion() < DYLD_MACOSX_VERSION_12_00;
+#elif PLATFORM(WATCH)
+            // Don't check, JSC isn't API on watch anyway.
+#elif PLATFORM(IOS_FAMILY)
+        useLegacyDrain = applicationSDKVersion() < DYLD_IOS_VERSION_15_0;
+#else
+#error "Unsupported Cocoa Platform"
+#endif
+        if (useLegacyDrain)
+            return;
+#endif
+
+        JSContext *context = [[JSContext alloc] init];
+
+        JSValue *globalObject = context.globalObject;
+
+        auto block = ^() {
+            return 1+1;
+        };
+
+        [globalObject setValue:block forProperty:@"setTimeout"];
+        JSValue *arr = [context evaluateScript:@"var arr = []; (async () => { await 1; arr.push(3); })(); arr.push(1); setTimeout(); arr.push(2); arr;"];
+        checkResult(@"arr[0] should be 1", [arr[@0] toInt32] == 1);
+        checkResult(@"arr[1] should be 2", [arr[@1] toInt32] == 2);
+        checkResult(@"arr[2] should be 3", [arr[@2] toInt32] == 3);
+    }
+}
+
</ins><span class="cx"> @protocol ToString <JSExport>
</span><span class="cx"> - (NSString *)toString;
</span><span class="cx"> @end
</span><span class="lines">@@ -2848,6 +2887,8 @@
</span><span class="cx">     RUN(promiseCreateRejected());
</span><span class="cx">     RUN(parallelPromiseResolveTest());
</span><span class="cx"> 
</span><ins>+    RUN(testMicrotaskWithFunction());
+
</ins><span class="cx">     if (!filter)
</span><span class="cx">         testObjectiveCAPIMain();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (278887 => 278888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-06-15 18:25:07 UTC (rev 278887)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-06-15 18:39:27 UTC (rev 278888)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2021-06-15  Keith Miller  <keith_miller@apple.com>
+
+        Shouldn't drain the micro task queue when calling out to ObjC
+        https://bugs.webkit.org/show_bug.cgi?id=161942
+
+        Unreviewed, relanding r278734.
+
+        * API/tests/testapi.cpp:
+        (TestAPI::promiseDrainDoesNotEatExceptions):
+        (testCAPIViaCpp):
+        * API/tests/testapi.mm:
+        (testMicrotaskWithFunction):
+        (testObjectiveCAPI):
+        * runtime/JSLock.cpp:
+        (JSC::JSLock::willReleaseLock):
+        * runtime/ObjectPrototype.cpp:
+        (JSC::isPokerBros):
+        * runtime/VM.cpp:
+        (JSC::VM::didExhaustMicrotaskQueue):
+
</ins><span class="cx"> 2021-06-15  Michael Catanzaro  <mcatanzaro@gnome.org>
</span><span class="cx"> 
</span><span class="cx">         -Warray-bounds warning in Packed.h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSLockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSLock.cpp (278887 => 278888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSLock.cpp   2021-06-15 18:25:07 UTC (rev 278887)
+++ trunk/Source/JavaScriptCore/runtime/JSLock.cpp      2021-06-15 18:39:27 UTC (rev 278888)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005-2018 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005-2021 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * This library is free software; you can redistribute it and/or
</span><span class="cx">  * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -33,6 +33,10 @@
</span><span class="cx"> #include <wtf/ios/WebCoreThread.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(COCOA)
+#include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
+#endif
+
</ins><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><span class="cx"> Lock GlobalJSLock::s_sharedInstanceMutex;
</span><span class="lines">@@ -197,8 +201,25 @@
</span><span class="cx"> {   
</span><span class="cx">     RefPtr<VM> vm = m_vm;
</span><span class="cx">     if (vm) {
</span><del>-        vm->drainMicrotasks();
</del><ins>+        static bool useLegacyDrain = false;
+#if PLATFORM(COCOA)
+        static std::once_flag once;
+        std::call_once(once, [] {
+#if PLATFORM(MAC)
+            useLegacyDrain = applicationSDKVersion() < DYLD_MACOSX_VERSION_12_00;
+#elif PLATFORM(WATCH)
+            // Don't check, JSC isn't API on watch anyway.
+#elif PLATFORM(IOS_FAMILY)
+            useLegacyDrain = applicationSDKVersion() < DYLD_IOS_VERSION_15_0;
+#else
+#error "Unsupported Cocoa Platform"
+#endif
+        });
+#endif
</ins><span class="cx"> 
</span><ins>+        if (!m_lockDropDepth || useLegacyDrain)
+            vm->drainMicrotasks();
+
</ins><span class="cx">         if (!vm->topCallFrame)
</span><span class="cx">             vm->clearLastException();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp (278887 => 278888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp  2021-06-15 18:25:07 UTC (rev 278887)
+++ trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp     2021-06-15 18:39:27 UTC (rev 278888)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "PropertySlot.h"
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#include <wtf/spi/darwin/dyldSPI.h>
</del><ins>+#include <wtf/cocoa/RuntimeApplicationChecksCocoa.h>
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx">     auto bundleID = CFBundleGetIdentifier(CFBundleGetMainBundle());
</span><span class="cx">     return bundleID
</span><span class="cx">         && CFEqual(bundleID, CFSTR("com.kpgame.PokerBros"))
</span><del>-        && dyld_get_program_sdk_version() < DYLD_IOS_VERSION_14_0;
</del><ins>+        && applicationSDKVersion() < DYLD_IOS_VERSION_14_0;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (278887 => 278888)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp       2021-06-15 18:25:07 UTC (rev 278887)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp  2021-06-15 18:39:27 UTC (rev 278888)
</span><span class="lines">@@ -1368,13 +1368,15 @@
</span><span class="cx"> 
</span><span class="cx"> void VM::didExhaustMicrotaskQueue()
</span><span class="cx"> {
</span><del>-    auto unhandledRejections = WTFMove(m_aboutToBeNotifiedRejectedPromises);
-    for (auto& promise : unhandledRejections) {
-        if (promise->isHandled(*this))
-            continue;
</del><ins>+    do {
+        auto unhandledRejections = WTFMove(m_aboutToBeNotifiedRejectedPromises);
+        for (auto& promise : unhandledRejections) {
+            if (promise->isHandled(*this))
+                continue;
</ins><span class="cx"> 
</span><del>-        callPromiseRejectionCallback(promise);
-    }
</del><ins>+            callPromiseRejectionCallback(promise);
+        }
+    } while (!m_aboutToBeNotifiedRejectedPromises.isEmpty());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void VM::promiseRejected(JSPromise* promise)
</span></span></pre>
</div>
</div>

</body>
</html>