unwrap object-type array elements in interop read array element before leaving Espresso

javeleon · javeleon · commit 3540adf2a00a · 2025-04-25T14:57:06.000+02:00
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/dispatch/staticobject/EspressoInterop.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/dispatch/staticobject/EspressoInterop.java
@@ -1034,7 +1034,9 @@ static Object doObject(StaticObject receiver, long index,
                     error.enter();
                     throw InvalidArrayIndexException.create(index);
                 }
-                return receiver.<StaticObject[]> unwrap(language)[(int) index];
+                // before returning from Espresso, we must unwrap the element
+                StaticObject rawResult = receiver.<StaticObject[]> unwrap(language)[(int) index];
+                return InteropUtils.unwrap(language, rawResult, receiver.getKlass().getMeta());
             }
 
             @SuppressWarnings("unused")

Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,9 @@ static Object doObject(StaticObject receiver, long index,`
`1034`	`1034`	`error.enter();`
`1035`	`1035`	`throw InvalidArrayIndexException.create(index);`
`1036`	`1036`	`}`
`1037`		`- return receiver.<StaticObject[]> unwrap(language)[(int) index];`
	`1037`	`+ // before returning from Espresso, we must unwrap the element`
	`1038`	`+ StaticObject rawResult = receiver.<StaticObject[]> unwrap(language)[(int) index];`
	`1039`	`+ return InteropUtils.unwrap(language, rawResult, receiver.getKlass().getMeta());`
`1038`	`1040`	`}`
`1039`	`1041`
`1040`	`1042`	`@SuppressWarnings("unused")`