archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 08:34:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8332505: JEP 457: ClassRemapper forgets to remap bootstrap method references

Browse source 
Reviewed-by: jlahoda
This commit is contained in:
Adam Sotona 2024-05-28 12:29:30 +00:00
parent cabe337400
commit aa4c83a5bf
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -239,7 +239,7 @@ public record ClassRemapperImpl(Function<ClassDesc, ClassDesc> mapFunction) impl
ii.isInterface()); ii.isInterface());
case InvokeDynamicInstruction idi -> case InvokeDynamicInstruction idi ->
cob.invokedynamic(DynamicCallSiteDesc.of( cob.invokedynamic(DynamicCallSiteDesc.of(
idi.bootstrapMethod(), idi.name().stringValue(), mapDirectMethodHandle(idi.bootstrapMethod()), idi.name().stringValue(),
mapMethodDesc(idi.typeSymbol()), mapMethodDesc(idi.typeSymbol()),
idi.bootstrapArgs().stream().map(this::mapConstantValue).toArray(ConstantDesc[]::new))); idi.bootstrapArgs().stream().map(this::mapConstantValue).toArray(ConstantDesc[]::new)));
case NewObjectInstruction c -> case NewObjectInstruction c ->

10
test/jdk/jdk/classfile/AdvancedTransformationsTest.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -24,6 +24,7 @@
/* /*
* @test * @test
* @summary Testing ClassFile advanced transformations. * @summary Testing ClassFile advanced transformations.
* @bug 8332505
* @run junit AdvancedTransformationsTest * @run junit AdvancedTransformationsTest
*/ */
import helpers.ByteArrayClassLoader; import helpers.ByteArrayClassLoader;
@ -65,6 +66,7 @@ import static java.lang.annotation.ElementType.*;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import java.lang.runtime.ObjectMethods;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import jdk.internal.classfile.impl.AbstractPseudoInstruction; import jdk.internal.classfile.impl.AbstractPseudoInstruction;
@ -187,9 +189,10 @@ class AdvancedTransformationsTest {
var fooAnno = ClassDesc.ofDescriptor(FooAnno.class.descriptorString()); var fooAnno = ClassDesc.ofDescriptor(FooAnno.class.descriptorString());
var barAnno = ClassDesc.ofDescriptor(BarAnno.class.descriptorString()); var barAnno = ClassDesc.ofDescriptor(BarAnno.class.descriptorString());
var rec = ClassDesc.ofDescriptor(Rec.class.descriptorString()); var rec = ClassDesc.ofDescriptor(Rec.class.descriptorString());
var objectMethods = ClassDesc.ofDescriptor(ObjectMethods.class.descriptorString());
var cc = ClassFile.of(); var cc = ClassFile.of();
var remapped = cc.parse( var remapped = cc.parse(
ClassRemapper.of(Map.of(foo, bar, fooAnno, barAnno)).remapClass( ClassRemapper.of(Map.of(foo, bar, fooAnno, barAnno, objectMethods, bar)).remapClass(
cc, cc,
cc.parse( cc.parse(
Rec.class.getResourceAsStream(Rec.class.getName() + ".class") Rec.class.getResourceAsStream(Rec.class.getName() + ".class")
@ -211,7 +214,8 @@ class AdvancedTransformationsTest {
"PUTSTATIC, owner: AdvancedTransformationsTest$Bar, field name: fooField, field type: LAdvancedTransformationsTest$Bar;", "PUTSTATIC, owner: AdvancedTransformationsTest$Bar, field name: fooField, field type: LAdvancedTransformationsTest$Bar;",
"INVOKESTATIC, owner: AdvancedTransformationsTest$Bar, method name: fooMethod, method type: (LAdvancedTransformationsTest$Bar;)LAdvancedTransformationsTest$Bar", "INVOKESTATIC, owner: AdvancedTransformationsTest$Bar, method name: fooMethod, method type: (LAdvancedTransformationsTest$Bar;)LAdvancedTransformationsTest$Bar",
"method type: ()LAdvancedTransformationsTest$Bar;", "method type: ()LAdvancedTransformationsTest$Bar;",
"GETFIELD, owner: AdvancedTransformationsTest$Rec, field name: foo, field type: LAdvancedTransformationsTest$Bar;"); "GETFIELD, owner: AdvancedTransformationsTest$Rec, field name: foo, field type: LAdvancedTransformationsTest$Bar;",
"bootstrap method: STATIC AdvancedTransformationsTest$Bar::bootstrap");
assertFalse(out.contains("bootstrap method arguments indexes: []"), "bootstrap arguments lost"); assertFalse(out.contains("bootstrap method arguments indexes: []"), "bootstrap arguments lost");
} }