Correct tests.

Author: raphw

byte-buddy-dep/src/main/java/net/bytebuddy/asm/MemberSubstitution.java

@@ -4726,6 +4726,11 @@ class ForDynamicConstant implements OffsetMapping {
                              */
                             private final List<JavaConstant> arguments;
 
+                            /**
+                             * {@code true} if invokedynamic should be used to bind the constant.
+                             */
+                            private final boolean invokedynamic;
+
                             /**
                              * Creates an offset mapping for a dynamic constant.
                              *
@@ -4737,6 +4742,7 @@ class ForDynamicConstant implements OffsetMapping {
                              * @param bootstrapReturnType     The return type of the boostrap method.
                              * @param bootstrapParameterTypes The parameter types of the boostrap method.
                              * @param arguments               The constant arguments to the bootstrap method.
+                             * @param invokedynamic           {@code true} if invokedynamic should be used to bind the constant.
                              */
                             public ForDynamicConstant(String name,
                                                       TypeDescription typeDescription,
@@ -4745,7 +4751,8 @@ public ForDynamicConstant(String name,
                                                       String bootstrapName,
                                                       TypeDescription bootstrapReturnType,
                                                       List<? extends TypeDescription> bootstrapParameterTypes,
-                                                      List<JavaConstant> arguments) {
+                                                      List<JavaConstant> arguments,
+                                                      boolean invokedynamic) {
                                 this.name = name;
                                 this.typeDescription = typeDescription;
                                 this.bootstrapType = bootstrapType;
@@ -4754,6 +4761,7 @@ public ForDynamicConstant(String name,
                                 this.bootstrapReturnType = bootstrapReturnType;
                                 this.bootstrapParameterTypes = bootstrapParameterTypes;
                                 this.arguments = arguments;
+                                this.invokedynamic = invokedynamic;
                             }
 
                             /**
@@ -4763,15 +4771,26 @@ public Resolved resolve(Assigner assigner,
                                                     Assigner.Typing typing,
                                                     TypeDescription instrumentedType,
                                                     MethodDescription instrumentedMethod) {
-                                return new Resolved.ForStackManipulation(new JavaConstantValue(new JavaConstant.Dynamic(
-                                        name,
-                                        typeDescription,
-                                        new JavaConstant.MethodHandle(bootstrapType,
-                                                bootstrapOwner.represents(void.class) ? instrumentedType : bootstrapOwner,
-                                                bootstrapName,
-                                                bootstrapReturnType,
-                                                bootstrapParameterTypes),
-                                        arguments)));
+                                if (invokedynamic) {
+                                    return new Resolved.ForStackManipulation(new Invokedynamic(name,
+                                            JavaConstant.MethodType.of(typeDescription),
+                                            new JavaConstant.MethodHandle(bootstrapType,
+                                                    bootstrapOwner.represents(void.class) ? instrumentedType : bootstrapOwner,
+                                                    bootstrapName,
+                                                    bootstrapReturnType,
+                                                    bootstrapParameterTypes),
+                                            arguments));
+                                } else {
+                                    return new Resolved.ForStackManipulation(new JavaConstantValue(new JavaConstant.Dynamic(
+                                            name,
+                                            typeDescription,
+                                            new JavaConstant.MethodHandle(bootstrapType,
+                                                    bootstrapOwner.represents(void.class) ? instrumentedType : bootstrapOwner,
+                                                    bootstrapName,
+                                                    bootstrapReturnType,
+                                                    bootstrapParameterTypes),
+                                            arguments)));
+                                }
                             }
 
                             /**
@@ -4814,6 +4833,11 @@ protected enum Factory implements OffsetMapping.Factory<DynamicConstant> {
                                  */
                                 private static final MethodDescription.InDefinedShape BOOTSTRAP_PARAMETER_TYPES;
 
+                                /**
+                                 * The {@link DynamicConstant#invokedynamic()} method.
+                                 */
+                                private static final MethodDescription.InDefinedShape INVOKEDYNAMIC;
+
                                 /*
                                  * Resolves all annotation properties.
                                  */
@@ -4825,6 +4849,7 @@ protected enum Factory implements OffsetMapping.Factory<DynamicConstant> {
                                     BOOTSTRAP_NAME = methods.filter(named("bootstrapName")).getOnly();
                                     BOOTSTRAP_RETURN_TYPE = methods.filter(named("bootstrapReturnType")).getOnly();
                                     BOOTSTRAP_PARAMETER_TYPES = methods.filter(named("bootstrapParameterTypes")).getOnly();
+                                    INVOKEDYNAMIC = methods.filter(named("invokedynamic")).getOnly();
                                 }
 
                                 /**
@@ -4853,7 +4878,8 @@ public OffsetMapping make(ParameterDescription.InDefinedShape target, Annotation
                                             annotation.getValue(BOOTSTRAP_NAME).resolve(String.class),
                                             annotation.getValue(BOOTSTRAP_RETURN_TYPE).resolve(TypeDescription.class),
                                             Arrays.asList(annotation.getValue(BOOTSTRAP_PARAMETER_TYPES).resolve(TypeDescription[].class)),
-                                            Collections.<JavaConstant>emptyList());
+                                            Collections.<JavaConstant>emptyList(),
+                                            annotation.getValue(INVOKEDYNAMIC).resolve(Boolean.class));
                                 }
                             }
                         }

byte-buddy-dep/src/test/java-7/net/bytebuddy/test/precompiled/v7/MemberSubstitutionDynamicConstant.java

@@ -20,7 +20,8 @@ public static MemberSubstitutionDynamicConstant intercept(@MemberSubstitution.Dy
             bootstrapName = "invokedynamic",
             bootstrapOwner = MemberSubstitutionDynamicConstant.class,
             bootstrapReturnType = CallSite.class,
-            bootstrapParameterTypes = Object[].class) MemberSubstitutionDynamicConstant constant) throws Throwable {
+            bootstrapParameterTypes = Object[].class,
+            invokedynamic = true) MemberSubstitutionDynamicConstant constant) throws Throwable {
         return constant;
     }
 

byte-buddy-dep/src/test/java/net/bytebuddy/asm/MemberSubstitutionChainWithAnnotationTest.java

@@ -321,12 +321,12 @@ public void testDynamicConstantInvokedynamic() throws Exception {
                 .visit(MemberSubstitution.strict()
                         .field(named(FOO))
                         .replaceWithChain(MemberSubstitution.Substitution.Chain.Step.ForDelegation.to(bootstrap.getMethod("intercept", bootstrap)))
-                        .on(named(RUN)))
+                        .on(named(FOO)))
                 .make()
                 .load(ClassLoadingStrategy.BOOTSTRAP_LOADER, ClassLoadingStrategy.Default.WRAPPER)
                 .getLoaded();
         Object instance = type.getDeclaredConstructor().newInstance();
-        assertThat(type.getDeclaredMethod(RUN).invoke(instance), instanceOf(bootstrap));
+        assertThat(type.getDeclaredMethod(FOO).invoke(instance), instanceOf(type));
     }
 
     @Test
@@ -338,12 +338,12 @@ public void testDynamicConstant() throws Exception {
                 .visit(MemberSubstitution.strict()
                         .field(named(FOO))
                         .replaceWithChain(MemberSubstitution.Substitution.Chain.Step.ForDelegation.to(bootstrap.getMethod("intercept", bootstrap)))
-                        .on(named(RUN)))
+                        .on(named(FOO)))
                 .make()
                 .load(ClassLoadingStrategy.BOOTSTRAP_LOADER, ClassLoadingStrategy.Default.WRAPPER)
                 .getLoaded();
         Object instance = type.getDeclaredConstructor().newInstance();
-        assertThat(type.getDeclaredMethod(RUN).invoke(instance), instanceOf(bootstrap));
+        assertThat(type.getDeclaredMethod(FOO).invoke(instance), instanceOf(type));
     }
 
     @Test