Created ProGuard version 5.3.2.

multi-os-engine · Dec 5, 2016 · b91da63 · b91da63
1 parent 75e1375
commit b91da63
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 18 deletions.
diff --git a/buildscripts/maven/ant/pom.xml b/buildscripts/maven/ant/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>5.3.1</version>
+        <version>5.3.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-anttask</artifactId>

diff --git a/buildscripts/maven/base/pom.xml b/buildscripts/maven/base/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>5.3.1</version>
+        <version>5.3.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-base</artifactId>

diff --git a/buildscripts/maven/gradle/pom.xml b/buildscripts/maven/gradle/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>5.3.1</version>
+        <version>5.3.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-gradle</artifactId>

diff --git a/buildscripts/maven/gui/pom.xml b/buildscripts/maven/gui/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>5.3.1</version>
+        <version>5.3.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-gui</artifactId>

diff --git a/buildscripts/maven/pom.xml b/buildscripts/maven/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>net.sf.proguard</groupId>
     <artifactId>proguard-parent</artifactId>
-    <version>5.3.1</version>
+    <version>5.3.2</version>
     <packaging>pom</packaging>
     <name>[${project.groupId}] ${project.artifactId}</name>
     <description>ProGuard is a free Java class file shrinker, optimizer, obfuscator, and preverifier.</description>

diff --git a/buildscripts/maven/retrace/pom.xml b/buildscripts/maven/retrace/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>5.3.1</version>
+        <version>5.3.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-retrace</artifactId>

diff --git a/buildscripts/maven/wtk/pom.xml b/buildscripts/maven/wtk/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>5.3.1</version>
+        <version>5.3.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-wtk-plugin</artifactId>

diff --git a/examples/annotations/lib/annotations.jar b/examples/annotations/lib/annotations.jar
diff --git a/src/proguard/ProGuard.java b/src/proguard/ProGuard.java
@@ -39,7 +39,7 @@
  */
 public class ProGuard
 {
-    public static final String VERSION = "ProGuard, version 5.3.1";
+    public static final String VERSION = "ProGuard, version 5.3.2";
 
     private final Configuration configuration;
     private       ClassPool     programClassPool = new ClassPool();

diff --git a/src/proguard/classfile/editor/MethodInvocationFixer.java b/src/proguard/classfile/editor/MethodInvocationFixer.java
@@ -138,10 +138,15 @@ else if ((referencedClass.getAccessFlags() & ClassConstants.ACC_INTERFACE) != 0)
                 int invokeinterfaceConstant =
                     (ClassUtil.internalMethodParameterSize(referencedMethod.getDescriptor(referencedMethodClass), false)) << 8;
 
+                if (opcode == InstructionConstants.OP_INVOKESPECIAL &&
+                    (referencedMethod.getAccessFlags() & ClassConstants.ACC_ABSTRACT) == 0)
+                {
+                    // Explicit calls to default interface methods *must* be preserved.
+                }
                 // But is it not an interface invocation, or is the parameter
                 // size incorrect?
-                if (opcode != InstructionConstants.OP_INVOKEINTERFACE ||
-                    constantInstruction.constant != invokeinterfaceConstant)
+                else if (opcode != InstructionConstants.OP_INVOKEINTERFACE ||
+                         constantInstruction.constant != invokeinterfaceConstant)
                 {
                     // Fix the parameter size of the interface invocation.
                     Instruction replacementInstruction =
@@ -165,12 +170,10 @@ else if ((referencedClass.getAccessFlags() & ClassConstants.ACC_INTERFACE) != 0)
                 // But is it not a virtual invocation?
                 if (opcode != InstructionConstants.OP_INVOKEVIRTUAL &&
                     (// Replace any non-invokespecial.
-                     opcode != InstructionConstants.OP_INVOKESPECIAL            ||
-                     // For invokespecial, replace invocations from static
-                     // methods, invocations from the same class, and
-                     // invocations to non-superclasses.
-                     (method.getAccessFlags() & ClassConstants.ACC_STATIC) != 0 ||
-                     clazz.equals(referencedClass)                              ||
+                     opcode != InstructionConstants.OP_INVOKESPECIAL ||
+                     // For invokespecial, replace invocations from the same
+                     // class, and invocations to non-superclasses.
+                     clazz.equals(referencedClass)                   ||
                      !clazz.extends_(referencedClass)))
                 {
                     // Replace the invocation by an invokevirtual instruction.

diff --git a/src/proguard/classfile/util/ClassUtil.java b/src/proguard/classfile/util/ClassUtil.java
@@ -439,7 +439,7 @@ public static String internalClassNameFromType(String internalClassType)
      * Returns whether the given method name refers to a class initializer or
      * an instance initializer.
      * @param internalMethodName the internal method name,
-     *                           e.g. "<code>&ltclinit&gt;</code>".
+     *                           e.g. "<code>&lt;clinit&gt;</code>".
      * @return whether the method name refers to an initializer,
      *                           e.g. <code>true</code>.
      */

diff --git a/src/proguard/gui/GUIResources.properties b/src/proguard/gui/GUIResources.properties
@@ -25,7 +25,7 @@ preverification = Preverification
 #
 # Panel titles.
 #
-welcome                       = Welcome to ProGuard, version 5.3.1
+welcome                       = Welcome to ProGuard, version 5.3.2
 options                       = Options
 keepAdditional                = Keep additional classes and class members
 keepNamesAdditional           = Keep additional class names and class member names