commit b29a267e02f80873fa1697989112e2500c432e44
author Ying Wang <wangying@android.com> Thu Jan 21 23:36:15 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 21 23:36:15 2016 +0000
tree 4703572039bbc91618a4e285711786721fd29e69
parent ef2942809b198653e0cf181151a5f435f5bb7476
parent 9323689e53509aa4b0f2cdee861dd984a8f418e9

Merge "Fix 'Exception in thread "main" java.lang.AbstractMethodError:'"

lib/proguard.jar

diff --git a/lib/proguard.jar b/lib/proguard.jar
index a948c89..43faf48 100644
--- a/lib/proguard.jar
+++ b/lib/proguard.jar
Binary files differ

lib/proguardgui.jar

diff --git a/lib/proguardgui.jar b/lib/proguardgui.jar
index b876e89..e2d9439 100644
--- a/lib/proguardgui.jar
+++ b/lib/proguardgui.jar
Binary files differ

lib/retrace.jar

diff --git a/lib/retrace.jar b/lib/retrace.jar
index c00fbe7..94c8c6b 100644
--- a/lib/retrace.jar
+++ b/lib/retrace.jar
Binary files differ

src/proguard/obfuscate/MappingPrinter.java

diff --git a/src/proguard/obfuscate/MappingPrinter.java b/src/proguard/obfuscate/MappingPrinter.java
index aab779f..537a345 100644
--- a/src/proguard/obfuscate/MappingPrinter.java
+++ b/src/proguard/obfuscate/MappingPrinter.java
@@ -140,7 +140,19 @@
 
     public void visitLineNumberTableAttribute(Clazz clazz, Method method, CodeAttribute codeAttribute, LineNumberTableAttribute lineNumberTableAttribute)
     {
-        ps.print(lineNumberTableAttribute.getLowestLineNumber() + ":" +
-                 lineNumberTableAttribute.getHighestLineNumber() + ":");
+        // ps.print(lineNumberTableAttribute.getLowestLineNumber() + ":" +
+        //          lineNumberTableAttribute.getHighestLineNumber() + ":");
+        // With the above statement,
+        // OpenJDK 8 (openjdk version "1.8.0_45-internal") crashed with:
+        // Exception in thread "main" java.lang.AbstractMethodError:
+        // java.lang.Exception.getMessage()Ljava/lang/String;
+        // at proguard.ProGuard.main(ProGuard.java:519)
+        //
+        // Using temporary variables fixed the crash.
+        // See bug 26274804.
+        int low,high;
+        low = lineNumberTableAttribute.getLowestLineNumber();
+        high = lineNumberTableAttribute.getHighestLineNumber();
+        ps.print(low + ":" + high + ":");
     }
 }