Merge pull request #19727 from theresa-m/remove_q

Remove some value type q cases
eclipse-openj9 · Jun 18, 2024 · 45bf250 · 45bf250
2 parents 701fa85 + bc14031
commit 45bf250
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 123 deletions.
diff --git a/runtime/bcutil/ClassFileOracle.cpp b/runtime/bcutil/ClassFileOracle.cpp
@@ -1235,20 +1235,11 @@ ClassFileOracle::computeSendSlotCount(U_16 methodIndex)
 			while ((index < count) && ('[' == bytes[index])) {
 				++index;
 			}
-			if ((index >= count)
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-				|| (('L' != bytes[index]) && ('Q' != bytes[index]))
-#else /* J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES */
-				|| ('L' != bytes[index])
-#endif /* J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES */
-			) {
+			if ((index >= count) || ('L' != bytes[index])) {
 				break;
 			}
 			/* fall through */
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES */
 			++index;
 			while ((index < count) && (';' != bytes[index])) {
 				++index;

diff --git a/runtime/bcutil/ClassFileWriter.cpp b/runtime/bcutil/ClassFileWriter.cpp
@@ -1343,9 +1343,6 @@ ClassFileWriter::computeArgsCount(U_16 methodRefIndex)
 			}
 			/* fall through */
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			index += 1;
 			while ((index < count) && (';' != sig[index])) {
 				index += 1;

diff --git a/runtime/bcverify/bcverify.c b/runtime/bcverify/bcverify.c
@@ -1166,9 +1166,6 @@ printMethod (J9BytecodeVerificationData * verifyData)
 			break;
 
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			i++;
 			while(string[i] != ';')
 			{
@@ -1225,9 +1222,6 @@ printMethod (J9BytecodeVerificationData * verifyData)
 				break;
 
 			case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-			case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 				i++;
 				while(string[i] != ';')
 				{

diff --git a/runtime/cfdumper/main.c b/runtime/cfdumper/main.c
@@ -1159,9 +1159,6 @@ static void printMethod(J9CfrClassFile* classfile, J9CfrMethod* method)
 			break;
 
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			i++;
 			while(string[i] != ';')
 			{
@@ -1218,9 +1215,6 @@ static void printMethod(J9CfrClassFile* classfile, J9CfrMethod* method)
 				break;
 
 			case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-			case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 				i++;
 				while(string[i] != ';')
 				{
@@ -1336,9 +1330,6 @@ static void printField(J9CfrClassFile* classfile, J9CfrField* field)
 			j9tty_printf( PORTLIB, "long");
 			break;
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			i++;
 			while(string[i] != ';')
 			{
@@ -1441,9 +1432,6 @@ static void printDisassembledMethod(J9CfrClassFile* classfile, J9CfrMethod* meth
 			break;
 
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			i++;
 			while(string[i] != ';')
 			{
@@ -1500,9 +1488,6 @@ static void printDisassembledMethod(J9CfrClassFile* classfile, J9CfrMethod* meth
 				break;
 
 			case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-			case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 				i++;
 				while(string[i] != ';')
 				{
@@ -4502,9 +4487,6 @@ static void sun_formatField(J9CfrClassFile* classfile, J9CfrField* field, char *
 						switch(string[j++])
 						{
 							case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-							case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 								while((ch2 = string[j++]) != ';')
 								{
 									if(ch2 == '/') j9tty_output_char('.');
@@ -4752,9 +4734,6 @@ static void sun_formatMethod(J9CfrClassFile* classfile, J9CfrMethod* method, cha
 						switch(string[j++])
 						{
 							case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-							case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 								while((ch2 = string[j++]) != ';')
 								{
 									if(ch2 == '/') j9tty_output_char('.');
@@ -4820,9 +4799,6 @@ static void sun_formatMethod(J9CfrClassFile* classfile, J9CfrMethod* method, cha
 							switch(string[j++])
 							{
 								case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-								case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 									while((ch2 = string[j++]) != ';')
 									{
 										if(ch2 == '/') j9tty_output_char('.');
@@ -5276,9 +5252,6 @@ static void j9_formatField(J9ROMClass* romClass, J9ROMFieldShape* field, char *f
 						switch(string[j++])
 						{
 							case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-							case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 								while((ch2 = string[j++]) != ';')
 								{
 									if(ch2 == '/') j9tty_output_char('.');
@@ -5551,9 +5524,6 @@ static void j9_formatMethod(J9ROMClass* romClass, J9ROMMethod* method, char *for
 						switch(string[j++])
 						{
 							case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-							case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 								while((ch2 = string[j++]) != ';')
 								{
 									if(ch2 == '/') j9tty_output_char('.');
@@ -5620,9 +5590,6 @@ static void j9_formatMethod(J9ROMClass* romClass, J9ROMMethod* method, char *for
 							switch(string[j++])
 							{
 								case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-								case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 									while((ch2 = string[j++]) != ';')
 									{
 										if(ch2 == '/') j9tty_output_char('.');

diff --git a/runtime/jcl/common/reflecthelp.c b/runtime/jcl/common/reflecthelp.c
@@ -257,9 +257,6 @@ computeArgCount(J9ROMMethod *method)
 			}
 			/* fall through */
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			index += 1;
 			while ((index < count) && (';' != bytes[index])) {
 				index += 1;

diff --git a/runtime/jnichk/jnicbuf.c b/runtime/jnichk/jnicbuf.c
@@ -108,9 +108,6 @@ computeArgsCRC(const jvalue *args, jmethodID methodID)
 			/* ignore square brackets and just count the leaf type as one argument */
 			break;
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			while (*++sigArgs != ';') {
 				/* skip up to the semi-colon */
 			}

diff --git a/runtime/jnichk/jnicheck.c b/runtime/jnichk/jnicheck.c
@@ -478,9 +478,6 @@ jniCheckCallV(const char* function, JNIEnv* env, jobject receiver, UDATA methodT
 		}
 		switch (*sigArgs) {
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 		case '[':
 			sigArgs = jniCheckObjectArg(function, env, va_arg(args, jobject), sigArgs, argNum, trace);
 			break;
@@ -529,9 +526,6 @@ jniCheckCallA(const char* function, JNIEnv* env, jobject receiver, UDATA methodT
 		}
 		switch (*sigArgs) {
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 		case '[':
 			sigArgs = jniCheckObjectArg(function, env, args++->l, sigArgs, argNum, trace);
 			break;
@@ -1925,9 +1919,6 @@ jniDecodeValue(J9VMThread * vmThread, UDATA sigChar, void * valuePtr, char ** ou
 			written = j9str_printf(PORTLIB, *outputBuffer, *outputBufferLength, "(jboolean)%s", *((I_32 *) valuePtr) ? "true" : "false");
 			break;
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			written = j9str_printf(PORTLIB, *outputBuffer, *outputBufferLength, "(jobject)0x%p", *((UDATA *) valuePtr));
 			break;
 		default:
@@ -1966,9 +1957,6 @@ static UDATA jniNextSigChar(U_8 ** utfData)
 			/* Fall through to consume type name, utfChar == 'L' for return value */
 
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			while (*data++ != ';') ;
 	}
 
@@ -2461,9 +2449,6 @@ jniCheckObjectArg(const char* function, JNIEnv* env, jobject aJobject, char* sig
 
 	switch (*sigArgs) {
 	case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-	case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 		while (*sigArgs != ';') {
 			sigArgs++;
 		}

diff --git a/runtime/jvmti/jvmtiForceEarlyReturn.cpp b/runtime/jvmti/jvmtiForceEarlyReturn.cpp
@@ -222,9 +222,6 @@ jvmtiForceEarlyReturn(jvmtiEnv* env,
 							methodReturnType = JVMTI_TYPE_JDOUBLE;
 							break;
 						case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-						case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 							methodReturnType = JVMTI_TYPE_JOBJECT;
 							break;
   						}

diff --git a/runtime/jvmti/jvmtiHelpers.cpp b/runtime/jvmti/jvmtiHelpers.cpp
@@ -972,9 +972,6 @@ fillInJValue(char signatureType, jvalue * jvaluePtr, void * valueAddress, j9obje
 			memcpy(&(jvaluePtr->d), valueAddress, 8);
 			break;
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			object = *((j9object_t*) valueAddress);
 			if (object == NULL) {
 				jvaluePtr->l = NULL;

diff --git a/runtime/jvmti/jvmtiLocalVariable.cpp b/runtime/jvmti/jvmtiLocalVariable.cpp
@@ -404,9 +404,6 @@ jvmtiGetOrSetLocal(jvmtiEnv *env,
 										memcpy(slotAddress - 1, value_ptr, sizeof(U_64));
 										break;
 									case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-									case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 										/* Perform type check? */
 										*((j9object_t *)slotAddress) = (NULL == value_ptr) ? NULL : *((j9object_t *)value_ptr);
 										break;
@@ -431,9 +428,6 @@ jvmtiGetOrSetLocal(jvmtiEnv *env,
 									}
 									break;
 								case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-								case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 									/* CMVC 109592 - Must not modify the stack while a thread is halted for inspection - this includes creation of JNI local refs */
 									objectFetched = TRUE;
 									PUSH_OBJECT_IN_SPECIAL_FRAME(currentThread, slotValid ? *((j9object_t *)slotAddress) : NULL);

diff --git a/runtime/rastrace/method_trace.c b/runtime/rastrace/method_trace.c
@@ -496,9 +496,6 @@ traceMethodArguments(J9VMThread* thr, J9UTF8* signature, UDATA* arg0EA, char* bu
 		switch (*sigChar) {
 		case '[':
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			traceMethodArgObject(thr, arg0EA--, cursor, endOfBuf - cursor);
 			while (*sigChar == '[') {
 				sigChar++;
@@ -578,9 +575,6 @@ traceMethodReturnVal(J9VMThread* thr, J9UTF8* signature, void* returnValuePtr, c
 	switch (*(++sigChar)) {
 	case '[':
 	case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-	case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 		traceMethodArgObject(thr, returnValuePtr, cursor, endOfBuf - cursor);
 		break;
 	case 'J':

diff --git a/runtime/tests/jvmtitests/agent/strings.c b/runtime/tests/jvmtitests/agent/strings.c
@@ -202,9 +202,6 @@ getTypeString(agentEnv * env, jthread currentThread, JNIEnv * jni_env, char sign
 			sprintf(typeStr, "(jdouble) %f", jvaluePtr->d);
 			break;
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 			if (jvaluePtr->l == NULL) {
 				sprintf(typeStr, "(jobject) null");
 			} else {

diff --git a/runtime/util/sendslot.c b/runtime/util/sendslot.c
@@ -37,20 +37,13 @@ getSendSlotsFromSignature(const U_8* signature)
 		case '[':
 			/* skip all '['s */
 			for (i++; signature[i] == '['; i++);
-			if ((signature[i] == 'L')
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-				|| (signature[i] == 'Q')
-#endif /* J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES */
-			) {
+			if (signature[i] == 'L') {
 				/* FALL THRU */
 			} else {
 				sendArgs++;
 				break;
 			}
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES */
 			for (i++; signature[i] != ';'; i++);
 			sendArgs++;
 			break;

diff --git a/runtime/verutil/chverify.c b/runtime/verutil/chverify.c
@@ -31,7 +31,7 @@
  * Methods, other than <init> and <clinit> cannot contain '<' or '>'.
  * Classes can contain '[' only at the front if they are array classes.
  * Classes can end with ';' only if they are array classes for class file major version < 62
- * 				For class major file version >= 62. They can be array classes or descriptors of form "LClassName;" or "QClassName;".
+ * 				For class major file version >= 62. They can be array classes or descriptors of form "LClassName;".
  * Classes can contain '/'
  * 		if not the first character,
  * 		if not the last character,
@@ -88,7 +88,7 @@ checkNameImpl (J9CfrConstantPoolInfo * info, BOOLEAN isClass, BOOLEAN isMethod,
 				if (J9_ARE_ALL_BITS_SET(info->flags1, CFR_CLASS_FILE_VERSION_SUPPORT_FLATTENABLE_VALUE_TYPE)) {
 					/* If CFR_CLASS_FILE_VERSION_SUPPORT_FLATTENABLE_VALUE_TYPE is set (class major file version >= 62)
 					 * Valid at the end of array classes
-					 * or descriptors of form "LClassName;" or "QClassName;".
+					 * or descriptors of form "LClassName;".
 					 */
 					if ((arity || IS_REF_OR_VAL_SIGNATURE(*info->bytes))
 						&& ((c + 1) == end)
@@ -225,7 +225,7 @@ bcvIsReferenceTypeDescriptor(J9CfrConstantPoolInfo * info) {
 		/* All referencetype descriptors must be more than one character long */
 		result = FALSE;
 	} else if (('[' == bytes[0]) || /* Check if bytes is an ArrayType descriptor */
-		((';' == bytes[length - 1]) && (('L' == bytes[0]) || ('Q' == bytes[0]))) /* Check if bytes is a StandardReferenceType or DeclaredPrimitiveType descriptor */
+		((';' == bytes[length - 1]) && ('L' == bytes[0])) /* Check if bytes is a StandardReferenceType descriptor */
 	) {
 		result = TRUE;
 	}

diff --git a/runtime/vm/classsupport.c b/runtime/vm/classsupport.c
@@ -976,8 +976,8 @@ loadNonArrayClass(J9VMThread* vmThread, J9Module *j9module, U_8* className, UDAT
 
 #if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
 	if (J9_IS_STRING_DESCRIPTOR(className, classNameLength)) {
-		className += 1; /* 1 for 'L' or 'Q' */
-		classNameLength -= 2; /* 2 for 'L'/'Q' and ';' */
+		className += 1; /* 1 for 'L' */
+		classNameLength -= 2; /* 2 for 'L' and ';' */
 	}
 #endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 

diff --git a/runtime/vm/extendedMessageNPE.cpp b/runtime/vm/extendedMessageNPE.cpp
@@ -214,9 +214,6 @@ convertMethodSignature(J9VMThread *vmThread, J9UTF8 *methodSig)
 			bufferSize += 3;
 			break;
 		case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-		case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 		{
 			i += 1;
 			UDATA objSize = 0;

diff --git a/runtime/vm/jnicsup.cpp b/runtime/vm/jnicsup.cpp
@@ -539,9 +539,6 @@ UDATA JNICALL pushArguments(J9VMThread *vmThread, J9Method* method, void *args)
 				}
 				skipSignature = ('L' == *sigChar++);
 			case 'L':
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-			case 'Q':
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
 				/* skip the rest of the signature */
 				if (skipSignature) {
 					while (';' != *sigChar) {

diff --git a/runtime/vm/resolvesupport.cpp b/runtime/vm/resolvesupport.cpp
@@ -336,16 +336,6 @@ resolveClassRef(J9VMThread *vmStruct, J9ConstantPool *ramCP, UDATA cpIndex, UDAT
 		goto done;
 	}
 
-#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
-	if ((';' == *(char *)(classNameData + (classNameLength - 1)))
-		&& ('Q' == *(char *)classNameData)
-	) {
-		/* we are dealing with signature envelope, extract the name from it */
-		classNameData += 1;
-		classNameLength -= 2;
-	}
-#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
-
 	resolvedClass = internalFindClassUTF8(vmStruct, classNameData, classNameLength,
 			classLoader, findClassFlags);