HHH-19372 Test and fix IAE for AccessOptimizer bridge superclasses

Author: beikov

hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java

@@ -16,7 +16,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -282,13 +281,13 @@ public ReflectionOptimizer getReflectionOptimizer(
 		}
 	}
 
-	private static class ForeignPackageClassInfo {
+	private static class BridgeMembersClassInfo {
 		final Class<?> clazz;
 		final List<String> propertyNames = new ArrayList<>();
 		final List<Member> getters = new ArrayList<>();
 		final List<Member> setters = new ArrayList<>();
 
-		public ForeignPackageClassInfo(Class<?> clazz) {
+		public BridgeMembersClassInfo(Class<?> clazz) {
 			this.clazz = clazz;
 		}
 	}
@@ -297,46 +296,24 @@ private Class<?> determineAccessOptimizerSuperClass(Class<?> clazz, String[] pro
 		if ( clazz.isInterface() ) {
 			return Object.class;
 		}
-		// generate access optimizer super classes for foreign package super classes that declare fields
+		// generate access optimizer super classes for super classes that declare members requiring bridge methods
 		//  each should declare protected static methods get_FIELDNAME(OWNER)/set_FIELDNAME(OWNER, TYPE)
 		//  which should be called then from within GetPropertyValues/SetPropertyValues
 		//  Since these super classes will be in the correct package, the package-private entity field access is fine
-		final List<ForeignPackageClassInfo> foreignPackageClassInfos = createForeignPackageClassInfos( clazz );
-		for ( Iterator<ForeignPackageClassInfo> iterator = foreignPackageClassInfos.iterator(); iterator.hasNext(); ) {
-			final ForeignPackageClassInfo foreignPackageClassInfo = iterator.next();
-			for ( int i = 0; i < getters.length; i++ ) {
-				final Member getter = getters[i];
-				final Member setter = setters[i];
-				boolean found = false;
-				if ( getter.getDeclaringClass() == foreignPackageClassInfo.clazz && !Modifier.isPublic( getter.getModifiers() ) ) {
-					foreignPackageClassInfo.getters.add( getter );
-					found = true;
-				}
-				if ( setter.getDeclaringClass() == foreignPackageClassInfo.clazz && !Modifier.isPublic( setter.getModifiers() ) ) {
-					foreignPackageClassInfo.setters.add( setter );
-					found = true;
-				}
-				if ( found ) {
-					foreignPackageClassInfo.propertyNames.add( propertyNames[i] );
-				}
-			}
-			if ( foreignPackageClassInfo.getters.isEmpty() && foreignPackageClassInfo.setters.isEmpty() ) {
-				iterator.remove();
-			}
-		}
+		final List<BridgeMembersClassInfo> bridgeMembersClassInfos = createBridgeMembersClassInfos( clazz, getters, setters, propertyNames );
 
 		Class<?> superClass = Object.class;
-		for ( int i = foreignPackageClassInfos.size() - 1; i >= 0; i-- ) {
-			final ForeignPackageClassInfo foreignPackageClassInfo = foreignPackageClassInfos.get( i );
+		for ( int i = bridgeMembersClassInfos.size() - 1; i >= 0; i-- ) {
+			final BridgeMembersClassInfo bridgeMembersClassInfo = bridgeMembersClassInfos.get( i );
 			final Class<?> newSuperClass = superClass;
 
-			final String className = foreignPackageClassInfo.clazz.getName() + "$" + OPTIMIZER_PROXY_BRIDGE_NAMING_SUFFIX + encodeName( foreignPackageClassInfo.propertyNames, foreignPackageClassInfo.getters, foreignPackageClassInfo.setters );
+			final String className = bridgeMembersClassInfo.clazz.getName() + "$" + OPTIMIZER_PROXY_BRIDGE_NAMING_SUFFIX + encodeName( bridgeMembersClassInfo.propertyNames, bridgeMembersClassInfo.getters, bridgeMembersClassInfo.setters );
 			superClass = byteBuddyState.load(
-					foreignPackageClassInfo.clazz,
+					bridgeMembersClassInfo.clazz,
 					className,
 					(byteBuddy, namingStrategy) -> {
 						DynamicType.Builder<?> builder = byteBuddy.with( namingStrategy ).subclass( newSuperClass );
-						for ( Member getter : foreignPackageClassInfo.getters ) {
+						for ( Member getter : bridgeMembersClassInfo.getters ) {
 							final Class<?> getterType;
 							if ( getter instanceof Field ) {
 								getterType = ( (Field) getter ).getType();
@@ -352,7 +329,7 @@ private Class<?> determineAccessOptimizerSuperClass(Class<?> clazz, String[] pro
 											),
 											Opcodes.ACC_PROTECTED | Opcodes.ACC_STATIC
 									)
-									.withParameter( foreignPackageClassInfo.clazz )
+									.withParameter( bridgeMembersClassInfo.clazz )
 									.intercept(
 											new Implementation.Simple(
 													new GetFieldOnArgument(
@@ -361,7 +338,7 @@ private Class<?> determineAccessOptimizerSuperClass(Class<?> clazz, String[] pro
 											)
 									);
 						}
-						for ( Member setter : foreignPackageClassInfo.setters ) {
+						for ( Member setter : bridgeMembersClassInfo.setters ) {
 							final Class<?> setterType;
 							if ( setter instanceof Field ) {
 								setterType = ( (Field) setter ).getType();
@@ -375,7 +352,7 @@ private Class<?> determineAccessOptimizerSuperClass(Class<?> clazz, String[] pro
 											TypeDescription.Generic.VOID,
 											Opcodes.ACC_PROTECTED | Opcodes.ACC_STATIC
 									)
-									.withParameter( foreignPackageClassInfo.clazz )
+									.withParameter( bridgeMembersClassInfo.clazz )
 									.withParameter( setterType )
 									.intercept(
 											new Implementation.Simple(
@@ -393,10 +370,10 @@ private Class<?> determineAccessOptimizerSuperClass(Class<?> clazz, String[] pro
 			for ( int j = 0; j < getters.length; j++ ) {
 				final Member getter = getters[j];
 				final Member setter = setters[j];
-				if ( foreignPackageClassInfo.getters.contains( getter ) ) {
+				if ( bridgeMembersClassInfo.getters.contains( getter ) ) {
 					getters[j] = new ForeignPackageMember( superClass, getter );
 				}
-				if ( foreignPackageClassInfo.setters.contains( setter ) ) {
+				if ( bridgeMembersClassInfo.setters.contains( setter ) ) {
 					setters[j] = new ForeignPackageMember( superClass, setter );
 				}
 			}
@@ -620,16 +597,37 @@ private boolean is64BitType(Class<?> type) {
 		}
 	}
 
-	private List<ForeignPackageClassInfo> createForeignPackageClassInfos(Class<?> clazz) {
-		final List<ForeignPackageClassInfo> foreignPackageClassInfos = new ArrayList<>();
+	private List<BridgeMembersClassInfo> createBridgeMembersClassInfos(
+			Class<?> clazz,
+			Member[] getters,
+			Member[] setters,
+			String[] propertyNames) {
+		final List<BridgeMembersClassInfo> bridgeMembersClassInfos = new ArrayList<>();
 		Class<?> c = clazz.getSuperclass();
 		while (c != Object.class) {
-			if ( !c.getPackageName().equals( clazz.getPackageName() ) ) {
-				foreignPackageClassInfos.add( new ForeignPackageClassInfo( c ) );
+			final BridgeMembersClassInfo bridgeMemberClassInfo = new BridgeMembersClassInfo( c );
+			for ( int i = 0; i < getters.length; i++ ) {
+				final Member getter = getters[i];
+				final Member setter = setters[i];
+				boolean found = false;
+				if ( getter.getDeclaringClass() == c && !Modifier.isPublic( getter.getModifiers() ) ) {
+					bridgeMemberClassInfo.getters.add( getter );
+					found = true;
+				}
+				if ( setter.getDeclaringClass() == c && !Modifier.isPublic( setter.getModifiers() ) ) {
+					bridgeMemberClassInfo.setters.add( setter );
+					found = true;
+				}
+				if ( found ) {
+					bridgeMemberClassInfo.propertyNames.add( propertyNames[i] );
+				}
+			}
+			if ( !bridgeMemberClassInfo.propertyNames.isEmpty() ) {
+				bridgeMembersClassInfos.add( bridgeMemberClassInfo );
 			}
 			c = c.getSuperclass();
 		}
-		return foreignPackageClassInfos;
+		return bridgeMembersClassInfos;
 	}
 
 	public ByteBuddyProxyHelper getByteBuddyProxyHelper() {