1 files changed, 13 insertions, 114 deletions

diff --git a/src/proguard/optimize/evaluation/VariableOptimizer.java b/src/proguard/optimize/evaluation/VariableOptimizer.java
index a824481..b3ae81c 100644
--- a/src/proguard/optimize/evaluation/VariableOptimizer.java
+++ b/src/proguard/optimize/evaluation/VariableOptimizer.java
@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2011 Eric Lafortune (eric@graphics.cornell.edu)
+ * Copyright (c) 2002-2009 Eric Lafortune (eric@graphics.cornell.edu)
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -21,10 +21,10 @@
 package proguard.optimize.evaluation;
 
 import proguard.classfile.*;
-import proguard.classfile.attribute.visitor.*;
-import proguard.classfile.editor.*;
 import proguard.classfile.visitor.MemberVisitor;
 import proguard.classfile.attribute.*;
+import proguard.classfile.attribute.visitor.AttributeVisitor;
+import proguard.classfile.editor.VariableRemapper;
 import proguard.classfile.util.*;
 
 /**
@@ -35,9 +35,7 @@ import proguard.classfile.util.*;
  */
 public class VariableOptimizer
 extends      SimplifiedVisitor
-implements   AttributeVisitor,
-             LocalVariableInfoVisitor,
-             LocalVariableTypeInfoVisitor
+implements   AttributeVisitor
 {
     //*
     private static final boolean DEBUG = false;
@@ -53,7 +51,6 @@ implements   AttributeVisitor,
 
     private final LivenessAnalyzer livenessAnalyzer = new LivenessAnalyzer();
     private final VariableRemapper variableRemapper = new VariableRemapper();
-    private       VariableCleaner  variableCleaner  = new VariableCleaner();
 
     private int[] variableMap = new int[ClassConstants.TYPICAL_VARIABLES_SIZE];
 
@@ -104,11 +101,6 @@ implements   AttributeVisitor,
         // Analyze the liveness of the variables in the code.
         livenessAnalyzer.visitCodeAttribute(clazz, method, codeAttribute);
 
-        // Trim the variables in the local variable tables, because even
-        // clipping the tables individually may leave some inconsistencies
-        // between them.
-            codeAttribute.attributesAccept(clazz, method, this);
-
         int startIndex =
             (method.getAccessFlags() & ClassConstants.INTERNAL_ACC_STATIC) != 0 ||
             reuseThis ? 0 : 1;
@@ -150,19 +142,23 @@ implements   AttributeVisitor,
             }
         }
 
-        // Have we been able to remap any variables?
+        // Remap the variables.
         if (remapping)
         {
             if (DEBUG)
             {
-                System.out.println("VariableOptimizer: "+clazz.getName()+"."+method.getName(clazz)+method.getDescriptor(clazz));
-                for (int index= 0; index < variableSize; index++)
+                System.out.println("Remapping variables:");
+                System.out.println("  Class "+ ClassUtil.externalClassName(clazz.getName()));
+                System.out.println("  Method "+ClassUtil.externalFullMethodDescription(clazz.getName(),
+                                                                                       0,
+                                                                                       method.getName(clazz),
+                                                                                       method.getDescriptor(clazz)));
+                for (int index = 0; index < variableSize; index++)
                 {
-                    System.out.println("  v"+index+" -> "+variableMap[index]);
+                    System.out.println("  ["+index+"] -> ["+variableMap[index]+"]");
                 }
             }
 
-            // Remap the variables.
             variableRemapper.setVariableMap(variableMap);
             variableRemapper.visitCodeAttribute(clazz, method, codeAttribute);
 
@@ -172,59 +168,6 @@ implements   AttributeVisitor,
                 method.accept(clazz, extraVariableMemberVisitor);
             }
         }
-        else
-        {
-            // Just clean up any empty variables.
-            variableCleaner.visitCodeAttribute(clazz, method, codeAttribute);
-        }
-    }
-
-
-    public void visitLocalVariableTableAttribute(Clazz clazz, Method method, CodeAttribute codeAttribute, LocalVariableTableAttribute localVariableTableAttribute)
-    {
-        // Trim the variables in the local variable table.
-        localVariableTableAttribute.localVariablesAccept(clazz, method, codeAttribute, this);
-    }
-
-
-    public void visitLocalVariableTypeTableAttribute(Clazz clazz, Method method, CodeAttribute codeAttribute, LocalVariableTypeTableAttribute localVariableTypeTableAttribute)
-    {
-        // Trim the variables in the local variable type table.
-        localVariableTypeTableAttribute.localVariablesAccept(clazz, method, codeAttribute, this);
-    }
-
-
-    // Implementations for LocalVariableInfoVisitor.
-
-    public void visitLocalVariableInfo(Clazz clazz, Method method, CodeAttribute codeAttribute, LocalVariableInfo localVariableInfo)
-    {
-        // Trim the local variable to the instructions at which it is alive.
-        int variable = localVariableInfo.u2index;
-        int startPC  = localVariableInfo.u2startPC;
-        int endPC    = startPC + localVariableInfo.u2length;
-
-        startPC = firstLiveness(startPC, endPC, variable);
-        endPC   = lastLiveness(startPC, endPC, variable);
-
-        localVariableInfo.u2startPC = startPC;
-        localVariableInfo.u2length  = endPC - startPC;
-    }
-
-
-    // Implementations for LocalVariableTypeInfoVisitor.
-
-    public void visitLocalVariableTypeInfo(Clazz clazz, Method method, CodeAttribute codeAttribute, LocalVariableTypeInfo localVariableTypeInfo)
-    {
-        // Trim the local variable type to the instructions at which it is alive.
-        int variable = localVariableTypeInfo.u2index;
-        int startPC  = localVariableTypeInfo.u2startPC;
-        int endPC    = startPC + localVariableTypeInfo.u2length;
-
-        startPC = firstLiveness(startPC, endPC, variable);
-        endPC   = lastLiveness(startPC, endPC, variable);
-
-        localVariableTypeInfo.u2startPC = startPC;
-        localVariableTypeInfo.u2length  = endPC - startPC;
     }
 
 
@@ -298,48 +241,4 @@ implements   AttributeVisitor,
             }
         }
     }
-
-
-    /**
-     * Returns the first instruction offset between the given offsets at which
-     * the given variable goes alive.
-     */
-    private int firstLiveness(int startOffset, int endOffset, int variableIndex)
-    {
-        for (int offset = startOffset; offset < endOffset; offset++)
-        {
-            if (livenessAnalyzer.isTraced(offset) &&
-                livenessAnalyzer.isAliveBefore(offset, variableIndex))
-            {
-                return offset;
-            }
-        }
-
-        return endOffset;
-    }
-
-
-    /**
-     * Returns the last instruction offset between the given offsets before
-     * which the given variable is still alive.
-     */
-    private int lastLiveness(int startOffset, int endOffset, int variableIndex)
-    {
-        int previousOffset = endOffset;
-
-        for (int offset = endOffset-1; offset >= startOffset; offset--)
-        {
-            if (livenessAnalyzer.isTraced(offset))
-            {
-                if (livenessAnalyzer.isAliveBefore(offset, variableIndex))
-                {
-                    return previousOffset;
-                }
-
-                previousOffset = offset;
-            }
-        }
-
-        return endOffset;
-    }
 }