buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java

Print this page
rev 736 : 8029031: "ant clean jar" on nashorn repo results in number of ASM deprecated warnings
Reviewed-by: lagergren, jlaskey, hannesw

@@ -144,31 +144,31 @@
             @Override
             public void visitInsn(final int opcode) {
                 // call $clinit$ just before return from <clinit>
                 if (isStaticInit && opcode == RETURN) {
                     super.visitMethodInsn(INVOKESTATIC, scriptClassInfo.getJavaName(),
-                            $CLINIT$, DEFAULT_INIT_DESC);
+                            $CLINIT$, DEFAULT_INIT_DESC, false);
                 }
                 super.visitInsn(opcode);
             }
 
             @Override
-            public void visitMethodInsn(final int opcode, final String owner, final String name, final String desc) {
+            public void visitMethodInsn(final int opcode, final String owner, final String name, final String desc, final boolean itf) {
                 if (isConstructor && opcode == INVOKESPECIAL &&
                         INIT.equals(name) && SCRIPTOBJECT_TYPE.equals(owner)) {
-                    super.visitMethodInsn(opcode, owner, name, desc);
+                    super.visitMethodInsn(opcode, owner, name, desc, false);
 
                     if (memberCount > 0) {
                         // initialize @Property fields if needed
                         for (final MemberInfo memInfo : scriptClassInfo.getMembers()) {
                             if (memInfo.isInstanceProperty() && !memInfo.getInitClass().isEmpty()) {
                                 final String clazz = memInfo.getInitClass();
                                 super.visitVarInsn(ALOAD, 0);
                                 super.visitTypeInsn(NEW, clazz);
                                 super.visitInsn(DUP);
                                 super.visitMethodInsn(INVOKESPECIAL, clazz,
-                                    INIT, DEFAULT_INIT_DESC);
+                                    INIT, DEFAULT_INIT_DESC, false);
                                 super.visitFieldInsn(PUTFIELD, scriptClassInfo.getJavaName(),
                                     memInfo.getJavaName(), memInfo.getJavaDesc());
                             }
 
                             if (memInfo.isInstanceFunction()) {

@@ -178,11 +178,11 @@
                                     memInfo.getJavaName(), OBJECT_DESC);
                             }
                         }
                     }
                 } else {
-                    super.visitMethodInsn(opcode, owner, name, desc);
+                    super.visitMethodInsn(opcode, owner, name, desc, itf);
                 }
             }
 
             @Override
             public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {