HHH-19571 Make AccessOptimizer bytecode generation deterministic

Author: beikov

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

@@ -16,7 +16,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Callable;
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
@@ -183,7 +182,7 @@ public ReflectionOptimizer getReflectionOptimizer(
 				.method( setPropertyValuesMethodName )
 				.intercept( new Implementation.Simple( new SetPropertyValues( clazz, getterNames, setters ) ) )
 				.method( getPropertyNamesMethodName )
-				.intercept( MethodCall.call( new CloningPropertyCall( getterNames ) ) )
+				.intercept( new Implementation.Simple( new GetPropertyNames( getterNames ) ) )
 		);
 
 		try {
@@ -252,7 +251,7 @@ public ReflectionOptimizer getReflectionOptimizer(
 					.method( setPropertyValuesMethodName )
 					.intercept( new Implementation.Simple( new SetPropertyValues( clazz, propertyNames, setters ) ) )
 					.method( getPropertyNamesMethodName )
-					.intercept( MethodCall.call( new CloningPropertyCall( propertyNames ) ) )
+					.intercept( new Implementation.Simple( new GetPropertyNames( propertyNames ) ) )
 			);
 		}
 		else {
@@ -265,7 +264,7 @@ public ReflectionOptimizer getReflectionOptimizer(
 					.method( setPropertyValuesMethodName )
 					.intercept( new Implementation.Simple( new SetPropertyValues( clazz, propertyNames, setters ) ) )
 					.method( getPropertyNamesMethodName )
-					.intercept( MethodCall.call( new CloningPropertyCall( propertyNames ) ) )
+					.intercept( new Implementation.Simple( new GetPropertyNames( propertyNames ) ) )
 			);
 		}
 
@@ -1341,17 +1340,29 @@ private static Constructor<?> findConstructor(Class<?> clazz) {
 		}
 	}
 
-	public static class CloningPropertyCall implements Callable<String[]> {
+	public static class GetPropertyNames implements ByteCodeAppender {
 
 		private final String[] propertyNames;
 
-		private CloningPropertyCall(String[] propertyNames) {
+		private GetPropertyNames(String[] propertyNames) {
 			this.propertyNames = propertyNames;
 		}
 
 		@Override
-		public String[] call() {
-			return propertyNames.clone();
+		public Size apply(
+				MethodVisitor methodVisitor,
+				Implementation.Context implementationContext,
+				MethodDescription instrumentedMethod) {
+			methodVisitor.visitLdcInsn( propertyNames.length );
+			methodVisitor.visitTypeInsn( Opcodes.ANEWARRAY, Type.getInternalName( String.class ) );
+			for ( int i = 0; i < propertyNames.length; i++ ) {
+				methodVisitor.visitInsn( Opcodes.DUP );
+				methodVisitor.visitLdcInsn( i );
+				methodVisitor.visitLdcInsn( propertyNames[i] );
+				methodVisitor.visitInsn( Opcodes.AASTORE );
+			}
+			methodVisitor.visitInsn( Opcodes.ARETURN );
+			return new Size( 4, instrumentedMethod.getStackSize() + 1 );
 		}
 	}