Skip to content

Commit

Permalink
Remove CFR_ACC_VALUE_TYPE and CFR_ACC_PRIMITIVE_VALUE_TYPE
Browse files Browse the repository at this point in the history 
Signed-off-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
  • Loading branch information
@theresa-m
theresa-m committed Jun 7, 2024
1 parent 8d1641e commit 24c6a9e
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 130 deletions.
21 changes: 9 additions & 12 deletions runtime/bcutil/ClassFileOracle.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
#include "util_api.h"
#include "j9protos.h"

#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
/* major version 63 is Java 19 */
#define VALUE_TYPES_MAJOR_VERSION 63
#endif /* J9VM_OPT_VALHALLA_VALUE_TYPES */

/* The array entries must be in same order as the enums in ClassFileOracle.hpp */
ClassFileOracle::KnownAnnotation ClassFileOracle::_knownAnnotations[] = {
#define FRAMEITERATORSKIP_SIGNATURE "Ljava/lang/invoke/MethodHandle$FrameIteratorSkip;"
Expand Down Expand Up @@ -279,7 +274,15 @@ ClassFileOracle::ClassFileOracle(BufferManager *bufferManager, J9CfrClassFile *c
return;
}
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
if (J9_ARE_ALL_BITS_SET(_classFile->accessFlags, CFR_ACC_VALUE_TYPE)
if (J9_ARE_ALL_BITS_SET(_classFile->accessFlags, CFR_ACC_IDENTITY)) {
_hasIdentityFlagSet = true;
} else if ((_classFile->majorVersion >= VALUE_TYPES_MAJOR_VERSION)
&& (PREVIEW_MINOR_VERSION == _classFile->minorVersion)
) {
_isValueType = true;
}

if (_isValueType
|| J9_ARE_NO_BITS_SET(_classFile->accessFlags, CFR_ACC_ABSTRACT | CFR_ACC_INTERFACE)
) {
/**
Expand All @@ -288,12 +291,6 @@ ClassFileOracle::ClassFileOracle(BufferManager *bufferManager, J9CfrClassFile *c
*/
_hasNonEmptyConstructor = true;
}

if (J9_ARE_ALL_BITS_SET(_classFile->accessFlags, CFR_ACC_IDENTITY)) {
_hasIdentityFlagSet = true;
} else {
_isValueType = true;
}
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */

/* analyze class file */
Expand Down
28 changes: 6 additions & 22 deletions runtime/bcutil/cfreader.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,7 @@ checkFields(J9PortLibrary* portLib, J9CfrClassFile * classfile, U_8 * segment, U
}

#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
if (J9_ARE_ALL_BITS_SET(classfile->accessFlags, CFR_ACC_VALUE_TYPE)) {
if (J9_IS_CLASSFILE_VALUETYPE(classfile)) {
if (J9_ARE_ALL_BITS_SET(classfile->accessFlags, CFR_ACC_ABSTRACT)) {
if (J9_ARE_NO_BITS_SET(value, CFR_ACC_STATIC)) {
errorCode = J9NLS_CFR_ERR_MISSING_ACC_STATIC_ON_ABSTRACT_IDENTITYLESS_CLASS_FIELD__ID;
Expand Down Expand Up @@ -1966,7 +1966,7 @@ checkMethods(J9PortLibrary* portLib, J9CfrClassFile* classfile, U_8* segment, U_
}

#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
if (J9_ARE_ALL_BITS_SET(classfile->accessFlags, CFR_ACC_VALUE_TYPE)) {
if (J9_IS_CLASSFILE_VALUETYPE(classfile)) {
if (J9_ARE_ALL_BITS_SET(value, CFR_ACC_SYNCHRONIZED)) {
if (J9_ARE_NO_BITS_SET(value, CFR_ACC_STATIC)) {
errorCode = J9NLS_CFR_ERR_NON_STATIC_SYNCHRONIZED_VALUE_TYPE_METHOD_V1__ID;
Expand Down Expand Up @@ -2624,7 +2624,7 @@ checkAttributes(J9PortLibrary* portLib, J9CfrClassFile* classfile, J9CfrAttribut
* value class... There must not be an ImplicitCreation attribute in the attributes table of any
* other ClassFile structure representing a class, interface, or module.
*/
if (J9_ARE_NO_BITS_SET(classfile->accessFlags, CFR_ACC_VALUE_TYPE)
if (!J9_IS_CLASSFILE_VALUETYPE(classfile)
|| J9_ARE_ANY_BITS_SET(classfile->accessFlags, CFR_ACC_INTERFACE | CFR_ACC_ABSTRACT | CFR_ACC_MODULE)
) {
errorCode = J9NLS_CFR_ERR_IMPLICITCREATION_ILLEGAL_CLASS_MODIFIERS__ID;
Expand Down Expand Up @@ -3140,19 +3140,10 @@ j9bcutil_readClassFileBytes(J9PortLibrary *portLib,

#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
/* Currently value type is built on JDK22, so compare with JDK22 for now. */
if ((flags & BCT_MajorClassFileVersionMask) < BCT_JavaMajorVersionShifted(22)) {
classfile->accessFlags &= ~(CFR_ACC_VALUE_TYPE | CFR_ACC_PRIMITIVE_VALUE_TYPE | CFR_ACC_IDENTITY);
if ((flags & BCT_MajorClassFileVersionMask) < BCT_JavaMajorVersionShifted(23)) {
classfile->accessFlags &= ~CFR_ACC_IDENTITY;
}
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
if (J9_ARE_ALL_BITS_SET(classfile->accessFlags, CFR_ACC_PRIMITIVE_VALUE_TYPE)) {
if (J9_ARE_NO_BITS_SET(classfile->accessFlags, CFR_ACC_VALUE_TYPE)) {
errorCode = J9NLS_CFR_ERR_VALUE_FLAG_MISSING_ON_PRIMITIVE_CLASS__ID;
offset = index - data - 2;
goto _errorFound;
}
}
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
if (J9_ARE_ALL_BITS_SET(classfile->accessFlags, CFR_ACC_VALUE_TYPE)) {
if (J9_IS_CLASSFILE_VALUETYPE(classfile)) {
if (J9_ARE_NO_BITS_SET(classfile->accessFlags, CFR_ACC_ABSTRACT | CFR_ACC_FINAL)) {
errorCode = J9NLS_CFR_ERR_FINAL_ABSTRACT_FLAG_MISSING_ON_VALUE_CLASS__ID;
offset = index - data - 2;
Expand All @@ -3164,13 +3155,6 @@ j9bcutil_readClassFileBytes(J9PortLibrary *portLib,
goto _errorFound;
}
}
if (J9_IS_CLASSFILE_PRIMITIVE_VALUETYPE(classfile)) {
if (J9_ARE_ANY_BITS_SET(classfile->accessFlags, CFR_ACC_ABSTRACT | CFR_ACC_INTERFACE)) {
errorCode = J9NLS_CFR_ERR_INCORRECT_FLAG_FOUND_ON_PRMITIVE_VALUE_CLASS__ID;
offset = index - data - 2;
goto _errorFound;
}
}
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */

/* mask access flags to remove unused access bits */
Expand Down
25 changes: 1 addition & 24 deletions runtime/bcverify/staticverify.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1917,30 +1917,7 @@ j9bcv_verifyClassStructure (J9PortLibrary * portLib, J9CfrClassFile * classfile,
}
}
if (isInit) {
BOOLEAN invalidRetType = FALSE;
if (
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
(CFR_METHOD_NAME_NEW == isInit)
#else /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
FALSE
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
) {
U_16 returnChar = getReturnTypeFromSignature(info->bytes, info->slot1, NULL);
if (J9_IS_CLASSFILE_PRIMITIVE_VALUETYPE(classfile)) {
if (!IS_QTYPE(returnChar)) {
invalidRetType = TRUE;
}
} else {
if (!IS_LTYPE(returnChar)) {
invalidRetType = TRUE;
}
}
} else {
if (info->bytes[info->slot1 - 1] != 'V') {
invalidRetType = TRUE;
}
}
if (invalidRetType) {
if (info->bytes[info->slot1 - 1] != 'V') {
Trc_STV_j9bcv_verifyClassStructure_MethodError(J9NLS_CFR_ERR_BC_METHOD_INVALID_SIG__ID, i);
buildMethodError((J9CfrError *)segment, errorType, CFR_ThrowClassFormatError, (I_32) i, 0, method, classfile->constantPool);
result = -1;
Expand Down
9 changes: 0 additions & 9 deletions runtime/bcverify/vrfyhelp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1093,15 +1093,6 @@ static void getNameAndLengthFromClassNameList (J9BytecodeVerificationData *verif
J9ROMClass * romClass = verifyData->romClass;
*name = (U_8 *) ((UDATA) offset[0] + (UDATA) romClass);
}
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
if (IS_QTYPE(*(char *)*name)
&& (';' == *(char *)(*name + (*length - 1)))
) {
/* we are dealing with signature envelope, extract the name from it */
*name += 1;
*length -= 2;
}
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
}

/* return BCV_SUCCESS if field is found
Expand Down
50 changes: 25 additions & 25 deletions runtime/cfdumper/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ static void dumpClassFile(J9CfrClassFile* classfile)
j9tty_printf( PORTLIB, "Version: %i.%i\n", classfile->majorVersion, classfile->minorVersion);
j9tty_printf( PORTLIB, "Constant Pool Size: %i\n", classfile->constantPoolCount);
j9tty_printf( PORTLIB, "Access Flags: 0x%X ( ", classfile->accessFlags);
printModifiers(PORTLIB, classfile->accessFlags, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_CLASS);
printModifiers(PORTLIB, classfile->accessFlags, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_CLASS, J9_IS_CLASSFILE_VALUETYPE(classfile));
j9tty_printf( PORTLIB, " )\n");
index = classfile->constantPool[classfile->thisClass].slot1;
j9tty_printf( PORTLIB, "ThisClass: %i -> %s\n", classfile->thisClass, classfile->constantPool[index].bytes);
Expand Down Expand Up @@ -484,7 +484,7 @@ static void dumpField(J9CfrClassFile* classfile, J9CfrField* field)
j9tty_printf( PORTLIB, " Name: %i -> %s\n", field->nameIndex, classfile->constantPool[field->nameIndex].bytes);
j9tty_printf( PORTLIB, " Signature: %i -> %s\n", field->descriptorIndex, classfile->constantPool[field->descriptorIndex].bytes);
j9tty_printf( PORTLIB, " Access Flags: 0x%X ( ", field->accessFlags);
printModifiers(PORTLIB, field->accessFlags, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_FIELD);
printModifiers(PORTLIB, field->accessFlags, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_FIELD, FALSE);
j9tty_printf( PORTLIB, " )\n");
j9tty_printf( PORTLIB, " Attributes (%i):\n", field->attributesCount);
for(i = 0; i < field->attributesCount; i++)
Expand Down Expand Up @@ -515,11 +515,11 @@ static void dumpMethod(J9CfrClassFile* classfile, J9CfrMethod* method)
j9tty_printf( PORTLIB, " Name: %i -> %s\n", method->nameIndex, classfile->constantPool[method->nameIndex].bytes);
j9tty_printf( PORTLIB, " Signature: %i -> %s\n", method->descriptorIndex, classfile->constantPool[method->descriptorIndex].bytes);
j9tty_printf( PORTLIB, " Access Flags: 0x%X ( ", method->accessFlags);
printModifiers(PORTLIB, method->accessFlags, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_METHOD);
printModifiers(PORTLIB, method->accessFlags, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_METHOD, FALSE);
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
if (classfile->accessFlags & CFR_ACC_VALUE_TYPE) {
if (J9_IS_CLASSFILE_VALUETYPE(classfile)) {
J9CfrConstantPoolInfo name = classfile->constantPool[method->nameIndex];
if (J9UTF8_LITERAL_EQUALS(name.bytes, name.slot1, "<vnew>")) {
if (J9UTF8_LITERAL_EQUALS(name.bytes, name.slot1, "<init>")) {
for (i = 0; i < classfile->attributesCount; i++) {
J9CfrAttribute* attr = classfile->attributes[i];
if (attr->tag == CFR_ATTRIBUTE_ImplicitCreation) {
Expand Down Expand Up @@ -675,7 +675,7 @@ static void dumpAttribute(J9CfrClassFile* classfile, J9CfrAttribute* attrib, U_3

for(j = 0; j < tabLevel + 2; j++) j9tty_printf( PORTLIB, " ");
j9tty_printf( PORTLIB, "Inner Class Access Flags: 0x%X ( ", classes->classes[i].innerClassAccessFlags);
printModifiers(PORTLIB, classes->classes[i].innerClassAccessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_CLASS);
printModifiers(PORTLIB, classes->classes[i].innerClassAccessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_CLASS, J9_IS_CLASSFILE_VALUETYPE(classfile));
j9tty_printf( PORTLIB, " )\n");
}
break;
Expand Down Expand Up @@ -831,7 +831,7 @@ static void dumpAttribute(J9CfrClassFile* classfile, J9CfrAttribute* attrib, U_3
if (0 != ((J9CfrAttributeMethodParameters *)attrib)->flags[i]) {
for(j = 0; j < maxLength - ((U_32)strlen((const char*)bytes)) + ((U_32)strlen("Name")); j++) j9tty_printf( PORTLIB, " ");
j9tty_printf( PORTLIB, "0x%x ( ", ((J9CfrAttributeMethodParameters *)attrib)->flags[i]);
printModifiers(PORTLIB, ((J9CfrAttributeMethodParameters *)attrib)->flags[i], ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_METHODPARAMETER);
printModifiers(PORTLIB, ((J9CfrAttributeMethodParameters *)attrib)->flags[i], ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_METHODPARAMETER, FALSE);
j9tty_printf( PORTLIB, " )\n");
} else {
j9tty_printf( PORTLIB, "\n");
Expand Down Expand Up @@ -985,7 +985,7 @@ static void printClassFile(J9CfrClassFile* classfile)
/* JEP 360: note: non-sealed will not be indicated for subclasses. There's no way of knowing until classes are linked. */
if(classfile->j9Flags & CFR_J9FLAG_IS_SEALED) j9tty_printf( PORTLIB, "sealed ");
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
if (classfile->accessFlags & CFR_ACC_VALUE_TYPE) j9tty_printf( PORTLIB, "value ");
if (J9_IS_CLASSFILE_VALUETYPE(classfile)) j9tty_printf( PORTLIB, "value ");
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
if(classfile->accessFlags & CFR_ACC_INTERFACE)
j9tty_printf( PORTLIB, "interface ");
Expand Down Expand Up @@ -1113,9 +1113,9 @@ static void printMethod(J9CfrClassFile* classfile, J9CfrMethod* method)
if(method->accessFlags & CFR_ACC_STRICT) j9tty_printf( PORTLIB, "strict ");
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
/* ImplicitCreation is triggered by an implicit constructor in a value class */
if (classfile->accessFlags & CFR_ACC_VALUE_TYPE) {
if (J9_IS_CLASSFILE_VALUETYPE(classfile)) {
J9CfrConstantPoolInfo name = classfile->constantPool[method->nameIndex];
if (J9UTF8_LITERAL_EQUALS(name.bytes, name.slot1, "<vnew>")) {
if (J9UTF8_LITERAL_EQUALS(name.bytes, name.slot1, "<init>")) {
for (i = 0; i < classfile->attributesCount; i++) {
J9CfrAttribute* attr = classfile->attributes[i];
if (attr->tag == CFR_ATTRIBUTE_ImplicitCreation) {
Expand Down Expand Up @@ -4342,26 +4342,26 @@ static void sun_formatClass(J9CfrClassFile* classfile, char *formatString, IDATA
{
case 'd':
j9tty_printf(PORTLIB, "%i ( ", classfile->accessFlags);
printModifiers(PORTLIB, classfile->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_CLASS);
printModifiers(PORTLIB, classfile->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_CLASS, J9_IS_CLASSFILE_VALUETYPE(classfile));
j9tty_printf( PORTLIB, " )");
break;

case 'x':
j9tty_printf(PORTLIB, "%08x ( ", classfile->accessFlags);
printModifiers(PORTLIB, classfile->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_CLASS);
printModifiers(PORTLIB, classfile->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_CLASS, J9_IS_CLASSFILE_VALUETYPE(classfile));
j9tty_printf( PORTLIB, " )");
break;

case 'X':
j9tty_printf(PORTLIB, "%08X ( ", classfile->accessFlags);
printModifiers(PORTLIB, classfile->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_CLASS);
printModifiers(PORTLIB, classfile->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_CLASS, J9_IS_CLASSFILE_VALUETYPE(classfile));
j9tty_printf( PORTLIB, " )");
break;

case '\0':
case 'a':
default:
printModifiers(PORTLIB, classfile->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_CLASS);
printModifiers(PORTLIB, classfile->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_CLASS, J9_IS_CLASSFILE_VALUETYPE(classfile));
break;
}
modifier = '\0';
Expand Down Expand Up @@ -4590,26 +4590,26 @@ static void sun_formatField(J9CfrClassFile* classfile, J9CfrField* field, char *
{
case 'd':
j9tty_printf(PORTLIB, "%i ( ", field->accessFlags);
printModifiers(PORTLIB, field->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_FIELD);
printModifiers(PORTLIB, field->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_FIELD, FALSE);
j9tty_printf( PORTLIB, " )");
break;

case 'x':
j9tty_printf(PORTLIB, "%08x ( ", field->accessFlags);
printModifiers(PORTLIB, field->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_FIELD);
printModifiers(PORTLIB, field->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_FIELD, FALSE);
j9tty_printf( PORTLIB, " )");
break;

case 'X':
j9tty_printf(PORTLIB, "%08X ( ", field->accessFlags);
printModifiers(PORTLIB, field->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_FIELD);
printModifiers(PORTLIB, field->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_FIELD, FALSE);
j9tty_printf( PORTLIB, " )");
break;

case '\0':
case 'a':
default:
printModifiers(PORTLIB, field->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_FIELD);
printModifiers(PORTLIB, field->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_FIELD, FALSE);
break;
}
modifier = '\0';
Expand Down Expand Up @@ -4895,26 +4895,26 @@ static void sun_formatMethod(J9CfrClassFile* classfile, J9CfrMethod* method, cha
{
case 'd':
j9tty_printf(PORTLIB, "%i ( ", method->accessFlags);
printModifiers(PORTLIB, method->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_METHOD);
printModifiers(PORTLIB, method->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_METHOD, FALSE);
j9tty_printf( PORTLIB, " )");
break;

case 'x':
j9tty_printf(PORTLIB, "%08x ( ", method->accessFlags);
printModifiers(PORTLIB, method->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_METHOD);
printModifiers(PORTLIB, method->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_METHOD, FALSE);
j9tty_printf( PORTLIB, " )");
break;

case 'X':
j9tty_printf(PORTLIB, "%08X ( ", method->accessFlags);
printModifiers(PORTLIB, method->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_METHOD);
printModifiers(PORTLIB, method->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_METHOD, FALSE);
j9tty_printf( PORTLIB, " )");
break;

case '\0':
case 'a':
default:
printModifiers(PORTLIB, method->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_METHOD);
printModifiers(PORTLIB, method->accessFlags, ONLY_SPEC_MODIFIERS, MODIFIERSOURCE_METHOD, FALSE);
break;
}
modifier = '\0';
Expand Down Expand Up @@ -5099,7 +5099,7 @@ static void j9_formatClass(J9ROMClass* romClass, char *formatString, IDATA lengt
case '\0':
case 'a':
default:
printModifiers(PORTLIB, romClass->modifiers, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_CLASS);
printModifiers(PORTLIB, romClass->modifiers, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_CLASS, J9ROMCLASS_IS_VALUE(romClass));
break;
}
modifier = '\0';
Expand Down Expand Up @@ -5400,7 +5400,7 @@ static void j9_formatField(J9ROMClass* romClass, J9ROMFieldShape* field, char *f
case '\0':
case 'a':
default:
printModifiers(PORTLIB, field->modifiers, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_FIELD);
printModifiers(PORTLIB, field->modifiers, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_FIELD, FALSE);
break;
}
modifier = '\0';
Expand Down Expand Up @@ -5715,7 +5715,7 @@ static void j9_formatMethod(J9ROMClass* romClass, J9ROMMethod* method, char *for
case '\0':
case 'a':
default:
printModifiers(PORTLIB, method->modifiers, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_METHOD);
printModifiers(PORTLIB, method->modifiers, INCLUDE_INTERNAL_MODIFIERS, MODIFIERSOURCE_METHOD, FALSE);
break;
}
modifier = '\0';
Expand Down
Loading

0 comments on commit 24c6a9e

Please sign in to comment.