From f3c53bad8b7be20d75bf20f0bf019f726d5893c7 Mon Sep 17 00:00:00 2001 From: Theresa Mammarella Date: Wed, 11 Sep 2024 15:18:04 -0400 Subject: [PATCH 1/2] Rename IS_REF_OR_VAL_SIGNATURE to IS_CLASS_SIGNATURE Signed-off-by: Theresa Mammarella --- .../com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java | 2 +- runtime/bcutil/ClassFileOracle.cpp | 6 +++--- runtime/bcutil/ClassFileWriter.cpp | 2 +- runtime/bcutil/ROMClassWriter.cpp | 2 +- runtime/bcutil/jsrinliner.c | 4 ++-- runtime/bcverify/rtverify.c | 4 ++-- runtime/bcverify/staticverify.c | 2 +- runtime/bcverify/vrfyhelp.c | 6 +++--- runtime/gc_check/CheckEngine.cpp | 4 ++-- runtime/jcl/common/java_dyn_methodhandle.c | 6 +++--- runtime/jcl/common/java_lang_invoke_MethodHandleNatives.cpp | 2 +- runtime/jcl/common/java_lang_invoke_VarHandle.c | 2 +- runtime/jcl/common/reflecthelp.c | 4 ++-- runtime/jnichk/jnicheck.c | 2 +- runtime/jvmti/jvmtiHelpers.cpp | 2 +- runtime/oti/j9.h | 2 +- runtime/rastrace/method_trace.c | 2 +- runtime/stackmap/debuglocalmap.c | 2 +- runtime/util/argbits.c | 4 ++-- runtime/util/hshelp.c | 2 +- runtime/verbose/errormessagehelper.c | 2 +- runtime/verutil/sigverify.c | 2 +- runtime/vm/classsupport.c | 2 +- runtime/vm/extendedMessageNPE.cpp | 2 +- runtime/vm/jnicsup.cpp | 2 +- runtime/vm/resolvesupport.cpp | 2 +- 26 files changed, 37 insertions(+), 37 deletions(-) diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java index 33b7fb7f9b4..055850bb0a2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java @@ -528,7 +528,7 @@ public static boolean isAnonymousClass(J9ClassPointer clazz) throws CorruptDataE /** * Queries if a given char is the first character of a reference or value type signature. - * Equivalent to J9's IS_REF_OR_VAL_SIGNATURE macro. + * Equivalent to J9's IS_CLASS_SIGNATURE macro. * * @param firstChar the first character of the signature being checked * @return true if the character indicates the beginning of a reference or value signature, false otherwise diff --git a/runtime/bcutil/ClassFileOracle.cpp b/runtime/bcutil/ClassFileOracle.cpp index 194cfd4c023..e2ba7de9dd1 100644 --- a/runtime/bcutil/ClassFileOracle.cpp +++ b/runtime/bcutil/ClassFileOracle.cpp @@ -377,7 +377,7 @@ ClassFileOracle::walkFields() markStringAsReferenced(constantValueIndex); } } - if ((IS_REF_OR_VAL_SIGNATURE(fieldChar)) + if ((IS_CLASS_SIGNATURE(fieldChar)) || ('[' == fieldChar) ) { _objectStaticCount++; @@ -427,7 +427,7 @@ ClassFileOracle::walkFields() } #if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) if (containsKnownAnnotation(foundAnnotations, NULLRESTRICTED_ANNOTATION)) { - if (!IS_REF_OR_VAL_SIGNATURE(fieldChar)) { + if (!IS_CLASS_SIGNATURE(fieldChar)) { if ('[' == fieldChar) { throwGenericErrorWithCustomMsg(J9NLS_CFR_NO_NULLRESTRICTED_IN_ARRAYFIELD__ID, fieldIndex); } else { /* primitive type */ @@ -458,7 +458,7 @@ ClassFileOracle::walkFields() case CFR_ATTRIBUTE_NullRestricted: /* JVMS: There must not be a NullRestricted attribute in the attributes table of a field_info * structure whose descriptor_index references a primitive type or an array type.*/ - if (!IS_REF_OR_VAL_SIGNATURE(fieldChar)) { + if (!IS_CLASS_SIGNATURE(fieldChar)) { if ('[' == fieldChar) { throwGenericErrorWithCustomMsg(J9NLS_CFR_NO_NULLRESTRICTED_IN_ARRAYFIELD__ID, fieldIndex); } else { /* primitive type */ diff --git a/runtime/bcutil/ClassFileWriter.cpp b/runtime/bcutil/ClassFileWriter.cpp index 71109ef40fa..0d360eaef82 100644 --- a/runtime/bcutil/ClassFileWriter.cpp +++ b/runtime/bcutil/ClassFileWriter.cpp @@ -1338,7 +1338,7 @@ ClassFileWriter::computeArgsCount(U_16 methodRefIndex) while ((index < count) && ('[' == sig[index])) { index += 1; } - if (!IS_REF_OR_VAL_SIGNATURE(sig[index])) { + if (!IS_CLASS_SIGNATURE(sig[index])) { break; } /* fall through */ diff --git a/runtime/bcutil/ROMClassWriter.cpp b/runtime/bcutil/ROMClassWriter.cpp index f7155fd4702..0c8bd6d346e 100644 --- a/runtime/bcutil/ROMClassWriter.cpp +++ b/runtime/bcutil/ROMClassWriter.cpp @@ -2221,7 +2221,7 @@ ROMClassWriter::writeNativeSignature(Cursor *cursor, U_8 *methodDescriptor, U_8 } else { cursor->writeU8(nativeArgCharConversion[methodDescriptor[index] - 'A'], Cursor::GENERIC); } - if (IS_REF_OR_VAL_SIGNATURE(methodDescriptor[index])) { + if (IS_CLASS_SIGNATURE(methodDescriptor[index])) { while (';' != methodDescriptor[index]) { ++index; } diff --git a/runtime/bcutil/jsrinliner.c b/runtime/bcutil/jsrinliner.c index 4bd2cb8c0c0..bc89f811899 100644 --- a/runtime/bcutil/jsrinliner.c +++ b/runtime/bcutil/jsrinliner.c @@ -1159,11 +1159,11 @@ evaluateCodeBlock (I_32 hasRET, J9JSRICodeBlock ** blockParentPointer, U_32 star stackError |= popStack (jsrData); if (args[step] == '[') { while (args[++step] == '['); - if (!IS_REF_OR_VAL_SIGNATURE(args[step])) { + if (!IS_CLASS_SIGNATURE(args[step])) { continue; } } - if (IS_REF_OR_VAL_SIGNATURE(args[step])) { + if (IS_CLASS_SIGNATURE(args[step])) { while (args[++step] != ';'); continue; } diff --git a/runtime/bcverify/rtverify.c b/runtime/bcverify/rtverify.c index dd40e0820ab..b398a03baea 100644 --- a/runtime/bcverify/rtverify.c +++ b/runtime/bcverify/rtverify.c @@ -2628,11 +2628,11 @@ j9rtv_verifyArguments (J9BytecodeVerificationData *verifyData, J9UTF8 * utf8stri } /* Object or array */ - if (IS_REF_OR_VAL_SIGNATURE(*signature) || arity) { + if (IS_CLASS_SIGNATURE(*signature) || arity) { IDATA reasonCode = 0; /* Object array */ - if (IS_REF_OR_VAL_SIGNATURE(*signature)) { + if (IS_CLASS_SIGNATURE(*signature)) { signature++; string = signature; /* remember the start of the string */ while (*signature++ != ';'); diff --git a/runtime/bcverify/staticverify.c b/runtime/bcverify/staticverify.c index 340a476e4b2..ce00979cc07 100644 --- a/runtime/bcverify/staticverify.c +++ b/runtime/bcverify/staticverify.c @@ -812,7 +812,7 @@ checkBytecodeStructure (J9CfrClassFile * classfile, UDATA methodIndex, UDATA len break; case CFR_BC_areturn: - if (!IS_REF_OR_VAL_SIGNATURE(sigChar) && (sigChar != '[')) { + if (!IS_CLASS_SIGNATURE(sigChar) && (sigChar != '[')) { /* fail, modify the bytecode to be incompatible in the second pass of verification */ if (sigChar != 'V') { *(bcIndex - 1) = CFR_BC_return; diff --git a/runtime/bcverify/vrfyhelp.c b/runtime/bcverify/vrfyhelp.c index 733e32c0564..1b7e8973c15 100644 --- a/runtime/bcverify/vrfyhelp.c +++ b/runtime/bcverify/vrfyhelp.c @@ -282,7 +282,7 @@ buildStackFromMethodSignature( J9BytecodeVerificationData *verifyData, UDATA **s arity++; } - if (IS_REF_OR_VAL_SIGNATURE(args[i])) { + if (IS_CLASS_SIGNATURE(args[i])) { U_8 *string; U_16 length = 0; @@ -684,7 +684,7 @@ static UDATA * pushType(J9BytecodeVerificationData *verifyData, U_8 * signature, UDATA * stackTop) { if (*signature != 'V') { - if ((*signature == '[') || IS_REF_OR_VAL_SIGNATURE(*signature)) { + if ((*signature == '[') || IS_CLASS_SIGNATURE(*signature)) { PUSH(parseObjectOrArrayName(verifyData, signature)); } else { UDATA baseType = (UDATA) argTypeCharConversion[*signature - 'A']; @@ -1197,7 +1197,7 @@ parseObjectOrArrayName(J9BytecodeVerificationData *verifyData, U_8 *signature) signature++; } arity = (UDATA) (signature - string); - if (IS_REF_OR_VAL_SIGNATURE(*signature)) { + if (IS_CLASS_SIGNATURE(*signature)) { U_16 length = 0; UDATA classIndex = 0; diff --git a/runtime/gc_check/CheckEngine.cpp b/runtime/gc_check/CheckEngine.cpp index 9c3e6263b7f..d5c6e1fecc7 100644 --- a/runtime/gc_check/CheckEngine.cpp +++ b/runtime/gc_check/CheckEngine.cpp @@ -877,7 +877,7 @@ GC_CheckEngine::checkClassStatics(J9JavaVM* vm, J9Class* clazz) J9UTF8* sigUTF = J9ROMFIELDSHAPE_SIGNATURE(romFieldCursor); /* interested in objects and all kinds of arrays */ - if ((IS_REF_OR_VAL_SIGNATURE(J9UTF8_DATA(sigUTF)[0])) + if ((IS_CLASS_SIGNATURE(J9UTF8_DATA(sigUTF)[0])) || ('[' == J9UTF8_DATA(sigUTF)[0]) ) { numberOfReferences += 1; @@ -897,7 +897,7 @@ GC_CheckEngine::checkClassStatics(J9JavaVM* vm, J9Class* clazz) U_8* toSearchString = J9UTF8_DATA(sigUTF); UDATA toSearchLength = J9UTF8_LENGTH(sigUTF); - if (IS_REF_OR_VAL_SIGNATURE(toSearchString[0])) { + if (IS_CLASS_SIGNATURE(toSearchString[0])) { /* Convert signature to class name: * Entering 'L' as well as closing ';' must be removed to get a proper class name */ diff --git a/runtime/jcl/common/java_dyn_methodhandle.c b/runtime/jcl/common/java_dyn_methodhandle.c index 13dcd3bdcfb..342d5207e14 100644 --- a/runtime/jcl/common/java_dyn_methodhandle.c +++ b/runtime/jcl/common/java_dyn_methodhandle.c @@ -345,7 +345,7 @@ accessCheckFieldSignature(J9VMThread *currentThread, J9Class* lookupClass, UDATA sigOffset += 1; } - if (IS_REF_OR_VAL_SIGNATURE(lookupSigData[sigOffset])) { + if (IS_CLASS_SIGNATURE(lookupSigData[sigOffset])) { BOOLEAN isVirtual = (0 == (((J9ROMFieldShape*)romField)->modifiers & J9AccStatic)); j9object_t argsArray = J9VMJAVALANGINVOKEMETHODTYPE_PTYPES(currentThread, methodType); U_32 numParameters = J9INDEXABLEOBJECT_SIZE(currentThread, argsArray); @@ -433,7 +433,7 @@ accessCheckMethodSignature(J9VMThread *currentThread, J9Method *method, j9object endIndex = index; /* If this entry is a class type, we need to do a classloader check on it */ - if (IS_REF_OR_VAL_SIGNATURE(lookupSigData[index])) { + if (IS_CLASS_SIGNATURE(lookupSigData[index])) { index += 1; clazz = J9JAVAARRAYOFOBJECT_LOAD(currentThread, argsArray, i); @@ -462,7 +462,7 @@ accessCheckMethodSignature(J9VMThread *currentThread, J9Method *method, j9object while ('[' == lookupSigData[index]) { index += 1; } - if(IS_REF_OR_VAL_SIGNATURE(lookupSigData[index])) { + if(IS_CLASS_SIGNATURE(lookupSigData[index])) { J9Class *returnRamClass = NULL; /* Grab the MethodType returnType */ clazz = J9VMJAVALANGINVOKEMETHODTYPE_RTYPE(currentThread, methodType); diff --git a/runtime/jcl/common/java_lang_invoke_MethodHandleNatives.cpp b/runtime/jcl/common/java_lang_invoke_MethodHandleNatives.cpp index 6f09deeb9b6..7f694aa5d3b 100644 --- a/runtime/jcl/common/java_lang_invoke_MethodHandleNatives.cpp +++ b/runtime/jcl/common/java_lang_invoke_MethodHandleNatives.cpp @@ -1281,7 +1281,7 @@ Java_java_lang_invoke_MethodHandleNatives_resolve( while ('[' == J9UTF8_DATA(signature)[sigOffset]) { sigOffset += 1; } - if (IS_REF_OR_VAL_SIGNATURE(J9UTF8_DATA(signature)[sigOffset])) { + if (IS_CLASS_SIGNATURE(J9UTF8_DATA(signature)[sigOffset])) { sigOffset += 1; omrthread_monitor_enter(vm->classTableMutex); UDATA clConstraintResult = verifyData->checkClassLoadingConstraintForNameFunction( diff --git a/runtime/jcl/common/java_lang_invoke_VarHandle.c b/runtime/jcl/common/java_lang_invoke_VarHandle.c index a867072f53a..0655b08d67b 100644 --- a/runtime/jcl/common/java_lang_invoke_VarHandle.c +++ b/runtime/jcl/common/java_lang_invoke_VarHandle.c @@ -51,7 +51,7 @@ accessCheckFieldType(J9VMThread *currentThread, J9Class* lookupClass, J9Class* t if (NULL != verifyData) { U_8 *lookupSigData = J9UTF8_DATA(lookupSig); /* Only check reference types (not primitive types) */ - if (IS_REF_OR_VAL_SIGNATURE(*lookupSigData)) { + if (IS_CLASS_SIGNATURE(*lookupSigData)) { J9ClassLoader *lookupClassloader = lookupClass->classLoader; J9ClassLoader *typeClassloader = type->classLoader; if (typeClassloader != lookupClassloader) { diff --git a/runtime/jcl/common/reflecthelp.c b/runtime/jcl/common/reflecthelp.c index ee14f40bcdf..1b4e1ae4061 100644 --- a/runtime/jcl/common/reflecthelp.c +++ b/runtime/jcl/common/reflecthelp.c @@ -247,7 +247,7 @@ computeArgCount(J9ROMMethod *method) while ((index < count) && ('[' == bytes[index])) { index += 1; } - if (!IS_REF_OR_VAL_SIGNATURE(bytes[index])) { + if (!IS_CLASS_SIGNATURE(bytes[index])) { break; } /* fall through */ @@ -537,7 +537,7 @@ getArgCountFromSignature(J9UTF8* signature) i++; } /* skip class name */ - if (IS_REF_OR_VAL_SIGNATURE(sigData[i])) { + if (IS_CLASS_SIGNATURE(sigData[i])) { while (';' != sigData[i]) { i++; } diff --git a/runtime/jnichk/jnicheck.c b/runtime/jnichk/jnicheck.c index 829110c69c0..e09ddd64593 100644 --- a/runtime/jnichk/jnicheck.c +++ b/runtime/jnichk/jnicheck.c @@ -2457,7 +2457,7 @@ jniCheckObjectArg(const char* function, JNIEnv* env, jobject aJobject, char* sig while (*sigArgs == '[') { sigArgs++; } - if (IS_REF_OR_VAL_SIGNATURE(*sigArgs)) { + if (IS_CLASS_SIGNATURE(*sigArgs)) { while (*sigArgs != ';') { sigArgs++; } diff --git a/runtime/jvmti/jvmtiHelpers.cpp b/runtime/jvmti/jvmtiHelpers.cpp index 36b7ed8dd01..7b3c1476779 100644 --- a/runtime/jvmti/jvmtiHelpers.cpp +++ b/runtime/jvmti/jvmtiHelpers.cpp @@ -671,7 +671,7 @@ skipSignature(U_8 ** pUtfData) /* Skip to the end of Object type signatures */ - if (IS_REF_OR_VAL_SIGNATURE(utfChar)) { + if (IS_CLASS_SIGNATURE(utfChar)) { do { utfChar = nextUTFChar(pUtfData); } while (utfChar != ';'); diff --git a/runtime/oti/j9.h b/runtime/oti/j9.h index 3e7e8740f6e..614e3e6625a 100644 --- a/runtime/oti/j9.h +++ b/runtime/oti/j9.h @@ -359,7 +359,7 @@ static const struct { \ #define J9_IS_J9ARRAYCLASS_NULL_RESTRICTED(clazz) FALSE #define J9CLASS_GET_NULLRESTRICTED_ARRAY(clazz) NULL #endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */ -#define IS_REF_OR_VAL_SIGNATURE(firstChar) ('L' == (firstChar)) +#define IS_CLASS_SIGNATURE(firstChar) ('L' == (firstChar)) #if defined(J9VM_OPT_CRIU_SUPPORT) #define J9_IS_CRIU_OR_CRAC_CHECKPOINT_ENABLED(vm) (J9_ARE_ANY_BITS_SET(vm->checkpointState.flags, J9VM_CRAC_IS_CHECKPOINT_ENABLED | J9VM_CRIU_IS_CHECKPOINT_ENABLED)) diff --git a/runtime/rastrace/method_trace.c b/runtime/rastrace/method_trace.c index 3d311f97e68..81b2ae446a2 100644 --- a/runtime/rastrace/method_trace.c +++ b/runtime/rastrace/method_trace.c @@ -500,7 +500,7 @@ traceMethodArguments(J9VMThread* thr, J9UTF8* signature, UDATA* arg0EA, char* bu while (*sigChar == '[') { sigChar++; } - if (IS_REF_OR_VAL_SIGNATURE(*sigChar)) { + if (IS_CLASS_SIGNATURE(*sigChar)) { while (*sigChar != ';') { sigChar++; } diff --git a/runtime/stackmap/debuglocalmap.c b/runtime/stackmap/debuglocalmap.c index 78baafd2c32..862a55c632e 100644 --- a/runtime/stackmap/debuglocalmap.c +++ b/runtime/stackmap/debuglocalmap.c @@ -662,7 +662,7 @@ validateLocalSlot(J9VMThread *currentThread, J9Method *ramMethod, U_32 offsetPC, break; } } else { - if ((slotSignature == '[') || IS_REF_OR_VAL_SIGNATURE(slotSignature)) { + if ((slotSignature == '[') || IS_CLASS_SIGNATURE(slotSignature)) { if ((localMap[slot / 32] & (1 << (slot % 32))) == 0) { rc = J9_SLOT_VALIDATE_ERROR_LOCAL_MAP_MISMATCH; } diff --git a/runtime/util/argbits.c b/runtime/util/argbits.c index 4a27ea5380c..6da43a77406 100644 --- a/runtime/util/argbits.c +++ b/runtime/util/argbits.c @@ -40,12 +40,12 @@ argBitsFromSignature(U_8 * signature, U_32 * resultArrayBase, UDATA resultArrayS /* Parse the signature inside the ()'s */ while (*(++signature) != ')') { - if ((*signature == '[') || IS_REF_OR_VAL_SIGNATURE(*signature)) { + if ((*signature == '[') || IS_CLASS_SIGNATURE(*signature)) { *resultArrayBase |= argBit; while (*signature == '[') { signature++; } - if (IS_REF_OR_VAL_SIGNATURE(*signature)) { + if (IS_CLASS_SIGNATURE(*signature)) { while (*signature != ';') { signature++; } diff --git a/runtime/util/hshelp.c b/runtime/util/hshelp.c index f1cfe70cdbc..3a71c085cb8 100644 --- a/runtime/util/hshelp.c +++ b/runtime/util/hshelp.c @@ -518,7 +518,7 @@ iterateToNextArgument(U_32 sigIndex, U_32 sigLength, U_8* sigData) if (sigIndex >= sigLength) return sigIndex; /* check for object */ - if (IS_REF_OR_VAL_SIGNATURE(sigData[sigIndex])) { + if (IS_CLASS_SIGNATURE(sigData[sigIndex])) { while ((sigIndex < sigLength) && (';' != sigData[sigIndex])) { sigIndex += 1; } diff --git a/runtime/verbose/errormessagehelper.c b/runtime/verbose/errormessagehelper.c index d7794b57d3b..1623bb9ca50 100644 --- a/runtime/verbose/errormessagehelper.c +++ b/runtime/verbose/errormessagehelper.c @@ -882,7 +882,7 @@ mapDataTypeToUTF8String(J9UTF8Ref* dataType, StackMapFrame* stackMapFrame, Metho dataType->bytes = methodInfo->signature.bytes + typeValue; dataType->length = typeLength; /* Ignore 'L' and ';' to get the full string of argument in signature */ - if (IS_REF_OR_VAL_SIGNATURE(*dataType->bytes)) { + if (IS_CLASS_SIGNATURE(*dataType->bytes)) { dataType->bytes += 1; dataType->length -= 2; } diff --git a/runtime/verutil/sigverify.c b/runtime/verutil/sigverify.c index 820bca41260..d45971561da 100644 --- a/runtime/verutil/sigverify.c +++ b/runtime/verutil/sigverify.c @@ -195,7 +195,7 @@ checkSignatureInlined (U_8* signatureBytes, UDATA signatureLength, UDATA *curren } } - if (IS_REF_OR_VAL_SIGNATURE(*cursor)) { + if (IS_CLASS_SIGNATURE(*cursor)) { IDATA bytesConsumed = 0; cursor += 1; /* skip the 'L' */ diff --git a/runtime/vm/classsupport.c b/runtime/vm/classsupport.c index 9ae37bf1980..750d6c998be 100644 --- a/runtime/vm/classsupport.c +++ b/runtime/vm/classsupport.c @@ -108,7 +108,7 @@ internalFindArrayClass(J9VMThread* vmThread, J9Module *j9module, UDATA arity, U_ /* the first level of arity is already present in the array class */ arity -= 1; - } else if (IS_REF_OR_VAL_SIGNATURE(firstChar) && lastChar == ';') { + } else if (IS_CLASS_SIGNATURE(firstChar) && lastChar == ';') { name += arity + 1; /* 1 for 'L' */ length -= arity + 2; /* 2 for 'L and ';' */ diff --git a/runtime/vm/extendedMessageNPE.cpp b/runtime/vm/extendedMessageNPE.cpp index 416557d1484..21fd4a21fd1 100644 --- a/runtime/vm/extendedMessageNPE.cpp +++ b/runtime/vm/extendedMessageNPE.cpp @@ -258,7 +258,7 @@ convertMethodSignature(J9VMThread *vmThread, J9UTF8 *methodSig) i += 1; } const char *elementType = NULL; - if (IS_REF_OR_VAL_SIGNATURE(string[i])) { + if (IS_CLASS_SIGNATURE(string[i])) { i += 1; UDATA objSize = 0; diff --git a/runtime/vm/jnicsup.cpp b/runtime/vm/jnicsup.cpp index c147d178ce0..34fe4895eef 100644 --- a/runtime/vm/jnicsup.cpp +++ b/runtime/vm/jnicsup.cpp @@ -589,7 +589,7 @@ UDATA JNICALL pushArguments(J9VMThread *vmThread, J9Method* method, void *args) break; case ')': vmThread->sp = sp; - return (IS_REF_OR_VAL_SIGNATURE(*sigChar) || *sigChar == '[') ? J9_SSF_RETURNS_OBJECT : 0; + return (IS_CLASS_SIGNATURE(*sigChar) || *sigChar == '[') ? J9_SSF_RETURNS_OBJECT : 0; } } } diff --git a/runtime/vm/resolvesupport.cpp b/runtime/vm/resolvesupport.cpp index 922ae3e9575..4addc749382 100644 --- a/runtime/vm/resolvesupport.cpp +++ b/runtime/vm/resolvesupport.cpp @@ -250,7 +250,7 @@ findFieldSignatureClass(J9VMThread *vmStruct, J9ConstantPool *ramCP, UDATA field if ('[' == J9UTF8_DATA(signature)[0]) { resolvedClass = internalFindClassUTF8(vmStruct, J9UTF8_DATA(signature), J9UTF8_LENGTH(signature), classLoader, J9_FINDCLASS_FLAG_THROW_ON_FAIL); } else { - Assert_VM_true(IS_REF_OR_VAL_SIGNATURE(J9UTF8_DATA(signature)[0])); + Assert_VM_true(IS_CLASS_SIGNATURE(J9UTF8_DATA(signature)[0])); /* skip fieldSignature's L and ; to have only CLASSNAME required for internalFindClassUTF8 */ resolvedClass = internalFindClassUTF8(vmStruct, &J9UTF8_DATA(signature)[1], J9UTF8_LENGTH(signature)-2, classLoader, J9_FINDCLASS_FLAG_THROW_ON_FAIL); } From c5d78f923d61314829ad280026cc183a100131d1 Mon Sep 17 00:00:00 2001 From: Theresa Mammarella Date: Wed, 11 Sep 2024 15:18:35 -0400 Subject: [PATCH 2/2] Rename isRefOrValSignature to isClassSignature Signed-off-by: Theresa Mammarella --- debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ArgBits.java | 4 ++-- debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SendSlot.java | 2 +- .../src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java | 8 ++++---- .../com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java | 2 +- .../j9ddr/vm29/pointer/helper/J9ClassLoaderHelper.java | 2 +- .../com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClass.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ArgBits.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ArgBits.java index 142aae67c8e..7018afbd5d1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ArgBits.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ArgBits.java @@ -50,7 +50,7 @@ public class ArgBits /* Parse the signature inside the ()'s */ char thisChar; while ((thisChar = signature.charAt(++stringPtr)) != ')') { - if ((thisChar == '[') || J9ClassHelper.isRefOrValSignature(thisChar)) { + if ((thisChar == '[') || J9ClassHelper.isClassSignature(thisChar)) { /* Mark a bit for objects or arrays */ resultArray[writePtr] |= argBit; @@ -59,7 +59,7 @@ public class ArgBits stringPtr++; } - if (J9ClassHelper.isRefOrValSignature(thisChar)) { + if (J9ClassHelper.isClassSignature(thisChar)) { /* Walk past the name of the object class */ while ((thisChar = signature.charAt(stringPtr)) != ';') { stringPtr++; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SendSlot.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SendSlot.java index 892d6bc0d31..8a9ae45561b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SendSlot.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SendSlot.java @@ -48,7 +48,7 @@ public static UDATA getSendSlotsFromSignature(J9UTF8Pointer signature) throws Co /* skip all '['s */ for (i++; J9UTF8Helper.stringValue(signature).charAt(i) == '['; i++); char charAti = J9UTF8Helper.stringValue(signature).charAt(i); - if (J9ClassHelper.isRefOrValSignature(charAti)) { + if (J9ClassHelper.isClassSignature(charAti)) { /* FALL THRU */ } else { sendArgs = sendArgs.add(1); diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java index 661937c15ce..481e2a54fc3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java @@ -502,7 +502,7 @@ private int mapStack(U16 totalStack, byte[] map, utf8Signature = J9ROMFieldRefPointer.cast(pool.add(index)).nameAndSignature().signature(); signature = J9UTF8Helper.stringValue(utf8Signature).charAt(0); - if (J9ClassHelper.isRefOrValSignature(signature) || (signature == '[')) { + if (J9ClassHelper.isClassSignature(signature) || (signature == '[')) { PUSH(OBJ); } else { PUSH(INT); @@ -515,7 +515,7 @@ private int mapStack(U16 totalStack, byte[] map, utf8Signature = J9ROMFieldRefPointer.cast(pool.add(index)).nameAndSignature().signature(); signature = J9UTF8Helper.stringValue(utf8Signature).charAt(0); - if (J9ClassHelper.isRefOrValSignature(signature) || (signature == '[')) { + if (J9ClassHelper.isClassSignature(signature) || (signature == '[')) { PUSH(OBJ); } else { PUSH(INT); @@ -574,7 +574,7 @@ private int mapStack(U16 totalStack, byte[] map, while (args[i] == '[') { i += 1; } - if (J9ClassHelper.isRefOrValSignature(args[i])) { + if (J9ClassHelper.isClassSignature(args[i])) { do { i += 1; } while (args[i] != ';'); @@ -583,7 +583,7 @@ private int mapStack(U16 totalStack, byte[] map, signature = args[i + 1]; if (signature != 'V') { - if (J9ClassHelper.isRefOrValSignature(signature) || (signature == '[')) { + if (J9ClassHelper.isClassSignature(signature) || (signature == '[')) { PUSH(OBJ); } else { PUSH(INT); diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java index 055850bb0a2..d49ff929820 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java @@ -533,7 +533,7 @@ public static boolean isAnonymousClass(J9ClassPointer clazz) throws CorruptDataE * @param firstChar the first character of the signature being checked * @return true if the character indicates the beginning of a reference or value signature, false otherwise */ - public static boolean isRefOrValSignature(char firstChar) { + public static boolean isClassSignature(char firstChar) { return firstChar == 'L'; } } diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassLoaderHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassLoaderHelper.java index 96e2dac271b..d9e23564fd4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassLoaderHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassLoaderHelper.java @@ -70,7 +70,7 @@ public static J9ClassPointer findClass(J9ClassLoaderPointer classLoader, String int arity = calculateClassArity(signature); - if ((arity > 0) && !J9ClassHelper.isRefOrValSignature(signature.charAt(arity))) { + if ((arity > 0) && !J9ClassHelper.isClassSignature(signature.charAt(arity))) { return PRIMITIVE_TO_CLASS.get(signature.charAt(arity)); } else { while (classIterator.hasNext()) { diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClass.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClass.java index 73640918711..0e43e15f69f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClass.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClass.java @@ -327,7 +327,7 @@ boolean isObjectArray() throws CorruptDataException, com.ibm.j9ddr.CorruptDataEx J9ArrayClassPointer arrayClass = J9ArrayClassPointer.cast(j9class); // Any multi-dimensional array is an object array, as is any single dimensional array with an object type (i.e. [Lwhatever; or [Qwhatever;). - if (arrayClass.arity().gt(1) || J9ClassHelper.isRefOrValSignature(getName().charAt(1))) { + if (arrayClass.arity().gt(1) || J9ClassHelper.isClassSignature(getName().charAt(1))) { isObjectArray = true; } else { isObjectArray = false;