Changeset 273779 in webkit

Timestamp:

Mar 2, 2021 6:02:22 PM (2 years ago)

Author:

ysuzuki@apple.com

Message:

Flaky JSC test: stress/shared-array-buffer-sort-while-different-thread-is-modifying.js.default
​https://bugs.webkit.org/show_bug.cgi?id=221129

Reviewed by Saam Barati.

Speculative fix for JSC shell's termination handling change.

• jsc.cpp:

(CommandLine::CommandLine):
(jscmain):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-03-02  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        Flaky JSC test: stress/shared-array-buffer-sort-while-different-thread-is-modifying.js.default
+        https://bugs.webkit.org/show_bug.cgi?id=221129
+
+        Reviewed by Saam Barati.
+
+        Speculative fix for JSC shell's termination handling change.
+
+        * jsc.cpp:
+        (CommandLine::CommandLine):
+        (jscmain):
+
 2021-03-02  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -414 +414 @@
 
     enum CommandLineForWorkersTag { CommandLineForWorkers };
-    CommandLine(CommandLineForWorkersTag)
-    {
-    }
+    explicit CommandLine(CommandLineForWorkersTag);
 
     Vector<Script> m_scripts;
@@ -437 +435 @@
     void parseArguments(int, char**);
 };
+static LazyNeverDestroyed<CommandLine> mainCommandLine;
 
 static const char interactivePrompt[] = ">>> ";
@@ -3382 +3381 @@
 }
 
+CommandLine::CommandLine(CommandLineForWorkersTag)
+    : m_treatWatchdogExceptionAsSuccess(mainCommandLine->m_treatWatchdogExceptionAsSuccess)
+{
+}
+
 template<typename Func>
 int runJSC(const CommandLine& options, bool isWorker, const Func& func)
@@ -3503 +3507 @@
     // Note that the options parsing can affect VM creation, and thus
     // comes first.
-    CommandLine options(argc, argv);
+    mainCommandLine.construct(argc, argv);
 
     {
         Options::AllowUnfinalizedAccessScope scope;
         processConfigFile(Options::configFile(), "jsc");
-        if (options.m_dump)
+        if (mainCommandLine->m_dump)
             Options::dumpGeneratedBytecodes() = true;
     }
@@ -3575 +3579 @@
 
     int result = runJSC(
-        options, false,
+        mainCommandLine.get(), false,
         [&] (VM& vm, GlobalObject* globalObject, bool& success) {
             UNUSED_PARAM(vm);
@@ -3581 +3585 @@
             vm.setOnEachMicrotaskTick(WTFMove(onEachMicrotaskTick));
 #endif
-            runWithOptions(globalObject, options, success);
+            runWithOptions(globalObject, mainCommandLine.get(), success);
         });
 
     printSuperSamplerState();
 
-    if (options.m_dumpMemoryFootprint) {
+    if (mainCommandLine->m_dumpMemoryFootprint) {
         MemoryFootprint footprint = MemoryFootprint::now();