From f19e774254f3ee30a1defc58215a52ba10c403d7 Mon Sep 17 00:00:00 2001
From: Ehren Julien-Neitzert <ehren.julien-neitzert@ibm.com>
Date: Fri, 4 Nov 2022 10:48:59 -0400
Subject: [PATCH] Remove type checks for VT <init> method in constant pool

The check is unnecessary and throws a ClassFormatError
when trying to verify a value class which calls a
non-value class constructor
---
 runtime/bcverify/staticverify.c | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/runtime/bcverify/staticverify.c b/runtime/bcverify/staticverify.c
index 51333c1ebe0..8c3bf230015 100644
--- a/runtime/bcverify/staticverify.c
+++ b/runtime/bcverify/staticverify.c
@@ -1794,40 +1794,13 @@ j9bcv_verifyClassStructure (J9PortLibrary * portLib, J9CfrClassFile * classfile,
 			&& !isConstantInvokeDynamic
 #endif /* JAVA_SPEC_VERSION >= 18 */
 			) {
-				BOOLEAN invalidRetType = FALSE;
-				if (
-#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
-#if defined(J9VM_OPT_VALHALLA_NEW_FACTORY_METHOD)
-				(CFR_METHOD_NAME_NEW == isInit)
-#else /* #if defined(J9VM_OPT_VALHALLA_NEW_FACTORY_METHOD) */
-				(CFR_METHOD_NAME_INIT == isInit) && J9_IS_CLASSFILE_VALUETYPE(classfile)
-#endif /* #if defined(J9VM_OPT_VALHALLA_NEW_FACTORY_METHOD) */
-#else /* #if defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
-				FALSE
-#endif /* #if defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
-				) {
-					U_16 returnChar = getReturnTypeFromSignature(info->bytes, info->slot1, NULL);
-					if (J9_IS_CLASSFILE_PRIMITIVE_VALUETYPE(classfile)) {
-						if (!IS_QTYPE(returnChar)) {
-							invalidRetType = TRUE;
-						}
-					} else {
-						if (!IS_LTYPE(returnChar)) {
-							invalidRetType = TRUE;
-						}
-					}
 /* This #if !defined check should be removed (along with all other code that references J9VM_OPT_VALHALLA_NEW_FACTORY_METHOD) once the <vnew> method is introduced */
 #if !defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
-				} else {
-					if (info->bytes[info->slot1 - 1] != 'V') {
-						invalidRetType = TRUE;
-					}
-#endif /* #if !defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
-				}
-				if (invalidRetType) {
+				if (info->bytes[info->slot1 - 1] != 'V') {
 					errorType = J9NLS_CFR_ERR_BC_METHOD_INVALID_SIG__ID;
 					goto _formatError;
 				}
+#endif /* #if !defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
 			}
 			if (argCount > 255) {
 				errorType = J9NLS_CFR_ERR_TOO_MANY_ARGS__ID;