Fix constant mapping in J9ConstantPoolCommand

Signed-off-by: Jack Lu <Jack.S.Lu@ibm.com>
midronij · May 24, 2023 · b211882 · b211882
1 parent 5aba640
commit b211882
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/CompatibilityConstants29.dat b/debugtools/DDR_VM/src/com/ibm/j9ddr/CompatibilityConstants29.dat
@@ -69,8 +69,9 @@ J9JavaClassFlags.J9ClassRequiresPrePadding = 0
 J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_INJECTED_INTERFACE_INFO = 0
 J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_PERMITTEDSUBCLASSES_ATTRIBUTE = 0
 J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_RECORD_ATTRIBUTE = 0
-J9NonbuilderConstants.J9DescriptionCpBsmIndexMask = 0
-J9NonbuilderConstants.J9DescriptionCpTypeShift = 0
+
+J9DescriptionBits.J9DescriptionCpBsmIndexMask = 0
+J9DescriptionBits.J9DescriptionCpTypeShift = 0
 
 J9Object.OBJECT_HEADER_LOCK_LEARNING = 0
 J9Object.OBJECT_HEADER_LOCK_LEARNING_RECURSION_OFFSET = 0

diff --git a/...ls/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9ConstantPoolCommand.java b/...ls/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9ConstantPoolCommand.java
@@ -79,7 +79,7 @@
 import com.ibm.j9ddr.vm29.structure.J9Class;
 import com.ibm.j9ddr.vm29.structure.J9ConstantPool;
 import com.ibm.j9ddr.vm29.structure.J9Consts;
-import com.ibm.j9ddr.vm29.structure.J9NonbuilderConstants;
+import com.ibm.j9ddr.vm29.structure.J9DescriptionBits;
 import com.ibm.j9ddr.vm29.structure.J9VTableHeader;
 import com.ibm.j9ddr.vm29.structure.J9VmconstantpoolConstants;
 import com.ibm.j9ddr.vm29.types.UDATA;
@@ -131,8 +131,8 @@ public static boolean isSupported() {
  && (0 != J9Consts.J9_ITABLE_INDEX_SHIFT)
  && (0 != J9Consts.J9_ITABLE_INDEX_TAG_BITS)
  && (0 != J9Consts.J9_ITABLE_INDEX_UNRESOLVED)
- && (0 != J9NonbuilderConstants.J9DescriptionCpBsmIndexMask)
- && (0 != J9NonbuilderConstants.J9DescriptionCpTypeShift);
+ && (0 != J9DescriptionBits.J9DescriptionCpBsmIndexMask)
+ && (0 != J9DescriptionBits.J9DescriptionCpTypeShift);
  }
 
  private static J9ClassPointer findClassByName(J9JavaVMPointer vm, String name) throws CorruptDataException {
@@ -485,7 +485,7 @@ public void run(String command, String[] args, Context context, final PrintStrea
  long callSiteCount = romClass.callSiteCount().longValue();
  U16Pointer bsmIndicies = U16Pointer.cast(callSiteData.addOffset(4 * callSiteCount));
  U16Pointer bsmData = bsmIndicies.add(callSiteCount);
- long bsmIndex = romRef.bsmIndexAndCpType().rightShift((int)J9NonbuilderConstants.J9DescriptionCpTypeShift).bitAnd(J9NonbuilderConstants.J9DescriptionCpBsmIndexMask).longValue();
+ long bsmIndex = romRef.bsmIndexAndCpType().rightShift((int)J9DescriptionBits.J9DescriptionCpTypeShift).bitAnd(J9DescriptionBits.J9DescriptionCpBsmIndexMask).longValue();
 
  long argCount;
  for (long j = 0; j < bsmIndex; j++) {