[GR-58725] Backport to 24.1: Fix missing return value conversion in Polyglot.eval[File].

PullRequest: js/3288

Author: OracleLabsAutomation

Diff for: graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/polyglot/PolyglotBuiltinTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -47,16 +47,24 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.File;
+import java.nio.file.Files;
+
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotAccess;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
+import org.graalvm.polyglot.io.IOAccess;
 import org.graalvm.polyglot.proxy.ProxyExecutable;
 import org.junit.Test;
 
+import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.js.lang.JavaScriptLanguage;
+import com.oracle.truffle.js.runtime.Errors;
 import com.oracle.truffle.js.runtime.JSContextOptions;
+import com.oracle.truffle.js.runtime.JSRuntime;
 import com.oracle.truffle.js.test.JSTest;
 
 /**
@@ -279,4 +287,34 @@ public void testEvalInternalLanguage() {
             }
         }
     }
+
+    @SuppressWarnings("try")
+    @Test
+    public void testEvalReturnValue() throws Exception {
+        try (AutoCloseable languageScope = TestLanguage.withTestLanguage(new TestLanguage() {
+            @Override
+            protected CallTarget parse(ParsingRequest request) throws Exception {
+                String code = request.getSource().getCharacters().toString();
+                if (code.startsWith("\"") && code.endsWith("\"")) {
+                    String string = code.substring(1, code.length() - 1);
+                    return RootNode.createConstantNode(string).getCallTarget();
+                }
+                throw Errors.createSyntaxError(code);
+            }
+        })) {
+            IOAccess fileAccess = IOAccess.newBuilder().allowHostFileAccess(true).build();
+            try (Context context = Context.newBuilder().allowIO(fileAccess).allowPolyglotAccess(PolyglotAccess.ALL).build()) {
+                Value result = context.eval(Source.create(JavaScriptLanguage.ID, "Polyglot.eval('" + TestLanguage.ID + "', '\"something\"');"));
+                assertTrue(result.isString());
+                assertEquals("something", result.asString());
+
+                File tmpFile = File.createTempFile("polyglot-evalfile-test", null);
+                tmpFile.deleteOnExit();
+                Files.writeString(tmpFile.toPath(), "\"nanika\"");
+                result = context.eval(Source.create(JavaScriptLanguage.ID, "Polyglot.evalFile('" + TestLanguage.ID + "', " + JSRuntime.quote(tmpFile.getPath()) + ");"));
+                assertTrue(result.isString());
+                assertEquals("nanika", result.asString());
+            }
+        }
+    }
 }

Diff for: graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/PolyglotBuiltins.java

@@ -253,17 +253,19 @@ protected Object evalCachedLanguage(TruffleString language, TruffleString source
                         @Cached TruffleString.EqualNode strEq,
                         @Cached @Shared TruffleString.ToJavaStringNode toJavaStringNode,
                         @Cached("getLanguageIdAndMimeType(toJavaStringNode, language)") Pair<String, String> languagePair,
-                        @Cached @Shared IndirectCallNode callNode) {
-            return callNode.call(evalStringIntl(source, languagePair.getFirst(), languagePair.getSecond()));
+                        @Cached @Shared IndirectCallNode callNode,
+                        @Cached @Shared ImportValueNode importValueNode) {
+            return importValueNode.executeWithTarget(callNode.call(evalStringIntl(source, languagePair.getFirst(), languagePair.getSecond())));
         }
 
         @Specialization(replaces = "evalCachedLanguage")
         @TruffleBoundary
         protected Object evalString(TruffleString language, TruffleString source,
                         @Cached @Shared TruffleString.ToJavaStringNode toJavaStringNode,
-                        @Cached @Shared IndirectCallNode callNode) {
+                        @Cached @Shared IndirectCallNode callNode,
+                        @Cached @Shared ImportValueNode importValueNode) {
             Pair<String, String> pair = getLanguageIdAndMimeType(toJavaStringNode, language);
-            return callNode.call(evalStringIntl(source, pair.getFirst(), pair.getSecond()));
+            return importValueNode.executeWithTarget(callNode.call(evalStringIntl(source, pair.getFirst(), pair.getSecond())));
         }
 
         private CallTarget evalStringIntl(TruffleString sourceText, String languageId, String mimeType) {
@@ -300,17 +302,19 @@ protected Object evalFileCachedLanguage(TruffleString language, TruffleString fi
                         @Cached TruffleString.EqualNode strEq,
                         @Cached @Shared TruffleString.ToJavaStringNode toJavaStringNode,
                         @Cached("getLanguageIdAndMimeType(toJavaStringNode, language)") Pair<String, String> languagePair,
-                        @Cached @Shared IndirectCallNode callNode) {
-            return callNode.call(evalFileIntl(file, languagePair.getFirst(), languagePair.getSecond()));
+                        @Cached @Shared IndirectCallNode callNode,
+                        @Cached @Shared ImportValueNode importValueNode) {
+            return importValueNode.executeWithTarget(callNode.call(evalFileIntl(file, languagePair.getFirst(), languagePair.getSecond())));
         }
 
         @Specialization(replaces = "evalFileCachedLanguage")
         @TruffleBoundary
         protected Object evalFileString(TruffleString language, TruffleString file,
                         @Cached @Shared TruffleString.ToJavaStringNode toJavaStringNode,
-                        @Cached @Shared IndirectCallNode callNode) {
+                        @Cached @Shared IndirectCallNode callNode,
+                        @Cached @Shared ImportValueNode importValueNode) {
             Pair<String, String> pair = getLanguageIdAndMimeType(toJavaStringNode, language);
-            return callNode.call(evalFileIntl(file, pair.getFirst(), pair.getSecond()));
+            return importValueNode.executeWithTarget(callNode.call(evalFileIntl(file, pair.getFirst(), pair.getSecond())));
         }
 
         private CallTarget evalFileIntl(TruffleString fileName, String languageId, String mimeType) {

Diff for: graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/interop/ExportValueNode.java

@@ -161,9 +161,9 @@ protected static TruffleObject doTruffleObject(TruffleObject value, @SuppressWar
     }
 
     @TruffleBoundary
-    @Specialization(guards = {"!isTruffleObject(thiz)", "!isString(thiz)", "!isBoolean(thiz)", "!isNumberDouble(thiz)", "!isNumberLong(thiz)", "!isNumberInteger(thiz)"})
+    @Specialization(guards = {"!isTruffleObject(value)", "!isString(value)", "!isBoolean(value)", "!isNumberDouble(value)", "!isNumberLong(value)", "!isNumberInteger(value)"})
     protected static Object doOther(Object value, @SuppressWarnings("unused") Object thiz, @SuppressWarnings("unused") boolean bindFunctions) {
-        throw Errors.createTypeErrorFormat("Cannot convert to TruffleObject: %s", value == null ? null : value.getClass().getSimpleName());
+        throw Errors.createTypeErrorFormat("Cannot convert to TruffleObject: %s", value == null ? null : value.getClass().getTypeName());
     }
 
     @NeverDefault