--- old/src/jdk.jextract/share/classes/com/sun/tools/jextract/JType.java 2019-04-24 19:38:30.000000000 +0530 +++ new/src/jdk.jextract/share/classes/com/sun/tools/jextract/JType.java 2019-04-24 19:38:29.000000000 +0530 @@ -22,16 +22,10 @@ */ package com.sun.tools.jextract; -import jdk.internal.org.objectweb.asm.ClassVisitor; import java.foreign.memory.Callback; import java.foreign.memory.Pointer; import java.util.Objects; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_ABSTRACT; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_INTERFACE; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; - /** * A Java Type descriptor */ @@ -44,7 +38,6 @@ */ public abstract String getDescriptor(); - public void visitInner(ClassVisitor cv) {} public String getSignature(boolean isArgument) { return getDescriptor(); } @@ -183,14 +176,6 @@ return clsName; } } - - @Override - public void visitInner(ClassVisitor cv) { - if (enclosingName != null) { - cv.visitInnerClass(clsName, enclosingName, simpleName, - ACC_PUBLIC | ACC_STATIC | ACC_ABSTRACT | ACC_INTERFACE); - } - } } public final static class ArrayType extends JType { @@ -206,11 +191,6 @@ } @Override - public void visitInner(ClassVisitor cv) { - elementType.visitInner(cv); - } - - @Override public String getSignature(boolean isArgument) { StringBuilder sb = new StringBuilder(); sb.append("L"); @@ -282,14 +262,6 @@ } @Override - public void visitInner(ClassVisitor cv) { - returnType.visitInner(cv); - for (JType at : args) { - at.visitInner(cv); - } - } - - @Override public String getSignature(boolean isArgument) { StringBuilder sb = new StringBuilder(); sb.append('('); @@ -321,12 +293,6 @@ Function getFunction() { return fn; } - - @Override - public void visitInner(ClassVisitor cv) { - fn.visitInner(cv); - super.visitInner(cv); - } } public static class GenericType extends ClassType { @@ -383,11 +349,5 @@ public static GenericType ofCallback(JType targ) { return new GenericType(JType.binaryName(Callback.class), targ); } - - @Override - public void visitInner(ClassVisitor cv) { - targ.visitInner(cv); - super.visitInner(cv); - } } }