fix compiler error in generating asmifier of dex file

--HG-- branch : 2.x
pxb1988 · May 29, 2015 · d69d6c1 · d69d6c1
1 parent d09c422
commit d69d6c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/dex-reader/src/main/java/com/googlecode/d2j/util/ASMifierClassV.java b/dex-reader/src/main/java/com/googlecode/d2j/util/ASMifierClassV.java
@@ -47,6 +47,7 @@ public ASMifierClassV(String pkgName, String javaClassName, int access_flags, St
         out.s("import com.googlecode.d2j.*;");
         out.s("import com.googlecode.d2j.visitors.*;");
         out.s("import static com.googlecode.d2j.DexConstants.*;");
+        out.s("import static com.googlecode.d2j.reader.Op.*;");
         out.s("public class %s {", javaClassName);
         out.push();
         out.s("public static void accept(DexFileVisitor v) {");

diff --git a/dex-reader/src/main/java/com/googlecode/d2j/util/ASMifierCodeV.java b/dex-reader/src/main/java/com/googlecode/d2j/util/ASMifierCodeV.java
@@ -175,9 +175,7 @@ public void visitFillArrayDataStmt(Op op, int ra, Object array) {
 
     @Override
     public DexDebugVisitor visitDebug() {
-        m.s("DexDebugVisitor ddv=code.visitDebug();");
-        m.s("if(ddv!=null){");
-        m.push();
+        m.s("DexDebugVisitor ddv=new DexDebugVisitor(code.visitDebug());");
         return new DexDebugVisitor() {
             @Override
             public void visitParameterName(int reg, String name) {
@@ -217,13 +215,7 @@ public void visitSetFile(String file) {
 
             @Override
             public void visitRestartLocal(int reg, DexLabel label) {
-                m.s("ddv.visitReStartLocal(%d,%s);", reg, v(label));
-            }
-
-            @Override
-            public void visitEnd() {
-                m.pop();
-                m.s("}");
+                m.s("ddv.visitRestartLocal(%d,%s);", reg, v(label));
             }
         };
     }