[GR-58687] Fix missing return value conversion in Polyglot.eval[File].

(cherry picked from commit 9fbb93a)

Author: woess

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) {