Skip to content

Commit 3db26f0

Browse files
iamstoliselkorchi
authored andcommitted
Regression test of the export of SafeIntegers.
(cherry picked from commit e121076)
1 parent 2b6cfff commit 3db26f0

File tree

2 files changed

+69
-3
lines changed
  • graal-js/src
    • com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/regress
    • com.oracle.truffle.js/src/com/oracle/truffle/js/nodes

2 files changed

+69
-3
lines changed
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
/*
2+
* Copyright (c) 2025, 2025, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.truffle.js.test.regress;
42+
43+
import static org.junit.Assert.assertFalse;
44+
import static org.junit.Assert.assertTrue;
45+
46+
import org.graalvm.polyglot.Context;
47+
import org.graalvm.polyglot.Value;
48+
import org.junit.Test;
49+
50+
import com.oracle.truffle.js.runtime.SafeInteger;
51+
import com.oracle.truffle.js.test.JSTest;
52+
53+
public class GR64695 {
54+
55+
@Test
56+
public void testIt() {
57+
try (Context ctx = JSTest.newContextBuilder().allowAllAccess(true).build()) {
58+
String code = "var counter = 0; (function() { return counter++ ? 314159265358979 : java.lang.Object; })";
59+
Value fn = ctx.eval("js", code);
60+
assertTrue(fn.execute().isHostObject());
61+
Object value = fn.execute().as(Object.class);
62+
assertTrue(value instanceof Number);
63+
assertFalse(value instanceof SafeInteger);
64+
}
65+
}
66+
67+
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,13 +404,12 @@ public static boolean isJavaPackage(Object target) {
404404
return JavaPackage.isJavaPackage(target);
405405
}
406406

407-
<<<<<<< HEAD
408407
public static boolean isJavaArray(Object value) {
409408
return value != null && value.getClass().isArray();
410-
=======
409+
}
410+
411411
public static boolean isSafeInteger(Object target) {
412412
return target instanceof SafeInteger;
413-
>>>>>>> 809ef7762e3 (ExportValueNode.doTruffleObject() should exclude SafeIntegers.)
414413
}
415414

416415
public static boolean isBigInt(Object target) {

0 commit comments

Comments
 (0)