Adding a context option for Atomics.waitAsync.

Author: iamstolis

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/AtomicsBuiltins.java

@@ -125,6 +125,7 @@
 public final class AtomicsBuiltins extends JSBuiltinsContainer.SwitchEnum<AtomicsBuiltins.Atomics> {
 
     public static final JSBuiltinsContainer BUILTINS = new AtomicsBuiltins();
+    public static final JSBuiltinsContainer WAIT_ASYNC_BUILTINS = new WaitAsyncBuiltins();
 
     protected AtomicsBuiltins() {
         super(JSRealm.ATOMICS_CLASS_NAME, Atomics.class);
@@ -143,10 +144,7 @@ public enum Atomics implements BuiltinEnum<Atomics> {
         wait(4),
         isLockFree(1),
 
-        notify(3), // ES2019
-
-        // Stage 3
-        waitAsync(4);
+        notify(3);
 
         private final int length;
 
@@ -163,8 +161,6 @@ public int getLength() {
         public int getECMAScriptVersion() {
             if (this.equals(notify)) {
                 return JSConfig.ECMAScript2019;
-            } else if (this.equals(waitAsync)) {
-                return JSConfig.StagingECMAScriptVersion;
             }
             return JSConfig.ECMAScript2017;
         }
@@ -198,12 +194,41 @@ protected Object createNode(JSContext context, JSBuiltin builtin, boolean constr
                 return AtomicsWaitNodeGen.create(context, builtin, args().fixedArgs(4).createArgumentNodes(context));
             case isLockFree:
                 return AtomicsIsLockFreeNodeGen.create(context, builtin, args().fixedArgs(1).createArgumentNodes(context));
-            case waitAsync:
-                return AtomicsWaitAsyncNodeGen.create(context, builtin, args().fixedArgs(4).createArgumentNodes(context));
         }
         return null;
     }
 
+    public static final class WaitAsyncBuiltins extends JSBuiltinsContainer.SwitchEnum<WaitAsyncBuiltins.WaitAsync> {
+
+        protected WaitAsyncBuiltins() {
+            super(WaitAsync.class);
+        }
+
+        public enum WaitAsync implements BuiltinEnum<WaitAsync> {
+            waitAsync(4);
+
+            private final int length;
+
+            WaitAsync(int length) {
+                this.length = length;
+            }
+
+            @Override
+            public int getLength() {
+                return length;
+            }
+        }
+
+        @Override
+        protected Object createNode(JSContext context, JSBuiltin builtin, boolean construct, boolean newTarget, WaitAsync builtinEnum) {
+            return switch (builtinEnum) {
+                case waitAsync -> AtomicsWaitAsyncNodeGen.create(context, builtin, args().fixedArgs(4).createArgumentNodes(context));
+                default -> null;
+            };
+        }
+
+    }
+
     @ImportStatic(JSArrayBufferView.class)
     public abstract static class AtomicsOperationNode extends JSBuiltinNode {
 

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSContextOptions.java

@@ -549,6 +549,11 @@ public Map<String, String> apply(String value) {
     public static final OptionKey<Boolean> NEW_SET_METHODS = new OptionKey<>(false);
     @CompilationFinal private boolean newSetMethods;
 
+    public static final String ATOMICS_WAIT_ASYNC_NAME = JS_OPTION_PREFIX + "atomics-wait-async";
+    @Option(name = ATOMICS_WAIT_ASYNC_NAME, category = OptionCategory.EXPERT, help = "Enable Atomics.waitAsync.") //
+    public static final OptionKey<Boolean> ATOMICS_WAIT_ASYNC = new OptionKey<>(false);
+    @CompilationFinal private boolean atomicsWaitAsync;
+
     public static final String TEMPORAL_NAME = JS_OPTION_PREFIX + "temporal";
     @Option(name = TEMPORAL_NAME, category = OptionCategory.EXPERT, help = "Enable JavaScript Temporal API.") //
     public static final OptionKey<Boolean> TEMPORAL = new OptionKey<>(false);
@@ -746,6 +751,7 @@ private void cacheOptions(SandboxPolicy sandboxPolicy) {
         this.webAssembly = readBooleanOption(WEBASSEMBLY);
         this.unhandledRejectionsMode = readUnhandledRejectionsMode();
         this.newSetMethods = readBooleanOption(NEW_SET_METHODS);
+        this.atomicsWaitAsync = ATOMICS_WAIT_ASYNC.hasBeenSet(optionValues) ? readBooleanOption(ATOMICS_WAIT_ASYNC) : getEcmaScriptVersion() >= JSConfig.ECMAScript2024;
         this.asyncIteratorHelpers = getEcmaScriptVersion() >= JSConfig.ECMAScript2018 && readBooleanOption(ASYNC_ITERATOR_HELPERS);
         this.iteratorHelpers = getEcmaScriptVersion() >= JSConfig.ECMAScript2018 && (this.asyncIteratorHelpers || readBooleanOption(ITERATOR_HELPERS));
         this.shadowRealm = getEcmaScriptVersion() >= JSConfig.ECMAScript2015 && readBooleanOption(SHADOW_REALM);
@@ -1139,6 +1145,10 @@ public boolean isNewSetMethods() {
         return newSetMethods;
     }
 
+    public boolean isAtomicsWaitAsync() {
+        return atomicsWaitAsync;
+    }
+
     public boolean isIteratorHelpers() {
         return iteratorHelpers;
     }

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSRealm.java

@@ -2402,6 +2402,9 @@ private JSDynamicObject createAtomics() {
         JSObject obj = JSObjectUtil.createOrdinaryPrototypeObject(this, this.getObjectPrototype());
         JSObjectUtil.putToStringTag(obj, ATOMICS_CLASS_NAME);
         JSObjectUtil.putFunctionsFromContainer(this, obj, AtomicsBuiltins.BUILTINS);
+        if (getContextOptions().isAtomicsWaitAsync()) {
+            JSObjectUtil.putFunctionsFromContainer(this, obj, AtomicsBuiltins.WAIT_ASYNC_BUILTINS);
+        }
         return obj;
     }