Skip to content
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

Remove J9ROMCLASS_IS_PRIMITIVE_VALUE_TYPE and J9AccPrimitiveValueType #19817

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Remove J9ROMCLASS_IS_PRIMITIVE_VALUE_TYPE and J9AccPrimitiveValueType #19817

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
1 change: 0 additions & 1 deletion runtime/oti/j9javaaccessflags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
#define J9AccInterface 0x00000200 /* class */
#define J9AccGetterMethod 0x00000200 /* method */
#define J9AccAbstract 0x00000400 /* class method */
#define J9AccPrimitiveValueType 0x00000800 /* class(Valhalla) */
#define J9AccStrict 0x00000800 /* method */
#define J9AccSynthetic 0x00001000 /* class method field */
#define J9AccAnnotation 0x00002000 /* class */
Expand Down
6 changes: 0 additions & 6 deletions runtime/oti/j9modifiers_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,6 @@
#define J9ROMCLASS_IS_VALUE(romClass) FALSE
#endif /* J9VM_OPT_VALHALLA_VALUE_TYPES */

#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
#define J9ROMCLASS_IS_PRIMITIVE_VALUE_TYPE(romClass) _J9ROMCLASS_SUNMODIFIER_IS_SET((romClass), J9AccPrimitiveValueType)
#else /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
#define J9ROMCLASS_IS_PRIMITIVE_VALUE_TYPE(romClass) FALSE
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */

#define J9ROMMETHOD_IS_GETTER(romMethod) _J9ROMMETHOD_J9MODIFIER_IS_SET((romMethod), J9AccGetterMethod)
#define J9ROMMETHOD_IS_FORWARDER(romMethod) _J9ROMMETHOD_J9MODIFIER_IS_SET((romMethod), J9AccForwarderMethod)
#define J9ROMMETHOD_IS_EMPTY(romMethod) _J9ROMMETHOD_J9MODIFIER_IS_SET((romMethod), J9AccEmptyMethod)
Expand Down
7 changes: 1 addition & 6 deletions runtime/vm/createramclass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2310,13 +2310,8 @@ internalCreateRAMClassDone(J9VMThread *vmThread, J9ClassLoader *classLoader, J9C
}
}
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
if (J9ROMCLASS_IS_PRIMITIVE_VALUE_TYPE(romClass)
|| J9_ARE_ALL_BITS_SET(classFlags, J9ClassAllowsInitialDefaultValue)
) {
if (J9_ARE_ALL_BITS_SET(classFlags, J9ClassAllowsInitialDefaultValue)) {
UDATA instanceSize = state->ramClass->totalInstanceSize;
if (J9ROMCLASS_IS_PRIMITIVE_VALUE_TYPE(romClass)) {
classFlags |= J9ClassIsPrimitiveValueType;
}
if ((instanceSize <= javaVM->valueFlatteningThreshold)
&& !J9ROMCLASS_IS_CONTENDED(romClass)
) {
Expand Down