Android: Make proguard deobfuscation more careful about false-positives

Language tags look like class names.

Bug: 938270
Change-Id: I242104be127e450cae4690bc6e76245ad672196a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1526166
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Reviewed-by: David Turner <digit@chromium.org>
Cr-Commit-Position: refs/heads/master@{#641688}

build/android/stacktrace/java/org/chromium/build/FlushingReTrace.java

@@ -53,25 +53,28 @@ public class FlushingReTrace {
             + "(?:.*L%C;.*)|"
             // E.g.: END SomeTestClass#someMethod
             + "(?:.*?%c#%m.*?)|"
-            // E.g.: The member "Foo.bar"
-            // E.g.: The class "Foobar"
-            + "(?:.*?\"%c\\.%m\".*)|"
-            + "(?:.*?\"%c\".*)|"
             // Special-case for a common junit logcat message:
             // E.g.: java.lang.NoClassDefFoundError: SomeFrameworkClass in isTestClass for Foo
             + "(?:.* isTestClass for %c)|"
             // E.g.: Caused by: java.lang.RuntimeException: Intentional Java Crash
             + "(?:Caused by: %c:.*)|"
-            // E.g.: java.lang.RuntimeException: Intentional Java Crash
-            + "(?:%c:.*)|"
-            // All lines that end with a class / class+method:
+            // Quoted values and lines that end with a class / class+method:
             // E.g.: The class: Foo
             // E.g.: INSTRUMENTATION_STATUS: class=Foo
             // E.g.: NoClassDefFoundError: SomeFrameworkClass in isTestClass for Foo
             // E.g.: Could not find class 'SomeFrameworkClass', referenced from method Foo.bar
             // E.g.: Could not find method SomeFrameworkMethod, referenced from method Foo.bar
-            + "(?:.*(?:=|:\\s*|\\b)%c\\.%m)|"
-            + "(?:.*(?:=|:\\s*|\\b)%c)"
+            // E.g.: The member "Foo.bar"
+            // E.g.: The class "Foobar"
+            // Be careful about matching %c without %m since language tags look like class names.
+            + "(?:.*?%c\\.%m)|"
+            + "(?:.*?\"%c\\.%m\".*)|"
+            + "(?:.*\\b(?:[Cc]lass|[Tt]ype)\\b.*?\"%c\".*)|"
+            + "(?:.*\\b(?:[Cc]lass|[Tt]ype)\\b.*?%c)|"
+            // E.g.: java.lang.RuntimeException: Intentional Java Crash
+            + "(?:%c:.*)|"
+            // See if entire line matches a class name (e.g. for manual deobfuscation)
+            + "(?:%c)"
             + ")";
 
     private static void usage() {

build/android/stacktrace/java_deobfuscate_test.py

@@ -34,66 +34,68 @@ never.Deobfuscated -> NOTFOO:
 """
 
 TEST_DATA = [
-    "FOO",
-    "FOO.bar",
-    "Here is a FOO",
-    "Here is a FOO baz",
-    "Here is a \"FOO\" baz",
-    "Here is a \"FOO.bar\" baz",
-    "Here it is: FOO",
-    "Here it is: FOO.bar",
-    "SomeError: SomeFrameworkClass in isTestClass for FOO",
-    "Here is a FOO.bar",
-    "Here is a FOO.bar baz",
-    "END FOO#bar",
-    "new-instance 3810 (LSome/Framework/Class;) in LFOO;",
-    "FOO: Error message",
-    "Caused by: FOO: Error message",
-    "\tat FOO.bar(PG:1)",
-    "\t at\t FOO.bar\t (\t PG:\t 1\t )",
-    ("Unable to start activity ComponentInfo{garbage.in/here.test}:"
-     " java.lang.NullPointerException: Attempt to invoke interface method 'void"
-     " FOO.bar(int,android.os.Bundle)' on a null object reference"),
-    ("Caused by: java.lang.NullPointerException: Attempt to read from field"
-     " 'int[] FOO.a' on a null object reference"),
-    "java.lang.VerifyError: FOO",
+    '',
+    'FOO',
+    'FOO.bar',
+    'Here is a FOO',
+    'Here is a class FOO',
+    'Here is a class FOO baz',
+    'Here is a "FOO" baz',
+    'Here is a type "FOO" baz',
+    'Here is a "FOO.bar" baz',
+    'SomeError: SomeFrameworkClass in isTestClass for FOO',
+    'Here is a FOO.bar',
+    'Here is a FOO.bar baz',
+    'END FOO#bar',
+    'new-instance 3810 (LSome/Framework/Class;) in LFOO;',
+    'FOO: Error message',
+    'Caused by: FOO: Error message',
+    '\tat FOO.bar(PG:1)',
+    '\t at\t FOO.bar\t (\t PG:\t 1\t )',
+    ('Unable to start activity ComponentInfo{garbage.in/here.test}:'
+     ' java.lang.NullPointerException: Attempt to invoke interface method'
+     ' \'void FOO.bar(int,android.os.Bundle)\' on a null object reference'),
+    ('Caused by: java.lang.NullPointerException: Attempt to read from field'
+     ' \'int[] FOO.a\' on a null object reference'),
+    'java.lang.VerifyError: FOO',
     ('java.lang.NoSuchFieldError: No instance field a of type '
      'Ljava/lang/Class; in class LFOO;'),
-    "NOTFOO: Object of type FOO was not destroyed...",
+    'NOTFOO: Object of type FOO was not destroyed...',
 ]
 
 EXPECTED_OUTPUT = [
-    "this.was.Deobfuscated",
-    "this.was.Deobfuscated.someMethod",
-    "Here is a this.was.Deobfuscated",
-    "Here is a FOO baz",
-    "Here is a \"this.was.Deobfuscated\" baz",
-    "Here is a \"this.was.Deobfuscated.someMethod\" baz",
-    "Here it is: this.was.Deobfuscated",
-    "Here it is: this.was.Deobfuscated.someMethod",
-    "SomeError: SomeFrameworkClass in isTestClass for this.was.Deobfuscated",
-    "Here is a this.was.Deobfuscated.someMethod",
-    "Here is a FOO.bar baz",
-    "END this.was.Deobfuscated#someMethod",
-    "new-instance 3810 (LSome/Framework/Class;) in Lthis/was/Deobfuscated;",
-    "this.was.Deobfuscated: Error message",
-    "Caused by: this.was.Deobfuscated: Error message",
-    "\tat this.was.Deobfuscated.someMethod(Deobfuscated.java:65)",
-    ("\t at\t this.was.Deobfuscated.someMethod\t "
-     "(\t Deobfuscated.java:\t 65\t )"),
-    ("Unable to start activity ComponentInfo{garbage.in/here.test}:"
-     " java.lang.NullPointerException: Attempt to invoke interface method"
-     " 'void this.was.Deobfuscated.someMethod(int,android.os.Bundle)' on a null"
-     " object reference"),
-    ("Caused by: java.lang.NullPointerException: Attempt to read from field"
-     " 'int[] this.was.Deobfuscated.mFontFamily' on a null object reference"),
+    '',
+    'this.was.Deobfuscated',
+    'this.was.Deobfuscated.someMethod',
+    'Here is a FOO',
+    'Here is a class this.was.Deobfuscated',
+    'Here is a class FOO baz',
+    'Here is a "FOO" baz',
+    'Here is a type "this.was.Deobfuscated" baz',
+    'Here is a "this.was.Deobfuscated.someMethod" baz',
+    'SomeError: SomeFrameworkClass in isTestClass for this.was.Deobfuscated',
+    'Here is a this.was.Deobfuscated.someMethod',
+    'Here is a FOO.bar baz',
+    'END this.was.Deobfuscated#someMethod',
+    'new-instance 3810 (LSome/Framework/Class;) in Lthis/was/Deobfuscated;',
+    'this.was.Deobfuscated: Error message',
+    'Caused by: this.was.Deobfuscated: Error message',
+    '\tat this.was.Deobfuscated.someMethod(Deobfuscated.java:65)',
+    ('\t at\t this.was.Deobfuscated.someMethod\t '
+     '(\t Deobfuscated.java:\t 65\t )'),
+    ('Unable to start activity ComponentInfo{garbage.in/here.test}:'
+     ' java.lang.NullPointerException: Attempt to invoke interface method'
+     ' \'void this.was.Deobfuscated.someMethod(int,android.os.Bundle)\' on a'
+     ' null object reference'),
+    ('Caused by: java.lang.NullPointerException: Attempt to read from field'
+     ' \'int[] this.was.Deobfuscated.mFontFamily\' on a null object reference'),
     'java.lang.VerifyError: this.was.Deobfuscated',
     ('java.lang.NoSuchFieldError: No instance field mFontFamily of type '
      'Ljava/lang/Class; in class Lthis/was/Deobfuscated;'),
-    "NOTFOO: Object of type this.was.Deobfuscated was not destroyed...",
+    'NOTFOO: Object of type this.was.Deobfuscated was not destroyed...',
 ]
-TEST_DATA = [s + "\n" for s in TEST_DATA]
-EXPECTED_OUTPUT = [s + "\n" for s in EXPECTED_OUTPUT]
+TEST_DATA = [s + '\n' for s in TEST_DATA]
+EXPECTED_OUTPUT = [s + '\n' for s in EXPECTED_OUTPUT]
 
 
 class JavaDeobfuscateTest(unittest.TestCase):