[GR-64708] Backport to 24.2: ExportValueNode.doTruffleObject() should exclude SafeIntegers.

PullRequest: js/3499

Author: OracleLabsAutomation

graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/regress/GR64695.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025, 2025, 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
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.js.test.regress;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Value;
+import org.junit.Test;
+
+import com.oracle.truffle.js.runtime.SafeInteger;
+import com.oracle.truffle.js.test.JSTest;
+
+public class GR64695 {
+
+    @Test
+    public void testIt() {
+        try (Context ctx = JSTest.newContextBuilder().allowAllAccess(true).build()) {
+            String code = "var counter = 0; (function() { return counter++ ? 314159265358979 : java.lang.Object; })";
+            Value fn = ctx.eval("js", code);
+            assertTrue(fn.execute().isHostObject());
+            Object value = fn.execute().as(Object.class);
+            assertTrue(value instanceof Number);
+            assertFalse(value instanceof SafeInteger);
+        }
+    }
+
+}

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/JSGuards.java

@@ -46,6 +46,7 @@
 import com.oracle.truffle.api.strings.TruffleString;
 import com.oracle.truffle.js.runtime.BigInt;
 import com.oracle.truffle.js.runtime.JSRuntime;
+import com.oracle.truffle.js.runtime.SafeInteger;
 import com.oracle.truffle.js.runtime.Strings;
 import com.oracle.truffle.js.runtime.Symbol;
 import com.oracle.truffle.js.runtime.builtins.JSAbstractArgumentsArray;
@@ -407,6 +408,10 @@ public static boolean isJavaArray(Object value) {
         return value != null && value.getClass().isArray();
     }
 
+    public static boolean isSafeInteger(Object target) {
+        return target instanceof SafeInteger;
+    }
+
     public static boolean isBigInt(Object target) {
         return target instanceof BigInt;
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, 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
@@ -155,7 +155,7 @@ protected static TruffleString doString(TruffleString value, @SuppressWarnings("
         return value;
     }
 
-    @Specialization(guards = {"!isJSFunction(value)"}, replaces = "doObject")
+    @Specialization(guards = {"!isJSFunction(value)", "!isSafeInteger(value)"}, replaces = "doObject")
     protected static TruffleObject doTruffleObject(TruffleObject value, @SuppressWarnings("unused") Object thiz, @SuppressWarnings("unused") boolean bindFunctions) {
         return value;
     }