Support JDK9

Fixes #12.
bdonlan · Sep 30, 2017 · dc8f860 · dc8f860
1 parent 60f46a0
commit dc8f860
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/jmh-benchmark/pom.xml b/jmh-benchmark/pom.xml
@@ -73,7 +73,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jmh.version>1.6.1</jmh.version>
+        <jmh.version>1.19</jmh.version>
         <javac.target>1.8</javac.target>
         <uberjar.name>benchmarks</uberjar.name>
     </properties>

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -96,7 +96,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>3.0.0-M1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -136,18 +136,18 @@
             <!-- Pull in asm-util and etc for tests and ad-hoc debugging convenience -->
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-all</artifactId>
-            <version>5.0.3</version>
+            <version>6.0_BETA</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <version>5.0.3</version>
+            <version>6.0_BETA</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
+            <artifactId>mockito-core</artifactId>
+            <version>2.10.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/lib/src/main/java/net/fushizen/invokedynamic/proxy/DynamicProxy.java b/lib/src/main/java/net/fushizen/invokedynamic/proxy/DynamicProxy.java
@@ -419,9 +419,11 @@ private static void emitMethod(
         int access = ACC_PROTECTED;
         ConcreteMethodTracker concreteMethodTracker = new ConcreteMethodTracker();
 
+        boolean isInterface = true;
         for (Method m : contributors) {
             concreteMethodTracker.add(m);
 
+            isInterface &= m.getDeclaringClass().isInterface();
             if (Modifier.PUBLIC == (m.getModifiers() & Modifier.PUBLIC)) {
                 access = ACC_PUBLIC;
             }
@@ -472,7 +474,8 @@ private static void emitMethod(
                     H_INVOKESPECIAL,
                     Type.getInternalName(superMethod.getDeclaringClass()),
                     superMethod.getName(),
-                    Type.getMethodDescriptor(superMethod)
+                    Type.getMethodDescriptor(superMethod),
+                    isInterface
             );
         }