Skip to content

(0.62) Disallow IF_ACMPEQ and IFNULL for uninitialized types #24530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pshipton merged 1 commit into from
Aug 12, 2026
+20 −11
Merged

(0.62) Disallow IF_ACMPEQ and IFNULL for uninitialized types #24530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions runtime/bcverify/rtverify.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,13 +1150,13 @@ verifyBytecodes (J9BytecodeVerificationData * verifyData)
goto _inconsistentStack;
}
} else {
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
#if JAVA_SPEC_VERSION >= 27
if ((JBifacmpeq == bc) || (JBifacmpne == bc) || (JBifnonnull == bc) || (JBifnull == bc)) {
errorType = J9NLS_BCV_ERR_UNINITIALIZED_VALUE_OBJECT__ID;
verboseErrorCode = BCV_ERR_ILLEGAL_WITH_UNINITIALIZED_VALUE_OBJECT;
errorType = J9NLS_BCV_ERR_UNINITIALIZED_OBJECT__ID;
verboseErrorCode = BCV_ERR_ILLEGAL_WITH_UNINITIALIZED_OBJECT;
goto _miscError;
}
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#endif /* JAVA_SPEC_VERSION >= 27 */
}
} else {
POP_TOS_INTEGER;
Expand Down
9 changes: 9 additions & 0 deletions runtime/nls/vrfy/j9bcv.nls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,3 +454,12 @@ J9NLS_BCV_ERR_UNKNOWN_STRICT_FIELD.system_action=The JVM will throw a java.lang.
J9NLS_BCV_ERR_UNKNOWN_STRICT_FIELD.user_response=Contact the provider of the classfile for a corrected version.

# END NON-TRANSLATABLE

# Acmpeq, acmpne, ifnonnull and ifnull are not translatable.
J9NLS_BCV_ERR_UNINITIALIZED_OBJECT=Uninitialized object used with acmpeq, acmpne, ifnonnull, or ifnull.
# START NON-TRANSLATABLE
J9NLS_BCV_ERR_UNINITIALIZED_OBJECT.explanation=Verification failed because a newly created but uninitialized object was used with if_acmpeq, if_acmpne, ifnonnull or ifnull.
J9NLS_BCV_ERR_UNINITIALIZED_OBJECT.system_action=The JVM will throw a verification or classloading related exception such as java.lang.VerifyError.
J9NLS_BCV_ERR_UNINITIALIZED_OBJECT.user_response=Contact the provider of the classfile for a corrected version.

# END NON-TRANSLATABLE
6 changes: 3 additions & 3 deletions runtime/oti/j9consts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,9 +618,9 @@ extern "C" {
#define BCV_ERR_STRICT_FIELD_STACK_MAP_INCONSISTENT (-39)
#define BCV_ERR_INVALID_USE_STRICT_INSTANCE_FIELDS (-40)
#endif /* defined(J9VM_OPT_VALHALLA_STRICT_FIELDS) */
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
#define BCV_ERR_ILLEGAL_WITH_UNINITIALIZED_VALUE_OBJECT (-41)
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#if JAVA_SPEC_VERSION >= 27
#define BCV_ERR_ILLEGAL_WITH_UNINITIALIZED_OBJECT (-41)
#endif /* JAVA_SPEC_VERSION >= 27 */

#define J9_GC_OBJ_HEAP_HOLE 0x1
#define J9_GC_MULTI_SLOT_HOLE 0x1
Expand Down
8 changes: 4 additions & 4 deletions runtime/verbose/errormessageframeworkrtv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,11 +961,11 @@ generateJ9RtvExceptionDetails(J9BytecodeVerificationData* verifyData, U_8* initM
printMessage(&msgBuf, "Invalid use of strict instance fields, field is strict static.");
break;
#endif /* defined(J9VM_OPT_VALHALLA_STRICT_FIELDS) */
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
case BCV_ERR_ILLEGAL_WITH_UNINITIALIZED_VALUE_OBJECT:
printMessage(&msgBuf, "Illegal bytecode with uninitialized value object.");
#if JAVA_SPEC_VERSION >= 27
case BCV_ERR_ILLEGAL_WITH_UNINITIALIZED_OBJECT:
printMessage(&msgBuf, "Illegal bytecode with uninitialized object.");
break;
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#endif /* JAVA_SPEC_VERSION >= 27 */
default:
Assert_VRB_ShouldNeverHappen();
break;
Expand Down