sometsome 3.10.50 → 3.10.50.33

data/lib/proguard4.7/src/proguard/optimize/ConstantParameterFilter.java

@@ -1,79 +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;
-
-import proguard.classfile.*;
-import proguard.classfile.util.*;
-import proguard.classfile.visitor.MemberVisitor;
-import proguard.evaluation.value.Value;
-import proguard.optimize.evaluation.StoringInvocationUnit;
-import proguard.optimize.info.ParameterUsageMarker;
-
-/**
- * This <code>MemberVisitor</code> delegates its visits to program methods
- * to another given <code>MemberVisitor</code>, for each method parameter
- * that has been marked as constant.
- *
- * @see StoringInvocationUnit
- * @author Eric Lafortune
- */
-public class ConstantParameterFilter
-extends      SimplifiedVisitor
-implements   MemberVisitor
-{
-    private final MemberVisitor constantParameterVisitor;
-
-
-    /**
-     * Creates a new ConstantParameterFilter.
-     * @param constantParameterVisitor the <code>MemberVisitor</code> to which
-     *                                 visits will be delegated.
-     */
-    public ConstantParameterFilter(MemberVisitor constantParameterVisitor)
-    {
-        this.constantParameterVisitor = constantParameterVisitor;
-    }
-
-
-    // Implementations for MemberVisitor.
-
-    public void visitProgramMethod(ProgramClass programClass, ProgramMethod programMethod)
-    {
-        // All parameters of non-static methods are shifted by one in the local
-        // variable frame.
-        int firstParameterIndex =
-            (programMethod.getAccessFlags() & ClassConstants.INTERNAL_ACC_STATIC) != 0 ?
-                0 : 1;
-
-        int parameterCount =
-            ClassUtil.internalMethodParameterCount(programMethod.getDescriptor(programClass));
-
-        for (int index = firstParameterIndex; index < parameterCount; index++)
-        {
-            Value value = StoringInvocationUnit.getMethodParameterValue(programMethod, index);
-            if (value != null &&
-                value.isParticular())
-            {
-                constantParameterVisitor.visitProgramMethod(programClass, programMethod);
-            }
-        }
-    }
-}

data/lib/proguard4.7/src/proguard/optimize/DuplicateInitializerFixer.java

@@ -1,215 +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;
-
-import proguard.classfile.*;
-import proguard.classfile.attribute.visitor.AttributeVisitor;
-import proguard.classfile.attribute.*;
-import proguard.classfile.attribute.annotation.*;
-import proguard.classfile.editor.ConstantPoolEditor;
-import proguard.classfile.util.*;
-import proguard.classfile.visitor.MemberVisitor;
-
-/**
- * This MemberVisitor adds an additional parameter to the duplicate
- * initialization methods that it visits.
- */
-public class DuplicateInitializerFixer
-extends      SimplifiedVisitor
-implements   MemberVisitor,
-             AttributeVisitor
-{
-    private static final boolean DEBUG = false;
-
-    private static final char[] TYPES = new char[]
-    {
-        ClassConstants.INTERNAL_TYPE_BYTE,
-        ClassConstants.INTERNAL_TYPE_CHAR,
-        ClassConstants.INTERNAL_TYPE_SHORT,
-        ClassConstants.INTERNAL_TYPE_INT,
-        ClassConstants.INTERNAL_TYPE_BOOLEAN
-    };
-
-
-    private final MemberVisitor extraFixedInitializerVisitor;
-
-
-    /**
-     * Creates a new DuplicateInitializerFixer.
-     */
-    public DuplicateInitializerFixer()
-    {
-        this(null);
-    }
-
-
-    /**
-     * Creates a new DuplicateInitializerFixer with an extra visitor.
-     * @param extraFixedInitializerVisitor an optional extra visitor for all
-     *                                     initializers that have been fixed.
-     */
-    public DuplicateInitializerFixer(MemberVisitor extraFixedInitializerVisitor)
-    {
-        this.extraFixedInitializerVisitor = extraFixedInitializerVisitor;
-    }
-
-
-    // Implementations for MemberVisitor.
-
-    public void visitProgramMethod(ProgramClass programClass, ProgramMethod programMethod)
-    {
-        // Is it a class instance initializer?
-        String name = programMethod.getName(programClass);
-        if (name.equals(ClassConstants.INTERNAL_METHOD_NAME_INIT))
-        {
-            // Is there already another initializer with the same descriptor?
-            String descriptor    = programMethod.getDescriptor(programClass);
-            Method similarMethod = programClass.findMethod(name, descriptor);
-            if (!programMethod.equals(similarMethod))
-            {
-                // Should this initializer be preserved?
-                if (KeepMarker.isKept(programMethod))
-                {
-                    // Fix the other initializer.
-                    programMethod = (ProgramMethod)similarMethod;
-                }
-
-                int index = descriptor.indexOf(ClassConstants.INTERNAL_METHOD_ARGUMENTS_CLOSE);
-
-                // Try to find a new, unique descriptor.
-                int typeCounter = 0;
-                while (true)
-                {
-                    // Construct the new descriptor by inserting a new type
-                    // as an additional last argument.
-                    StringBuffer newDescriptorBuffer =
-                        new StringBuffer(descriptor.substring(0, index));
-
-                    for (int arrayDimension = 0; arrayDimension < typeCounter / TYPES.length; arrayDimension++)
-                    {
-                        newDescriptorBuffer.append(ClassConstants.INTERNAL_TYPE_ARRAY);
-                    }
-
-                    newDescriptorBuffer.append(TYPES[typeCounter % TYPES.length]);
-                    newDescriptorBuffer.append(descriptor.substring(index));
-
-                    String newDescriptor = newDescriptorBuffer.toString();
-
-                    // Is the new initializer descriptor unique?
-                    if (programClass.findMethod(name, newDescriptor) == null)
-                    {
-                        if (DEBUG)
-                        {
-                            System.out.println("DuplicateInitializerFixer:");
-                            System.out.println("  ["+programClass.getName()+"."+name+descriptor+"] ("+ClassUtil.externalClassAccessFlags(programMethod.getAccessFlags())+") -> ["+newDescriptor+"]");
-                        }
-
-                        // Update the descriptor.
-                        programMethod.u2descriptorIndex =
-                            new ConstantPoolEditor(programClass).addUtf8Constant(newDescriptor);
-
-                        // Fix the local variable frame size, the method
-                        // signature, and the parameter annotations, if
-                        // necessary.
-                        programMethod.attributesAccept(programClass,
-                                                       this);
-
-                        // Visit the initializer, if required.
-                        if (extraFixedInitializerVisitor != null)
-                        {
-                            extraFixedInitializerVisitor.visitProgramMethod(programClass, programMethod);
-                        }
-
-                        // We're done with this constructor.
-                        return;
-                    }
-
-                    typeCounter++;
-                }
-            }
-        }
-    }
-
-
-    // Implementations for AttributeVisitor.
-
-    public void visitAnyAttribute(Clazz clazz, Attribute attribute) {}
-
-
-    public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAttribute)
-    {
-        // The minimum variable size is determined by the arguments.
-        int maxLocals =
-            ClassUtil.internalMethodParameterSize(method.getDescriptor(clazz),
-                                                  method.getAccessFlags());
-
-        if (codeAttribute.u2maxLocals < maxLocals)
-        {
-            codeAttribute.u2maxLocals = maxLocals;
-        }
-    }
-
-
-    public void visitSignatureAttribute(Clazz clazz, Method method, SignatureAttribute signatureAttribute)
-    {
-        String descriptor      = method.getDescriptor(clazz);
-        int    descriptorIndex = descriptor.indexOf(ClassConstants.INTERNAL_METHOD_ARGUMENTS_CLOSE);
-        String signature       = clazz.getString(signatureAttribute.u2signatureIndex);
-        int    signatureIndex  = signature.indexOf(ClassConstants.INTERNAL_METHOD_ARGUMENTS_CLOSE);
-
-        String newSignature = signature.substring(0, signatureIndex) +
-                              descriptor.charAt(descriptorIndex - 1) +
-                              signature.substring(signatureIndex);
-
-        // Update the signature.
-        signatureAttribute.u2signatureIndex =
-            new ConstantPoolEditor((ProgramClass)clazz).addUtf8Constant(newSignature);
-    }
-
-
-    public void visitAnyParameterAnnotationsAttribute(Clazz clazz, Method method, ParameterAnnotationsAttribute parameterAnnotationsAttribute)
-    {
-        // Update the number of parameters.
-        int oldParametersCount = parameterAnnotationsAttribute.u2parametersCount++;
-
-        if (parameterAnnotationsAttribute.u2parameterAnnotationsCount == null ||
-            parameterAnnotationsAttribute.u2parameterAnnotationsCount.length < parameterAnnotationsAttribute.u2parametersCount)
-        {
-            int[]          annotationsCounts = new int[parameterAnnotationsAttribute.u2parametersCount];
-            Annotation[][] annotations       = new Annotation[parameterAnnotationsAttribute.u2parametersCount][];
-
-            System.arraycopy(parameterAnnotationsAttribute.u2parameterAnnotationsCount,
-                             0,
-                             annotationsCounts,
-                             0,
-                             oldParametersCount);
-
-            System.arraycopy(parameterAnnotationsAttribute.parameterAnnotations,
-                             0,
-                             annotations,
-                             0,
-                             oldParametersCount);
-
-            parameterAnnotationsAttribute.u2parameterAnnotationsCount = annotationsCounts;
-            parameterAnnotationsAttribute.parameterAnnotations        = annotations;
-        }
-    }
-}

data/lib/proguard4.7/src/proguard/optimize/DuplicateInitializerInvocationFixer.java

@@ -1,161 +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;
-
-import proguard.classfile.*;
-import proguard.classfile.attribute.*;
-import proguard.classfile.attribute.visitor.AttributeVisitor;
-import proguard.classfile.constant.*;
-import proguard.classfile.constant.visitor.ConstantVisitor;
-import proguard.classfile.editor.CodeAttributeEditor;
-import proguard.classfile.instruction.*;
-import proguard.classfile.instruction.visitor.InstructionVisitor;
-import proguard.classfile.util.*;
-import proguard.classfile.visitor.MemberVisitor;
-
-/**
- * This AttributeVisitor adds an additional integer parameter to the tweaked
- * initialization method invocations that it visits.
- */
-public class DuplicateInitializerInvocationFixer
-extends      SimplifiedVisitor
-implements   AttributeVisitor,
-             InstructionVisitor,
-             ConstantVisitor,
-             MemberVisitor
-{
-    private static final boolean DEBUG = false;
-
-    private final InstructionVisitor extraAddedInstructionVisitor;
-
-    private final CodeAttributeEditor codeAttributeEditor = new CodeAttributeEditor();
-
-    private String descriptor;
-    private int    descriptorLengthDelta;
-
-
-    /**
-     * Creates a new DuplicateInitializerInvocationFixer.
-     */
-    public DuplicateInitializerInvocationFixer()
-    {
-        this(null);
-    }
-
-
-    /**
-     * Creates a new DuplicateInitializerInvocationFixer.
-     * @param extraAddedInstructionVisitor an optional extra visitor for all
-     *                                     added instructions.
-     */
-    public DuplicateInitializerInvocationFixer(InstructionVisitor extraAddedInstructionVisitor)
-    {
-        this.extraAddedInstructionVisitor = extraAddedInstructionVisitor;
-    }
-
-
-   // Implementations for AttributeVisitor.
-
-    public void visitAnyAttribute(Clazz clazz, Attribute attribute) {}
-
-
-    public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAttribute)
-    {
-
-        // Reset the code changes.
-        codeAttributeEditor.reset(codeAttribute.u4codeLength);
-
-        // Fix any duplicate constructor invocations.
-        codeAttribute.instructionsAccept(clazz,
-                                         method,
-                                         this);
-
-        // Apply all accumulated changes to the code.
-        codeAttributeEditor.visitCodeAttribute(clazz, method, codeAttribute);
-    }
-
-
-    // Implementations for InstructionVisitor.
-
-    public void visitAnyInstruction(Clazz clazz, Method method, CodeAttribute codeAttribute, int offset, Instruction instruction) {}
-
-
-    public void visitConstantInstruction(Clazz clazz, Method method, CodeAttribute codeAttribute, int offset, ConstantInstruction constantInstruction)
-    {
-        if (constantInstruction.opcode == InstructionConstants.OP_INVOKESPECIAL)
-        {
-            descriptorLengthDelta = 0;
-            clazz.constantPoolEntryAccept(constantInstruction.constantIndex, this);
-
-            if (descriptorLengthDelta > 0)
-            {
-                Instruction extraInstruction =
-                    new SimpleInstruction(descriptorLengthDelta == 1 ?
-                                              InstructionConstants.OP_ICONST_0 :
-                                              InstructionConstants.OP_ACONST_NULL);
-
-                codeAttributeEditor.insertBeforeInstruction(offset,
-                                                            extraInstruction);
-
-                if (DEBUG)
-                {
-                    System.out.println("  ["+clazz.getName()+"."+method.getName(clazz)+method.getDescriptor(clazz)+"] Inserting "+extraInstruction.toString()+" before "+constantInstruction.toString(offset));
-                }
-
-                if (extraAddedInstructionVisitor != null)
-                {
-                    extraInstruction.accept(null, null, null, offset, extraAddedInstructionVisitor);
-                }
-            }
-        }
-    }
-
-
-    // Implementations for ConstantVisitor.
-
-    public void visitMethodrefConstant(Clazz clazz, MethodrefConstant methodrefConstant)
-    {
-        // Check the referenced constructor descriptor.
-        descriptor = methodrefConstant.getType(clazz);
-        methodrefConstant.referencedMemberAccept(this);
-    }
-
-
-    // Implementations for MemberVisitor.
-
-    public void visitLibraryMethod(LibraryClass libraryClass, LibraryMethod libraryMethod) {}
-
-
-    public void visitProgramMethod(ProgramClass programClass, ProgramMethod programMethod)
-    {
-        descriptorLengthDelta =
-            programMethod.getDescriptor(programClass).length() - descriptor.length();
-
-        if (DEBUG)
-        {
-            if (descriptorLengthDelta > 0)
-            {
-                System.out.println("DuplicateInitializerInvocationFixer:");
-                System.out.println("  ["+programClass.getName()+"."+programMethod.getName(programClass)+programMethod.getDescriptor(programClass)+"] ("+ClassUtil.externalClassAccessFlags(programMethod.getAccessFlags())+") referenced by:");
-            }
-        }
-    }
-}