Skip to content

[6.6] HHH-19571 Make AccessOptimizer bytecode generation deterministic #10392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2025
Merged

[6.6] HHH-19571 Make AccessOptimizer bytecode generation deterministic #10392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions ...te-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BytecodeProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;

import org.hibernate.HibernateException;
import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerClassLocator;
Expand Down Expand Up @@ -184,7 +183,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 {
Expand Down Expand Up @@ -253,7 +252,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 {
Expand All @@ -266,7 +265,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 ) ) )
);
}

Expand Down Expand Up @@ -1346,17 +1345,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 );
}
}

Expand Down
Loading