Fix compilation under JDK6.

raphw · raphw · commit f8a6cd11a646 · 2025-01-29T22:08:31.000+01:00
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/asm/MemberSubstitution.java b/byte-buddy-dep/src/main/java/net/bytebuddy/asm/MemberSubstitution.java
@@ -240,7 +240,7 @@ public WithoutSpecification.ForMatchedDynamicInvocation dynamic(ElementMatcher<?
                 matcher,
                 ElementMatchers.<String>any(),
                 ElementMatchers.<JavaConstant.MethodType>any(),
-                ElementMatchers.<List<JavaConstant>>any());
+                ElementMatchers.<List<? extends JavaConstant>>any());
     }
 
     /**
@@ -563,7 +563,7 @@ public static class ForMatchedDynamicInvocation extends WithoutSpecification {
             /**
              * A matcher for an invokedynamic instruction's constant arguments.
              */
-            private final ElementMatcher.Junction<? super List<JavaConstant>> argumentsMatcher;
+            private final ElementMatcher.Junction<? super List<? extends JavaConstant>> argumentsMatcher;
 
             /**
              * Creates a member substitution for an invokedynamic instruction.
@@ -586,7 +586,7 @@ protected ForMatchedDynamicInvocation(MethodGraph.Compiler methodGraphCompiler,
                                                   ElementMatcher<? super JavaConstant.MethodHandle> handleMatcher,
                                                   ElementMatcher.Junction<? super String> nameMatcher,
                                                   ElementMatcher.Junction<? super JavaConstant.MethodType> typeMatcher,
-                                                  ElementMatcher.Junction<? super List<JavaConstant>> argumentsMatcher) {
+                                                  ElementMatcher.Junction<? super List<? extends JavaConstant>> argumentsMatcher) {
                 super(methodGraphCompiler, typePoolResolver, strict, failIfNoMatch, replacementFactory);
                 this.handleMatcher = handleMatcher;
                 this.nameMatcher = nameMatcher;
@@ -607,7 +607,7 @@ public ForMatchedDynamicInvocation withName(ElementMatcher<? super String> nameM
                         failIfNoMatch,
                         replacementFactory,
                         handleMatcher,
-                        this.nameMatcher.and(nameMatcher),
+                        this.nameMatcher.<String>and(nameMatcher),
                         typeMatcher,
                         argumentsMatcher);
             }
@@ -626,7 +626,7 @@ public ForMatchedDynamicInvocation withType(ElementMatcher<? super JavaConstant.
                         replacementFactory,
                         handleMatcher,
                         nameMatcher,
-                        this.typeMatcher.and(typeMatcher),
+                        this.typeMatcher.<JavaConstant.MethodType>and(typeMatcher),
                         argumentsMatcher);
             }
 
@@ -636,7 +636,7 @@ public ForMatchedDynamicInvocation withType(ElementMatcher<? super JavaConstant.
              * @param argumentsMatcher A matcher for an invokedynamic instruction's constant arguments.
              * @return A member substitution for an invokedynamic instruction with constant arguments that are matched by the given matcher.
              */
-            public ForMatchedDynamicInvocation withArguments(ElementMatcher<? super List<JavaConstant>> argumentsMatcher) {
+            public ForMatchedDynamicInvocation withArguments(ElementMatcher<? super List<? extends JavaConstant>> argumentsMatcher) {
                 return new ForMatchedDynamicInvocation(methodGraphCompiler,
                         typePoolResolver,
                         strict,
@@ -645,7 +645,7 @@ public ForMatchedDynamicInvocation withArguments(ElementMatcher<? super List<Jav
                         handleMatcher,
                         nameMatcher,
                         typeMatcher,
-                        this.argumentsMatcher.and(argumentsMatcher));
+                        this.argumentsMatcher.<List<? extends JavaConstant>>and(argumentsMatcher));
             }
 
             @Override
@@ -1126,7 +1126,7 @@ class ForDynamicInvocation implements Target {
             /**
              * The constant arguments that are provided to the invokedynamic instruction.
              */
-            private final List<JavaConstant> arguments;
+            private final List<? extends JavaConstant> arguments;
 
             /**
              * Creates a new target for an invokedynamic instruction.
@@ -1135,7 +1135,7 @@ class ForDynamicInvocation implements Target {
              * @param name       The name that is expected for the bound target.
              * @param arguments  The constant arguments that are provided to the invokedynamic instruction.
              */
-            protected ForDynamicInvocation(JavaConstant.MethodType methodType, String name, List<JavaConstant> arguments) {
+            protected ForDynamicInvocation(JavaConstant.MethodType methodType, String name, List<? extends JavaConstant> arguments) {
                 this.methodType = methodType;
                 this.name = name;
                 this.arguments = arguments;
@@ -1169,7 +1169,7 @@ public String getName() {
              *
              * @return The constant arguments that are provided to the invokedynamic instruction.
              */
-            public List<JavaConstant> getArguments() {
+            public List<? extends JavaConstant> getArguments() {
                 return arguments;
             }
         }
