Skip to content
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

8334872: BigEndian: java/lang/invoke/condy Tests failing since JDK-8294960 #19863

Closed
wants to merge 3 commits into from
+206 −180
Closed

8334872: BigEndian: java/lang/invoke/condy Tests failing since JDK-8294960 #19863

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac8fb2d
8334872: BigEndian: java/lang/invoke/condy Tests failing since JDK-82…
asotona Jun 24, 2024
357d36a
more lambdas conversions to fix bootstrap
asotona Jun 25, 2024
1416d4d
more de-lambda work on ClassSpecializer
asotona Jun 25, 2024
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
6 changes: 4 additions & 2 deletions src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java
View file
Original file line number Diff line number Diff line change
@@ -67,6 +67,8 @@ abstract class ClassSpecializer<T,K,S extends ClassSpecializer<T,K,S>.SpeciesDat

private static final ClassDesc CD_LambdaForm = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/LambdaForm;");
private static final ClassDesc CD_BoundMethodHandle = ReferenceClassDescImpl.ofValidated("Ljava/lang/invoke/BoundMethodHandle;");
private static final Consumer<FieldBuilder> STATIC_FIELD_FLAGS = new InnerClassLambdaMetafactory.FieldFlags(ACC_STATIC);
private static final Consumer<FieldBuilder> FINAL_FIELD_FLAGS = new InnerClassLambdaMetafactory.FieldFlags(ACC_FINAL);

private final Class<T> topClass;
private final Class<K> keyType;
@@ -622,7 +624,7 @@ public void accept(ClassBuilder clb) {
.with(SourceFileAttribute.of(classDesc.displayName()))

// emit static types and BMH_SPECIES fields
.withField(sdFieldName, CD_SPECIES_DATA, ACC_STATIC);
.withField(sdFieldName, CD_SPECIES_DATA, STATIC_FIELD_FLAGS);

// handy holder for dealing with groups of typed values (ctor arguments and fields)
class Var {
@@ -706,7 +708,7 @@ void emitLoadInstruction(CodeBuilder cob) {

// emit bound argument fields
for (Var field : fields) {
clb.withField(field.name, field.desc, ACC_FINAL);
clb.withField(field.name, field.desc, FINAL_FIELD_FLAGS);
}

// emit implementation of speciesData()