Merge pull request #19799 from theresa-m/remove_q_6

Remove remaining q uses

Author: hangshao0

debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SendSlot.java

@@ -55,9 +55,6 @@ public static UDATA getSendSlotsFromSignature(J9UTF8Pointer signature) throws Co
 					break;
 				}
 			case 'L':
-			/*[IF INLINE-TYPES]*/
-			case 'Q':
-			/*[ENDIF] INLINE-TYPES */
 				for (i++; J9UTF8Helper.stringValue(signature).charAt(i) != ';'; i++);
 				sendArgs = sendArgs.add(1);
 				break;

debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITStackWalker.java

@@ -553,9 +553,6 @@ private void jitWalkResolveMethodFrame(WalkState walkState) throws CorruptDataEx
 					while ((sigChar = jitNextSigChar(signatureString)) != ')') {
 						switch (sigChar) {
 						case 'L':
-						/*[IF INLINE-TYPES]*/
-						case 'Q':
-						/*[ENDIF] INLINE-TYPES */
 							if (J9SW_ARGUMENT_REGISTER_COUNT_DEFINED && !stackSpillCount.eq(0)) {
 								if ((walkState.flags & J9_STACKWALK_ITERATE_O_SLOTS) != 0) {
 									try {
@@ -633,9 +630,6 @@ private char jitNextSigChar(String signatureString) throws CorruptDataException
 				/* Fall through to consume type name, utfChar == 'L' for return value */
 
 			case 'L':
-			/*[IF INLINE-TYPES]*/
-			case 'Q':
-			/*[ENDIF] INLINE-TYPES */
 				while (signatureString.charAt(charIndex++) != ';')
 					;
 			}

debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java

@@ -169,9 +169,6 @@ public static String getJavaName(J9ClassPointer clazz) throws CorruptDataExcepti
 		case 'Z': return "boolean" + aritySuffix;
 
 		case 'L':
-			/*[IF INLINE-TYPES]*/
-		case 'Q':
-			/*[ENDIF] INLINE-TYPES */
 			return getName(arrayClass.leafComponentType()) + aritySuffix;
 		}
 
@@ -537,10 +534,6 @@ public static boolean isAnonymousClass(J9ClassPointer clazz) throws CorruptDataE
 	 * @return true if the character indicates the beginning of a reference or value signature, false otherwise
 	 */
 	public static boolean isRefOrValSignature(char firstChar) {
-		return firstChar == 'L'
-			/*[IF INLINE-TYPES]*/
-			|| (firstChar == 'Q')
-			/*[ENDIF] INLINE-TYPES */
-			;
+		return firstChar == 'L';
 	}
 }

debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9IndexableObjectHelper.java

@@ -397,9 +397,6 @@ public static void getData(J9IndexableObjectPointer objPointer, Object dst, int
 		}
 
 		case 'L':
-		/*[IF INLINE-TYPES]*/
-		case 'Q':
-		/*[ENDIF] INLINE-TYPES */
 		case '[':
 		{
 			if (!(dst instanceof J9ObjectPointer[])) {
@@ -570,9 +567,6 @@ public static Object getData(J9IndexableObjectPointer objPointer) throws Corrupt
 		}
 
 		case 'L':
-		/*[IF INLINE-TYPES]*/
-		case 'Q':
-		/*[ENDIF] INLINE-TYPES */
 		case '[':
 		{
 			J9ObjectPointer[] data = new J9ObjectPointer[arraySize];
@@ -649,9 +643,6 @@ public static String getDataAsString(J9IndexableObjectPointer array, int dumpLim
 				break;
 
 			case 'L':
-			/*[IF INLINE-TYPES]*/
-			case 'Q':
-			/*[ENDIF] INLINE-TYPES */
 			case '[':
 			{
 				J9ObjectPointer item = ((J9ObjectPointer[]) data)[i];

debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9StaticsCommand.java

@@ -84,9 +84,6 @@ public void run(String command, String[] args, Context context, PrintStream out)
 
 				switch (sig.charAt(0)) {
 				case 'L':
-				/*[IF INLINE-TYPES]*/
-				case 'Q':
-				/*[ENDIF] INLINE-TYPES */
 				case '[':
 					CommandUtils.dbgPrint(out, "\t%s %s %s (!j9romstaticfieldshape %s) = !j9object %s\n",
 							fieldAddress.getHexAddress(), name, sig, field.getHexAddress(), fieldAddress.at(0).getHexValue());

debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ObjectStructureFormatter.java

@@ -221,9 +221,6 @@ private void formatArrayObject(PrintStream out, J9ClassPointer localClazz, U8Poi
 				}
 				break;
 			case 'L':
-			/*[IF INLINE-TYPES]*/
-			case 'Q':
-			/*[ENDIF] INLINE-TYPES */
 			case '[':
 				if (ValueTypeHelper.getValueTypeHelper().isJ9ClassIsFlattened(localClazz)) {
 					formatFlattenedObjectArray(out, tabLevel, begin, finish, array);

jcl/src/java.base/share/classes/java/lang/invoke/MethodTypeHelper.java

@@ -185,17 +185,13 @@ static String getBytecodeStringName(Class<?> c) {
 	/*
 	 * Convert the string from bytecode format to the format needed for ClassLoader#loadClass().
 	 * Change all '/' to '.'.
-	 * Remove the 'L', 'Q', and ';' from objects, unless they are array classes.
+	 * Remove the 'L' and ';' from objects, unless they are array classes.
 	 */
 	private static final Class<?> nonPrimitiveClassFromString(String name, ClassLoader classLoader) {
 		try {
 			name = name.replace('/', '.');
-			if ((name.charAt(0) == 'L')
-				/*[IF INLINE-TYPES]*/
-				|| (name.charAt(0) == 'Q')
-				/*[ENDIF] INLINE-TYPES */
-			) {
-				// Remove the 'L'/'Q' and ';'.
+			if (name.charAt(0) == 'L') {
+				// Remove the 'L' and ';'.
 				name = name.substring(1, name.length() - 1);
 			}
 			return Class.forName(name, false, classLoader);
@@ -212,21 +208,13 @@ static final int parseIntoClass(char[] signature, int index, ArrayList<Class<?>>
 		char current = signature[index];
 		Class<?> c;
 
-		if ((current == 'L') || (current == '[')
-			/*[IF INLINE-TYPES]*/
-			|| (current == 'Q')
-			/*[ENDIF] INLINE-TYPES */
-		) {
+		if ((current == 'L') || (current == '[')) {
 			int start = index;
 			while(signature[index] == '[') {
 				index++;
 			}
 			String name;
-			if ((signature[index] != 'L')
-				/*[IF INLINE-TYPES]*/
-				&& (signature[index] != 'Q')
-				/*[ENDIF] INLINE-TYPES */
-			) {
+			if (signature[index] != 'L') {
 				name = descriptor.substring(start, index + 1);
 			} else {
 				int end = descriptor.indexOf(';', index);

runtime/codert_vm/thunkcrt.c

@@ -361,9 +361,7 @@ j9ThunkIterateAndEncode(char ** signatureDataPtr, U_8 ** encodedTypesPtr, U_8 *
 				while ((c = *signatureData++) == '[') ;
 				/* intentional fall-through */
 			case 'L':
-				/* intentional fall-through */
-			case 'Q':
-				if ((c == 'L') || (c == 'Q')) {
+				if (c == 'L') {
 					while (*signatureData++ != ';') ;
 				}
 #if defined(J9VM_ENV_DATA64)
@@ -503,8 +501,6 @@ j9ThunkVMHelperFromSignature(void * jitConfig, UDATA signatureLength, char *sign
 		case '[':
 			/* intentional fall-through */
 		case 'L':
-			/* intentional fall-through */
-		case 'Q':
 #if defined(J9VM_ENV_DATA64)
 			helper = J9_BUILDER_SYMBOL(icallVMprJavaSendVirtualL);
 			break;
@@ -540,8 +536,6 @@ j9ThunkInvokeExactHelperFromSignature(void * jitConfig, UDATA signatureLength, c
 		case '[':
 			/* intentional fall-through */
 		case 'L':
-			/* intentional fall-through */
-		case 'Q':
 			helper = J9_BUILDER_SYMBOL(icallVMprJavaSendInvokeExactL);
 			break;
 		default:

runtime/compiler/control/JITServerHelpers.cpp

@@ -1526,8 +1526,6 @@ JITServerHelpers::getFullClassName(uint8_t *name, uint32_t length, const J9ROMCl
    uint32_t baseNameLength = J9UTF8_LENGTH(baseName);
 
    // Build the array class signature that will be passed to jitGetClassInClassloaderFromUTF8() on the client.
-   // Note that for object arrays we can simply use the "L" type signature since the distinction with "Q" types
-   // is ignored during array class lookup by name (see internalFindArrayClass() in runtime/vm/classsupport.c).
    uint32_t i;
    for (i = 0; i < numDimensions; ++i)
       name[i] = '[';

runtime/compiler/env/J2IThunk.cpp

@@ -111,7 +111,6 @@ char TR_MHJ2IThunkTable::terseTypeChar(char *type)
       {
       case '[':
       case 'L':
-      case 'Q':
          return TR::Compiler->target.is64Bit()? 'L' : 'I';
       case 'Z':
       case 'B':