--- old/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java	Fri Oct 27 09:23:52 2017
+++ new/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java	Fri Oct 27 09:23:51 2017
@@ -406,7 +406,16 @@
      */
     public static Type getReturnType(final String methodDescriptor) {
         char[] buf = methodDescriptor.toCharArray();
-        return getType(buf, methodDescriptor.indexOf(')') + 1);
+        int off = 1;
+        while (true) {
+            char car = buf[off++];
+            if (car == ')') {
+                return getType(buf, off);
+            } else if (car == 'L') {
+                while (buf[off++] != ';') {
+                }
+            }
+        }
     }
 
     /**