Skip to content

Commit 4eea506

Browse files
committed
[GR-73472] Add explicit null check and deopt in StaticObject.unwrap
PullRequest: graal/23301
2 parents 689aa40 + c05ae5b commit 4eea506

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

  • espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/staticobject

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/staticobject/StaticObject.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,12 @@ private Object getArray(EspressoLanguage language) {
318318
public final <T> T unwrap(EspressoLanguage language) {
319319
checkNotForeign();
320320
assert isArray();
321-
return (T) getArray(language);
321+
Object array = getArray(language);
322+
if (array == null) {
323+
CompilerDirectives.transferToInterpreterAndInvalidate();
324+
throw EspressoError.shouldNotReachHere();
325+
}
326+
return (T) array;
322327
}
323328

324329
public final <T> T get(EspressoLanguage language, int index) {

0 commit comments

Comments
 (0)