[GR-42335] Backport GR-42288 to 22.3: Returning void await this in async function.

PullRequest: js/2644

Author: woess

common.jsonnet

@@ -34,7 +34,7 @@ local common_json = (import "common.json");
 
   local common = {
     packages+: {
-      'mx': 'HEAD',
+      'mx': '6.9.1',
       'python3': '==3.8.10',
       'pip:pylint': '==2.4.4',
       'pip:ninja_syntax': '==1.7.2',

graal-js/src/com.oracle.truffle.js.test/js/github_graaljs_672.js

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ */
+
+/**
+ * [Bug]: Returning void await this in async function with parameter.
+ * https://github.com/oracle/graaljs/issues/672
+ *
+ * @option unhandled-rejections=throw
+ */
+
+load('assert.js');
+
+let f = async (x) => void await this;
+f();

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/control/ReturnNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -53,7 +53,7 @@
  * 12.9 The return Statement.
  */
 @NodeInfo(shortName = "return")
-public class ReturnNode extends StatementNode {
+public abstract class ReturnNode extends StatementNode {
 
     @Child protected JavaScriptNode expression;
 
@@ -66,7 +66,7 @@ public static ReturnNode create(JavaScriptNode expression) {
             return new ConstantReturnNode(expression);
         } else {
             assert !(expression instanceof EmptyNode);
-            return new ReturnNode(expression);
+            return new ReturnValueInExceptionNode(expression);
         }
     }
 
@@ -92,14 +92,10 @@ public static ReturnNode createTerminalPositionReturn(JavaScriptNode expression)
     }
 
     @Override
-    public Object execute(VirtualFrame frame) {
-        throw new ReturnException(expression.execute(frame));
-    }
+    public abstract Object execute(VirtualFrame frame);
 
     @Override
-    public void executeVoid(VirtualFrame frame) {
-        throw new ReturnException(expression.execute(frame));
-    }
+    public abstract void executeVoid(VirtualFrame frame);
 
     @Override
     protected JavaScriptNode copyUninitialized(Set<Class<? extends Tag>> materializedTags) {
@@ -113,6 +109,23 @@ public boolean isResultAlwaysOfType(Class<?> clazz) {
         return expression.isResultAlwaysOfType(clazz);
     }
 
+    private static class ReturnValueInExceptionNode extends ReturnNode {
+
+        protected ReturnValueInExceptionNode(JavaScriptNode expression) {
+            super(expression);
+        }
+
+        @Override
+        public Object execute(VirtualFrame frame) {
+            throw new ReturnException(expression.execute(frame));
+        }
+
+        @Override
+        public void executeVoid(VirtualFrame frame) {
+            throw new ReturnException(expression.execute(frame));
+        }
+    }
+
     private static class ConstantReturnNode extends ReturnNode {
 
         private final ReturnException exception;
@@ -164,6 +177,11 @@ protected TerminalPositionReturnNode(JavaScriptNode expression) {
         public Object execute(VirtualFrame frame) {
             return expression.execute(frame);
         }
+
+        @Override
+        public void executeVoid(VirtualFrame frame) {
+            expression.executeVoid(frame);
+        }
     }
 
 }