Back out "Switch Hermes to use engine job/microtask queue by default"

Summary: Original commit changeset: b0c0f198826a Original Phabricator Diff: D34536200 Reviewed By: sammy-SC Differential Revision: D34625038 fbshipit-source-id: 444c99150f45f426d5c62ff8b27b64a91d7d619b
bitpie-wallet · Mar 3, 2022 · ba6e578 · ba6e578
1 parent 5a1efb3
commit ba6e578
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/include/hermes/VM/Runtime.h b/include/hermes/VM/Runtime.h
@@ -853,7 +853,7 @@ class Runtime : public HandleRootOwner,
   }
 
   bool useJobQueue() const {
-    return !(getVMExperimentFlags() & experiments::PromiseOnImmediateQueue);
+    return getVMExperimentFlags() & experiments::JobQueue;
   }
 
   bool builtinsAreFrozen() const {

diff --git a/include/hermes/VM/VMExperiments.h b/include/hermes/VM/VMExperiments.h
@@ -30,8 +30,7 @@ enum {
   // GenGC = 1 << 11,
   // HadesTimedIncremental = 1 << 12,
   CrashTrace = 1 << 13,
-  // JobQueue = 1 << 14,
-  PromiseOnImmediateQueue = 1 << 15,
+  JobQueue = 1 << 14,
 };
 
 /// Set of flags for active VM experiments.

diff --git a/test/hermes/console-host-job-throw.js b/test/hermes/console-host-job-throw.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// RUN: %hermes %s 2>&1 | %FileCheck --match-full-lines %s
+// RUN: %hermes -Xvm-experiment-flags=16384 %s 2>&1 | %FileCheck --match-full-lines %s
 
 print("ConsoleHost job throws");
 // CHECK-LABEL: ConsoleHost job throws

diff --git a/test/hermes/promise-jobs-scheduled-in-scripts.js b/test/hermes/promise-jobs-scheduled-in-scripts.js
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// RUN: %hermes -Xvm-experiment-flags=32768 %s | %FileCheck --match-full-lines --check-prefix=TASK %s
-// RUN: %hermes %s | %FileCheck --match-full-lines --check-prefix=MICROTASK %s
+// RUN: %hermes %s | %FileCheck --match-full-lines --check-prefix=TASK %s
+// RUN: %hermes -Xvm-experiment-flags=16384 %s | %FileCheck --match-full-lines --check-prefix=MICROTASK %s
 
 print('promise jobs scheduled in scripts');
 // CHECK-LABEL: promise jobs scheduled in scripts

diff --git a/test/hermes/promise-jobs-scheduled-in-tasks.js b/test/hermes/promise-jobs-scheduled-in-tasks.js
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// RUN: %hermes -Xvm-experiment-flags=32768 %s | %FileCheck --match-full-lines --check-prefix=TASK %s
-// RUN: %hermes %s | %FileCheck --match-full-lines --check-prefix=MICROTASK %s
+// RUN: %hermes %s | %FileCheck --match-full-lines --check-prefix=TASK %s
+// RUN: %hermes -Xvm-experiment-flags=16384 %s | %FileCheck --match-full-lines --check-prefix=MICROTASK %s
 
 print('promise jobs scheduled in tasks');
 // CHECK-LABEL: promise jobs scheduled in tasks

diff --git a/test/hermes/promise.js b/test/hermes/promise.js
@@ -6,6 +6,7 @@
  */
 
 // RUN: %hermes -Xes6-promise %s | %FileCheck --match-full-lines %s
+// RUN: %hermes -Xvm-experiment-flags=16384 %s | %FileCheck --match-full-lines %s
 // RUN: %hermesc -O -emit-binary -out %t.hbc %s && %hermes -Xes6-promise %t.hbc | %FileCheck --match-full-lines %s
 
 print('promise');