From 9200a6915cc847089c9ae8ffedd67aca17b04733 Mon Sep 17 00:00:00 2001 From: Theresa Mammarella Date: Thu, 4 Jul 2024 16:59:37 -0400 Subject: [PATCH] Remove some value type primitive uses - remove J9ROMCLASS_IS_PRIMITIVE_VALUE_TYPE - remove J9AccPrimitiveValueType - remove J9ClassIsPrimitiveValueType from ddr Signed-off-by: Theresa Mammarella --- .../com/ibm/j9ddr/CompatibilityConstants29.dat | 1 - .../vm29/pointer/helper/ValueTypeHelper.java | 16 ---------------- runtime/oti/j9javaaccessflags.h | 1 - runtime/oti/j9modifiers_api.h | 6 ------ runtime/vm/createramclass.cpp | 7 +------ 5 files changed, 1 insertion(+), 30 deletions(-) diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/CompatibilityConstants29.dat b/debugtools/DDR_VM/src/com/ibm/j9ddr/CompatibilityConstants29.dat index 88a7c47a65a..1a49c2c27d5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/CompatibilityConstants29.dat +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/CompatibilityConstants29.dat @@ -77,7 +77,6 @@ J9JavaAccessFlags.J9StaticFieldRefTypeObject = 0 J9JavaAccessFlags.J9StaticFieldRefTypeShort = 0 J9JavaClassFlags.J9ClassIsFlattened = 0 -J9JavaClassFlags.J9ClassIsPrimitiveValueType = 0 J9JavaClassFlags.J9ClassIsValueType = 0 J9JavaClassFlags.J9ClassLargestAlignmentConstraintDouble = 0 J9JavaClassFlags.J9ClassLargestAlignmentConstraintReference = 0 diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ValueTypeHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ValueTypeHelper.java index 4f2b45f9d33..8bb474e6096 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ValueTypeHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ValueTypeHelper.java @@ -230,11 +230,6 @@ public boolean isJ9ClassAValueType(J9ClassPointer clazz) throws CorruptDataExcep return clazz.classFlags().allBitsIn(J9JavaClassFlags.J9ClassIsValueType); } - @Override - public boolean isJ9ClassAPrimitiveValueType(J9ClassPointer clazz) throws CorruptDataException { - return clazz.classFlags().allBitsIn(J9JavaClassFlags.J9ClassIsPrimitiveValueType); - } - @Override public boolean isFieldInClassFlattened(J9ClassPointer clazz, J9ROMFieldShapePointer fieldShape) throws CorruptDataException { boolean result = false; @@ -403,17 +398,6 @@ public boolean isJ9ClassAValueType(J9ClassPointer clazz) throws CorruptDataExcep return false; } - /** - * Queries if J9Class is a primitive value type - * - * @param clazz clazz to query - * @return true if class is a primitive value type, false otherwise - * @throws CorruptDataException - */ - public boolean isJ9ClassAPrimitiveValueType(J9ClassPointer clazz) throws CorruptDataException { - return false; - } - /** * Queries whether field is flattened of not. * diff --git a/runtime/oti/j9javaaccessflags.h b/runtime/oti/j9javaaccessflags.h index f4b8655d0ed..a27ffcd5695 100644 --- a/runtime/oti/j9javaaccessflags.h +++ b/runtime/oti/j9javaaccessflags.h @@ -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 */ diff --git a/runtime/oti/j9modifiers_api.h b/runtime/oti/j9modifiers_api.h index a73d74cb1fa..47ec057e465 100644 --- a/runtime/oti/j9modifiers_api.h +++ b/runtime/oti/j9modifiers_api.h @@ -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) diff --git a/runtime/vm/createramclass.cpp b/runtime/vm/createramclass.cpp index 5abdfcf4e42..b3c7f38ddee 100644 --- a/runtime/vm/createramclass.cpp +++ b/runtime/vm/createramclass.cpp @@ -2312,13 +2312,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) ) {