Throw UnexpectedResultException for boxed values, too.

woess · woess · commit 1df949810aa1 · 2025-11-07T13:52:30.000+01:00
diff --git a/truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/DynamicObjectLibraryTest.java b/truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/DynamicObjectLibraryTest.java
@@ -142,9 +142,9 @@ public void testGet1() throws UnexpectedResultException {
 
         var getNode = createLibraryForReceiverAndKey(o1, k1);
         assertEquals(v1, getNode.getOrDefault(o1, k1, null));
-        assertEquals(v1, getNode.getIntOrDefault(o1, k1, null));
+        assertEquals(v1, getAsInt(getNode, o1, k1, null));
         assertEquals(v1, getNode.getOrDefault(o2, k1, null));
-        assertEquals(v1, getNode.getIntOrDefault(o2, k1, null));
+        assertEquals(v1, getAsInt(getNode, o2, k1, null));
 
         String v2 = "asdf";
         uncachedSet(o1, k1, v2);
@@ -158,7 +158,7 @@ public void testGet1() throws UnexpectedResultException {
             assertEquals(v2, e.getResult());
         }
         assertEquals(v1, getNode.getOrDefault(o2, k1, null));
-        assertEquals(v1, getNode.getIntOrDefault(o2, k1, null));
+        assertEquals(v1, getAsInt(getNode, o2, k1, null));
 
         String missingKey = "missing";
         var getMissingKey = createLibraryForReceiverAndKey(o1, missingKey);
@@ -169,6 +169,17 @@ public void testGet1() throws UnexpectedResultException {
         assertEquals(404, getMissingKey.getIntOrDefault(o1, missingKey, 404));
     }
 
+    private static int getAsInt(DynamicObjectLibraryWrapper getNode, DynamicObject o1, String missingKey, Object defaultValue) throws UnexpectedResultException {
+        try {
+            return getNode.getIntOrDefault(o1, missingKey, defaultValue);
+        } catch (UnexpectedResultException e) {
+            if (e.getResult() instanceof Integer intValue) {
+                return intValue;
+            }
+            throw e;
+        }
+    }
+
     @Test
     public void testPut1() {
         DynamicObject o1 = createEmpty();
diff --git a/truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/DynamicObjectNodesTest.java b/truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/DynamicObjectNodesTest.java
@@ -271,9 +271,9 @@ public void testGet1() throws UnexpectedResultException {
 
         var getNode = createGetNode();
         assertEquals(v1, getNode.execute(o1, k1, null));
-        assertEquals(v1, getNode.executeInt(o1, k1, null));
+        assertEquals(v1, getAsInt(getNode, o1, k1, null));
         assertEquals(v1, getNode.execute(o2, k1, null));
-        assertEquals(v1, getNode.executeInt(o2, k1, null));
+        assertEquals(v1, getAsInt(getNode, o2, k1, null));
 
         String v2 = "asdf";
         uncachedSet(o1, k1, v2);
@@ -287,7 +287,7 @@ public void testGet1() throws UnexpectedResultException {
             assertEquals(v2, e.getResult());
         }
         assertEquals(v1, getNode.execute(o2, k1, null));
-        assertEquals(v1, getNode.executeInt(o2, k1, null));
+        assertEquals(v1, getAsInt(getNode, o2, k1, null));
 
         String missingKey = "missing";
         var getMissingKey = createGetNode();
@@ -298,6 +298,17 @@ public void testGet1() throws UnexpectedResultException {
         assertEquals(404, getMissingKey2.executeInt(o1, missingKey, 404));
     }
 
+    private static int getAsInt(DynamicObject.GetNode getNode, DynamicObject o1, String missingKey, Object defaultValue) throws UnexpectedResultException {
+        try {
+            return getNode.executeInt(o1, missingKey, defaultValue);
+        } catch (UnexpectedResultException e) {
+            if (e.getResult() instanceof Integer intValue) {
+                return intValue;
+            }
+            throw e;
+        }
+    }
+
     @Test
     public void testPut1() {
         DynamicObject o1 = createEmpty();
diff --git a/truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Location.java b/truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Location.java
@@ -277,21 +277,6 @@ final int getIntInternal(DynamicObject store, Shape expectedShape, boolean guard
                 }
                 return (int) longValue;
             }
-        } else if (this instanceof ObjectLocation objectLocation) {
-            Object value;
-            if (field == null) {
-                Object array = getObjectArray(store, guard);
-                long offset = getObjectArrayOffset();
-                value = UnsafeAccess.unsafeGetObject(array, offset, guard, this);
-            } else {
-                if (UseVarHandle) {
-                    value = field.varHandle().get(store);
-                } else {
-                    field.receiverCheck(store);
-                    value = UnsafeAccess.unsafeGetObject(store, getFieldOffset(), guard, this);
-                }
-            }
-            return expectInteger(CompilerDirectives.inInterpreter() ? value : objectLocation.assumedTypeCast(value, guard));
         }
         return getIntUnexpected(store, expectedShape, guard);
     }
@@ -324,21 +309,6 @@ final long getLongInternal(DynamicObject store, Shape expectedShape, boolean gua
                 }
                 return longValue;
             }
-        } else if (this instanceof ObjectLocation objectLocation) {
-            Object value;
-            if (field == null) {
-                Object array = getObjectArray(store, guard);
-                long offset = getObjectArrayOffset();
-                value = UnsafeAccess.unsafeGetObject(array, offset, guard, this);
-            } else {
-                if (UseVarHandle) {
-                    value = field.varHandle().get(store);
-                } else {
-                    field.receiverCheck(store);
-                    value = UnsafeAccess.unsafeGetObject(store, getFieldOffset(), guard, this);
-                }
-            }
-            return expectLong(CompilerDirectives.inInterpreter() ? value : objectLocation.assumedTypeCast(value, guard));
         }
         return getLongUnexpected(store, expectedShape, guard);
     }
@@ -371,21 +341,6 @@ final double getDoubleInternal(DynamicObject store, Shape expectedShape, boolean
                 }
                 return Double.longBitsToDouble(longValue);
             }
-        } else if (this instanceof ObjectLocation objectLocation) {
-            Object value;
-            if (field == null) {
-                Object array = getObjectArray(store, guard);
-                long offset = getObjectArrayOffset();
-                value = UnsafeAccess.unsafeGetObject(array, offset, guard, this);
-            } else {
-                if (UseVarHandle) {
-                    value = field.varHandle().get(store);
-                } else {
-                    field.receiverCheck(store);
-                    value = UnsafeAccess.unsafeGetObject(store, getFieldOffset(), guard, this);
-                }
-            }
-            return expectDouble(CompilerDirectives.inInterpreter() ? value : objectLocation.assumedTypeCast(value, guard));
         }
         return getDoubleUnexpected(store, expectedShape, guard);
     }

Original file line number	Diff line number	Diff line change
`@@ -277,21 +277,6 @@ final int getIntInternal(DynamicObject store, Shape expectedShape, boolean guard`
`277`	`277`	`}`
`278`	`278`	`return (int) longValue;`
`279`	`279`	`}`
`280`		`- } else if (this instanceof ObjectLocation objectLocation) {`
`281`		`- Object value;`
`282`		`- if (field == null) {`
`283`		`- Object array = getObjectArray(store, guard);`
`284`		`- long offset = getObjectArrayOffset();`
`285`		`- value = UnsafeAccess.unsafeGetObject(array, offset, guard, this);`
`286`		`- } else {`
`287`		`- if (UseVarHandle) {`
`288`		`- value = field.varHandle().get(store);`
`289`		`- } else {`
`290`		`- field.receiverCheck(store);`
`291`		`- value = UnsafeAccess.unsafeGetObject(store, getFieldOffset(), guard, this);`
`292`		`- }`
`293`		`- }`
`294`		`- return expectInteger(CompilerDirectives.inInterpreter() ? value : objectLocation.assumedTypeCast(value, guard));`
`295`	`280`	`}`
`296`	`281`	`return getIntUnexpected(store, expectedShape, guard);`
`297`	`282`	`}`
`@@ -324,21 +309,6 @@ final long getLongInternal(DynamicObject store, Shape expectedShape, boolean gua`
`324`	`309`	`}`
`325`	`310`	`return longValue;`
`326`	`311`	`}`
`327`		`- } else if (this instanceof ObjectLocation objectLocation) {`
`328`		`- Object value;`
`329`		`- if (field == null) {`
`330`		`- Object array = getObjectArray(store, guard);`
`331`		`- long offset = getObjectArrayOffset();`
`332`		`- value = UnsafeAccess.unsafeGetObject(array, offset, guard, this);`
`333`		`- } else {`
`334`		`- if (UseVarHandle) {`
`335`		`- value = field.varHandle().get(store);`
`336`		`- } else {`
`337`		`- field.receiverCheck(store);`
`338`		`- value = UnsafeAccess.unsafeGetObject(store, getFieldOffset(), guard, this);`
`339`		`- }`
`340`		`- }`
`341`		`- return expectLong(CompilerDirectives.inInterpreter() ? value : objectLocation.assumedTypeCast(value, guard));`
`342`	`312`	`}`
`343`	`313`	`return getLongUnexpected(store, expectedShape, guard);`
`344`	`314`	`}`
`@@ -371,21 +341,6 @@ final double getDoubleInternal(DynamicObject store, Shape expectedShape, boolean`
`371`	`341`	`}`
`372`	`342`	`return Double.longBitsToDouble(longValue);`
`373`	`343`	`}`
`374`		`- } else if (this instanceof ObjectLocation objectLocation) {`
`375`		`- Object value;`
`376`		`- if (field == null) {`
`377`		`- Object array = getObjectArray(store, guard);`
`378`		`- long offset = getObjectArrayOffset();`
`379`		`- value = UnsafeAccess.unsafeGetObject(array, offset, guard, this);`
`380`		`- } else {`
`381`		`- if (UseVarHandle) {`
`382`		`- value = field.varHandle().get(store);`
`383`		`- } else {`
`384`		`- field.receiverCheck(store);`
`385`		`- value = UnsafeAccess.unsafeGetObject(store, getFieldOffset(), guard, this);`
`386`		`- }`
`387`		`- }`
`388`		`- return expectDouble(CompilerDirectives.inInterpreter() ? value : objectLocation.assumedTypeCast(value, guard));`
`389`	`344`	`}`
`390`	`345`	`return getDoubleUnexpected(store, expectedShape, guard);`
`391`	`346`	`}`