Skip to content

Commit 8605ec8

Browse files
committed
Update IS_VALUE macros to exclude interfaces
Signed-off-by: Theresa Mammarella <[email protected]>
1 parent ff0c2a0 commit 8605ec8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

runtime/oti/cfr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ typedef struct J9CfrClassFile {
921921
#define CFR_MINOR_VERSION 3
922922
#define CFR_PUBLIC_PRIVATE_PROTECTED_MASK (CFR_ACC_PUBLIC | CFR_ACC_PRIVATE | CFR_ACC_PROTECTED)
923923

924-
#define J9_IS_CLASSFILE_VALUETYPE(classfile) (((classfile)->majorVersion >= VALUE_TYPES_MAJOR_VERSION) && (PREVIEW_MINOR_VERSION == (classfile)->minorVersion) && J9_ARE_NO_BITS_SET((classfile)->accessFlags, CFR_ACC_IDENTITY))
924+
#define J9_IS_CLASSFILE_VALUETYPE(classfile) (((classfile)->majorVersion >= VALUE_TYPES_MAJOR_VERSION) && (PREVIEW_MINOR_VERSION == (classfile)->minorVersion) && J9_ARE_NO_BITS_SET((classfile)->accessFlags, CFR_ACC_IDENTITY | CFR_ACC_INTERFACE))
925925

926926
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
927927
#define CFR_CLASS_ACCESS_MASK (CFR_ACC_PUBLIC | CFR_ACC_FINAL | CFR_ACC_IDENTITY | CFR_ACC_INTERFACE | CFR_ACC_ABSTRACT | CFR_ACC_SYNTHETIC | CFR_ACC_ANNOTATION | CFR_ACC_ENUM)

runtime/oti/j9modifiers_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
#define J9ROMCLASS_IS_CONTENDED(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassIsContended)
8585

8686
#ifdef J9VM_OPT_VALHALLA_VALUE_TYPES
87-
#define J9ROMCLASS_IS_VALUE(romClass) (((romClass)->majorVersion >= VALUE_TYPES_MAJOR_VERSION) && (PREVIEW_MINOR_VERSION == (romClass)->minorVersion) && !_J9ROMCLASS_SUNMODIFIER_IS_SET((romClass), J9AccClassHasIdentity))
87+
#define J9ROMCLASS_IS_VALUE(romClass) (((romClass)->majorVersion >= VALUE_TYPES_MAJOR_VERSION) && (PREVIEW_MINOR_VERSION == (romClass)->minorVersion) && !_J9ROMCLASS_SUNMODIFIER_IS_ANY_SET((romClass), J9AccClassHasIdentity | J9AccInterface))
8888
#else /* J9VM_OPT_VALHALLA_VALUE_TYPES */
8989
#define J9ROMCLASS_IS_VALUE(romClass) FALSE
9090
#endif /* J9VM_OPT_VALHALLA_VALUE_TYPES */

0 commit comments

Comments
 (0)