sometsome 3.10.50 → 3.10.50.37

data/lib/proguard4.7/src/proguard/optimize/peephole/UnreachableCodeRemover.java

@@ -1,143 +0,0 @@
-/*
- * ProGuard -- shrinking, optimization, obfuscation, and preverification
- *             of Java bytecode.
- *
- * Copyright (c) 2002-2011 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
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-package proguard.optimize.peephole;
-
-import proguard.classfile.*;
-import proguard.classfile.attribute.*;
-import proguard.classfile.attribute.visitor.AttributeVisitor;
-import proguard.classfile.editor.CodeAttributeEditor;
-import proguard.classfile.instruction.Instruction;
-import proguard.classfile.instruction.visitor.InstructionVisitor;
-import proguard.classfile.util.SimplifiedVisitor;
-
-/**
- * This InstructionVisitor deletes blocks of code that can never be reached by
- * regular calls or branches.
- *
- * @author Eric Lafortune
- */
-public class UnreachableCodeRemover
-extends      SimplifiedVisitor
-implements   AttributeVisitor,
-             InstructionVisitor
-{
-    //*
-    private static final boolean DEBUG = false;
-    /*/
-    private static       boolean DEBUG = true;
-    //*/
-
-    private final InstructionVisitor  extraInstructionVisitor;
-
-    private final ReachableCodeMarker reachableCodeMarker = new ReachableCodeMarker();
-    private final CodeAttributeEditor codeAttributeEditor = new CodeAttributeEditor();
-
-
-    /**
-     * Creates a new UnreachableCodeRemover.
-     */
-    public UnreachableCodeRemover()
-    {
-        this(null);
-    }
-
-
-    /**
-     * Creates a new UnreachableCodeRemover.
-     * @param extraInstructionVisitor an optional extra visitor for all
-     *                                deleted instructions.
-     */
-    public UnreachableCodeRemover(InstructionVisitor  extraInstructionVisitor)
-    {
-        this.extraInstructionVisitor = extraInstructionVisitor;
-    }
-
-
-    // Implementations for AttributeVisitor.
-
-    public void visitAnyAttribute(Clazz clazz, Attribute attribute) {}
-
-
-    public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAttribute)
-    {
-//        DEBUG =
-//            clazz.getName().equals("abc/Def") &&
-//            method.getName(clazz).equals("abc");
-
-        // TODO: Remove this when the code has stabilized.
-        // Catch any unexpected exceptions from the actual visiting method.
-        try
-        {
-            // Process the code.
-            visitCodeAttribute0(clazz, method, codeAttribute);
-        }
-        catch (RuntimeException ex)
-        {
-            System.err.println("Unexpected error while removing unreachable code:");
-            System.err.println("  Class       = ["+clazz.getName()+"]");
-            System.err.println("  Method      = ["+method.getName(clazz)+method.getDescriptor(clazz)+"]");
-            System.err.println("  Exception   = ["+ex.getClass().getName()+"] ("+ex.getMessage()+")");
-
-            throw ex;
-        }
-    }
-
-
-    public void visitCodeAttribute0(Clazz clazz, Method method, CodeAttribute codeAttribute)
-    {
-        if (DEBUG)
-        {
-            System.out.println("UnreachableCodeRemover: "+clazz.getName()+"."+method.getName(clazz)+method.getDescriptor(clazz));
-        }
-
-        reachableCodeMarker.visitCodeAttribute(clazz, method, codeAttribute);
-
-        codeAttributeEditor.reset(codeAttribute.u4codeLength);
-
-        codeAttribute.instructionsAccept(clazz, method, this);
-
-        codeAttributeEditor.visitCodeAttribute(clazz, method, codeAttribute);
-    }
-
-
-    // Implementations for InstructionVisitor.
-
-    public void visitAnyInstruction(Clazz clazz, Method method, CodeAttribute codeAttribute, int offset, Instruction instruction)
-    {
-        if (DEBUG)
-        {
-            System.out.println("  "+(reachableCodeMarker.isReachable(offset) ? "+" : "-")+" "+instruction.toString(offset));
-        }
-
-        // Is this instruction unreachable?
-        if (!reachableCodeMarker.isReachable(offset))
-        {
-            // Then delete it.
-            codeAttributeEditor.deleteInstruction(offset);
-
-            // Visit the instruction, if required.
-            if (extraInstructionVisitor != null)
-            {
-                instruction.accept(clazz, method, codeAttribute, offset, extraInstructionVisitor);
-            }
-        }
-    }
-}

data/lib/proguard4.7/src/proguard/optimize/peephole/UnreachableExceptionRemover.java

@@ -1,163 +0,0 @@
-/*
- * ProGuard -- shrinking, optimization, obfuscation, and preverification
- *             of Java bytecode.
- *
- * Copyright (c) 2002-2011 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
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-package proguard.optimize.peephole;
-
-import proguard.classfile.*;
-import proguard.classfile.attribute.*;
-import proguard.classfile.attribute.visitor.*;
-import proguard.classfile.instruction.*;
-import proguard.classfile.util.SimplifiedVisitor;
-import proguard.optimize.info.ExceptionInstructionChecker;
-
-/**
- * This AttributeVisitor removes exception handlers that are unreachable in the
- * code attributes that it visits.
- *
- * @author Eric Lafortune
- */
-public class UnreachableExceptionRemover
-extends      SimplifiedVisitor
-implements   AttributeVisitor,
-             ExceptionInfoVisitor
-{
-    private final ExceptionInfoVisitor extraExceptionInfoVisitor;
-
-
-    private final ExceptionInstructionChecker exceptionInstructionChecker = new ExceptionInstructionChecker();
-
-
-    /**
-     * Creates a new UnreachableExceptionRemover.
-     */
-    public UnreachableExceptionRemover()
-    {
-        this(null);
-    }
-
-
-    /**
-     * Creates a new UnreachableExceptionRemover.
-     * @param extraExceptionInfoVisitor an optional extra visitor for all
-     *                                  removed exceptions.
-     */
-    public UnreachableExceptionRemover(ExceptionInfoVisitor extraExceptionInfoVisitor)
-    {
-        this.extraExceptionInfoVisitor = extraExceptionInfoVisitor;
-    }
-
-
-    // Implementations for AttributeVisitor.
-
-    public void visitAnyAttribute(Clazz clazz, Attribute attribute) {}
-
-
-    public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAttribute)
-    {
-        // Go over the exception table.
-        codeAttribute.exceptionsAccept(clazz, method, this);
-
-        // Remove exceptions with empty code blocks.
-        codeAttribute.u2exceptionTableLength =
-            removeEmptyExceptions(codeAttribute.exceptionTable,
-                                  codeAttribute.u2exceptionTableLength);
-    }
-
-
-    // Implementations for ExceptionInfoVisitor.
-
-    public void visitExceptionInfo(Clazz clazz, Method method, CodeAttribute codeAttribute, ExceptionInfo exceptionInfo)
-    {
-        if (!mayThrowExceptions(clazz,
-                                method,
-                                codeAttribute,
-                                exceptionInfo.u2startPC,
-                                exceptionInfo.u2endPC))
-        {
-            // Make the code block empty.
-            exceptionInfo.u2endPC = exceptionInfo.u2startPC;
-
-            if (extraExceptionInfoVisitor != null)
-            {
-                extraExceptionInfoVisitor.visitExceptionInfo(clazz, method, codeAttribute, exceptionInfo);
-            }
-        }
-    }
-
-
-    // Small utility methods.
-
-    /**
-     * Returns whether the specified block of code may throw exceptions.
-     */
-    private boolean mayThrowExceptions(Clazz         clazz,
-                                       Method        method,
-                                       CodeAttribute codeAttribute,
-                                       int           startOffset,
-                                       int           endOffset)
-    {
-        byte[] code = codeAttribute.code;
-
-        // Go over all instructions.
-        int offset = startOffset;
-        while (offset < endOffset)
-        {
-            // Get the current instruction.
-            Instruction instruction = InstructionFactory.create(code, offset);
-
-            // Check if it may be throwing exceptions.
-            if (exceptionInstructionChecker.mayThrowExceptions(clazz,
-                                                               method,
-                                                               codeAttribute,
-                                                               offset,
-                                                               instruction))
-            {
-                return true;
-            }
-
-            // Go to the next instruction.
-            offset += instruction.length(offset);
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Returns the given list of exceptions, without the ones that have empty
-     * code blocks.
-     */
-    private int removeEmptyExceptions(ExceptionInfo[] exceptionInfos,
-                                      int             exceptionInfoCount)
-    {
-        // Overwrite all empty exceptions.
-        int newIndex = 0;
-        for (int index = 0; index < exceptionInfoCount; index++)
-        {
-            ExceptionInfo exceptionInfo = exceptionInfos[index];
-            if (exceptionInfo.u2startPC < exceptionInfo.u2endPC)
-            {
-                exceptionInfos[newIndex++] = exceptionInfo;
-            }
-        }
-
-        return newIndex;
-    }
-}

data/lib/proguard4.7/src/proguard/optimize/peephole/VariableShrinker.java

@@ -1,129 +0,0 @@
-/*
- * ProGuard -- shrinking, optimization, obfuscation, and preverification
- *             of Java bytecode.
- *
- * Copyright (c) 2002-2011 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
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-package proguard.optimize.peephole;
-
-import proguard.classfile.*;
-import proguard.classfile.attribute.*;
-import proguard.classfile.attribute.visitor.AttributeVisitor;
-import proguard.classfile.editor.VariableEditor;
-import proguard.classfile.util.*;
-import proguard.classfile.visitor.MemberVisitor;
-import proguard.optimize.*;
-import proguard.optimize.info.*;
-
-/**
- * This MemberVisitor removes unused local variables from the code of the methods
- * that it visits.
- *
- * @see ParameterUsageMarker
- * @see MethodStaticizer
- * @see MethodDescriptorShrinker
- * @author Eric Lafortune
- */
-public class VariableShrinker
-extends      SimplifiedVisitor
-implements   AttributeVisitor
-{
-    private static final boolean DEBUG = false;
-
-
-    private final MemberVisitor extraVariableMemberVisitor;
-
-    private final VariableUsageMarker variableUsageMarker = new VariableUsageMarker();
-    private final VariableEditor      variableEditor      = new VariableEditor();
-
-
-    /**
-     * Creates a new VariableShrinker.
-     */
-    public VariableShrinker()
-    {
-        this(null);
-    }
-
-
-    /**
-     * Creates a new VariableShrinker with an extra visitor.
-     * @param extraVariableMemberVisitor an optional extra visitor for all
-     *                                   removed variables.
-     */
-    public VariableShrinker(MemberVisitor extraVariableMemberVisitor)
-    {
-        this.extraVariableMemberVisitor = extraVariableMemberVisitor;
-    }
-
-
-    // Implementations for AttributeVisitor.
-
-    public void visitAnyAttribute(Clazz clazz, Attribute attribute) {}
-
-
-    public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAttribute)
-    {
-        if ((method.getAccessFlags() & ClassConstants.INTERNAL_ACC_ABSTRACT) == 0)
-        {
-            // Compute the parameter size.
-            int parameterSize =
-                ClassUtil.internalMethodParameterSize(method.getDescriptor(clazz),
-                                                      method.getAccessFlags());
-
-            // Get the total size of the local variable frame.
-            int maxLocals = codeAttribute.u2maxLocals;
-
-            if (DEBUG)
-            {
-                System.out.println("VariableShrinker: "+clazz.getName()+"."+method.getName(clazz)+method.getDescriptor(clazz));
-                System.out.println("  Parameter size = " + parameterSize);
-                System.out.println("  Max locals     = " + maxLocals);
-            }
-
-            // Figure out the local variables that are used by the code.
-            variableUsageMarker.visitCodeAttribute(clazz, method, codeAttribute);
-
-            // Delete unused local variables from the local variable frame.
-            variableEditor.reset(maxLocals);
-
-            for (int variableIndex = parameterSize; variableIndex < maxLocals; variableIndex++)
-            {
-                // Is the variable not required?
-                if (!variableUsageMarker.isVariableUsed(variableIndex))
-                {
-                    if (DEBUG)
-                    {
-                        System.out.println("  Deleting local variable #"+variableIndex);
-                    }
-
-                    // Delete the unused variable.
-                    variableEditor.deleteVariable(variableIndex);
-
-                    // Visit the method, if required.
-                    if (extraVariableMemberVisitor != null)
-                    {
-                        method.accept(clazz, extraVariableMemberVisitor);
-                    }
-                }
-            }
-
-            // Shift all remaining parameters and variables in the byte code.
-            variableEditor.visitCodeAttribute(clazz, method, codeAttribute);
-        }
-    }
-}

data/lib/proguard4.7/src/proguard/optimize/peephole/VerticalClassMerger.java

@@ -1,88 +0,0 @@
-/*
- * ProGuard -- shrinking, optimization, obfuscation, and preverification
- *             of Java bytecode.
- *
- * Copyright (c) 2002-2011 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
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-package proguard.optimize.peephole;
-
-import proguard.classfile.ProgramClass;
-import proguard.classfile.constant.visitor.ConstantVisitor;
-import proguard.classfile.util.SimplifiedVisitor;
-import proguard.classfile.visitor.ClassVisitor;
-
-/**
- * This ClassVisitor inlines the direct subclasses into the program classes
- * that it visits, whenever possible.
- *
- * @see ClassMerger
- * @author Eric Lafortune
- */
-public class VerticalClassMerger
-extends      SimplifiedVisitor
-implements   ClassVisitor
-{
-    private final boolean      allowAccessModification;
-    private final boolean      mergeInterfacesAggressively;
-    private final ClassVisitor extraClassVisitor;
-
-
-    /**
-     * Creates a new VerticalClassMerger.
-     * @param allowAccessModification     specifies whether the access modifiers
-     *                                    of classes can be changed in order to
-     *                                    merge them.
-     * @param mergeInterfacesAggressively specifies whether interfaces may
-     *                                    be merged aggressively.
-     */
-    public VerticalClassMerger(boolean allowAccessModification,
-                               boolean mergeInterfacesAggressively)
-    {
-        this(allowAccessModification, mergeInterfacesAggressively, null);
-    }
-
-
-    /**
-     * Creates a new VerticalClassMerger.
-     * @param allowAccessModification     specifies whether the access modifiers
-     *                                    of classes can be changed in order to
-     *                                    merge them.
-     * @param mergeInterfacesAggressively specifies whether interfaces may
-     *                                    be merged aggressively.
-     * @param extraClassVisitor           an optional extra visitor for all
-     *                                    merged classes.
-     */
-    public VerticalClassMerger(boolean      allowAccessModification,
-                               boolean      mergeInterfacesAggressively,
-                               ClassVisitor extraClassVisitor)
-    {
-        this.allowAccessModification     = allowAccessModification;
-        this.mergeInterfacesAggressively = mergeInterfacesAggressively;
-        this.extraClassVisitor           = extraClassVisitor;
-    }
-
-
-    // Implementations for ClassVisitor.
-
-    public void visitProgramClass(ProgramClass programClass)
-    {
-        programClass.subclassesAccept(new ClassMerger(programClass,
-                                                      allowAccessModification,
-                                                      mergeInterfacesAggressively,
-                                                      extraClassVisitor));
-    }
-}