From c5d78f923d61314829ad280026cc183a100131d1 Mon Sep 17 00:00:00 2001 From: Theresa Mammarella Date: Wed, 11 Sep 2024 15:18:35 -0400 Subject: [PATCH] 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;