From 43a3b432b17422c53b62ad7e077c3472080d4c2a Mon Sep 17 00:00:00 2001 From: Graham Chapman Date: Thu, 11 Oct 2018 11:33:51 -0400 Subject: [PATCH] Clean up j9modifiers_api.h Remove/repair macros that were incorrect or unused (and never to be used in the future). [ci skip] Signed-off-by: Graham Chapman --- runtime/oti/j9modifiers_api.h | 46 ++--------------------------------- 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/runtime/oti/j9modifiers_api.h b/runtime/oti/j9modifiers_api.h index b3d10519cb6..71d1cf2719e 100644 --- a/runtime/oti/j9modifiers_api.h +++ b/runtime/oti/j9modifiers_api.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 IBM Corp. and others + * Copyright (c) 2009, 2018 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -39,35 +39,6 @@ #define _J9ROMCLASS_SUNMODIFIER_IS_ANY_SET(romClass,sunModifiers) \ J9_ARE_ANY_BITS_SET((romClass)->modifiers, sunModifiers) -#ifdef J9VM_OUT_OF_PROCESS -#define _REMOTE_J9ROMCLASS_J9MODIFIER_IS_SET(romClass,j9Modifiers) \ - (((dbgReadU32((U_32 *) &(romClass)->extraModifiers)) & (j9Modifiers)) == (j9Modifiers)) -#define _REMOTE_J9ROMCLASS_J9MODIFIER_IS_ANY_SET(romClass,j9Modifiers) \ - (((dbgReadU32((U_32 *) &(romClass)->extraModifiers)) & (j9Modifiers)) != 0) -#define _REMOTE_J9ROMCLASS_SUNMODIFIER_IS_SET(romClass,sunModifiers) \ - (((dbgReadU32((U_32 *) &(romClass)->modifiers)) & (sunModifiers)) == (sunModifiers)) -#define _REMOTE_J9ROMCLASS_SUNMODIFIER_IS_ANY_SET(romClass,sunModifiers) \ - (((dbgReadU32((U_32 *) &(romClass)->modifiers)) & (sunModifiers)) != 0) -#define _REMOTE_J9ROMMETHOD_J9MODIFIER_IS_SET(romMethod,j9Modifiers) \ - (((dbgReadU32((U_32 *) &(romMethod)->modifiers)) & (j9Modifiers)) == (j9Modifiers)) -#define _REMOTE_J9ROMMETHOD_J9MODIFIER_IS_ANY_SET(romMethod,j9Modifiers) \ - (((dbgReadU32((U_32 *) &(romMethod)->modifiers)) & (j9Modifiers)) != 0) -#else -#define _REMOTE_J9ROMCLASS_J9MODIFIER_IS_SET(romClass,j9Modifiers) \ - _J9ROMCLASS_J9MODIFIER_IS_SET(romClass,j9Modifiers) -#define _REMOTE_J9ROMCLASS_J9MODIFIER_IS_ANY_SET(romClass,j9Modifiers) \ - _J9ROMCLASS_J9MODIFIER_IS_ANY_SET(romClass,j9Modifiers) -#define _REMOTE_J9ROMCLASS_SUNMODIFIER_IS_SET(romClass,sunModifiers) \ - _J9ROMCLASS_SUNMODIFIER_IS_SET(romClass,sunModifiers) -#define _REMOTE_J9ROMCLASS_SUNMODIFIER_IS_ANY_SET(romClass,sunModifiers) \ - _J9ROMCLASS_SUNMODIFIER_IS_ANY_SET(romClass,sunModifiers) -#define _REMOTE_J9ROMMETHOD_J9MODIFIER_IS_SET(romMethod,j9Modifiers) \ - _J9ROMMETHOD_J9MODIFIER_IS_SET(romMethod,j9Modifiers) -#define _REMOTE_J9ROMMETHOD_J9MODIFIER_IS_ANY_SET(romMethod,j9Modifiers) \ - _J9ROMMETHOD_J9MODIFIER_IS_ANY_SET(romMethod,j9Modifiers) -#endif - - /* Macros that always operate directly a romClass copy, be it in process or out of process given a romClass * that has already been read in */ @@ -85,12 +56,8 @@ #define J9ROMCLASS_HAS_VERIFY_DATA(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassHasVerifyData) #define J9ROMCLASS_HAS_MODIFIED_BYTECODES(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassBytecodesModified) #define J9ROMCLASS_HAS_EMPTY_FINALIZE(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassHasEmptyFinalize) -#define J9ROMCLASS_HAS_JDBC_NATIVES(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassHasJDBCNatives) -#define J9ROMCLASS_IS_GC_SPECIAL(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassGCSpecial) #define J9ROMCLASS_HAS_FINAL_FIELDS(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassHasFinalFields) #define J9ROMCLASS_HAS_CLINIT(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassHasClinit) -#define J9ROMCLASS_IS_HOTSWAPPED_OUT(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassHotSwappedOut) -#define J9ROMCLASS_IS_DYING(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassDying) #define J9ROMCLASS_REFERENCE_WEAK(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassReferenceWeak) #define J9ROMCLASS_REFERENCE_SOFT(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassReferenceSoft) #define J9ROMCLASS_REFERENCE_PHANTOM(romClass) _J9ROMCLASS_J9MODIFIER_IS_SET((romClass), J9AccClassReferencePhantom) @@ -124,17 +91,8 @@ #define J9ROMMETHOD_IS_OBJECT_CONSTRUCTOR(romMethod) _J9ROMMETHOD_J9MODIFIER_IS_SET((romMethod), J9AccMethodObjectConstructor) #define J9ROMMETHOD_IS_CALLER_SENSITIVE(romMethod) _J9ROMMETHOD_J9MODIFIER_IS_SET((romMethod), J9AccMethodCallerSensitive) -#if 0 /* fix this for JEP142 */ -#define J9ROMCLASS_FIELD_IS_CONTENDED(romClassField) J9_ARE_ALL_BITS_SET(field->modifiers, J9FieldFlagIsContended) -#else -#define J9ROMCLASS_FIELD_IS_CONTENDED(romClassField) FALSE -#endif - - -/* Macros that operate on a romClass pointer that is assumed to be local and needs to have the romClass fetched from - * the remote (in the OUT OF PROCESS case). */ +#define J9ROMFIELD_IS_CONTENDED(romField) J9_ARE_ALL_BITS_SET((romField)->modifiers, J9FieldFlagIsContended) -#define REMOTE_J9ROMCLASS_IS_ARRAY(romClass) _REMOTE_J9ROMCLASS_SUNMODIFIER_IS_SET((romClass), J9AccClassArray) /* Composite Flag checks */