Check for duplicate names in obfuscation dictionaries
Bug: 139174621
Change-Id: Ifd708ca643c3014009ef42bbbd460a073fd79f63
diff --git a/src/main/java/com/android/tools/r8/naming/DictionaryReader.java b/src/main/java/com/android/tools/r8/naming/DictionaryReader.java
index 2377a3d..8729dcb 100644
--- a/src/main/java/com/android/tools/r8/naming/DictionaryReader.java
+++ b/src/main/java/com/android/tools/r8/naming/DictionaryReader.java
@@ -6,12 +6,15 @@
import com.android.tools.r8.origin.PathOrigin;
import com.android.tools.r8.utils.ExceptionDiagnostic;
import com.android.tools.r8.utils.Reporter;
+import com.android.tools.r8.utils.StringDiagnostic;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder;
import java.io.BufferedReader;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.Set;
public class DictionaryReader implements AutoCloseable {
@@ -56,10 +59,16 @@
public static ImmutableList<String> readAllNames(Path path, Reporter reporter) {
if (path != null) {
+ Set<String> seenNames = new HashSet<>();
Builder<String> namesBuilder = new ImmutableList.Builder<String>();
try (DictionaryReader reader = new DictionaryReader(path);) {
String name = reader.readName();
while (!name.isEmpty()) {
+ if (!seenNames.add(name)) {
+ reporter.error(
+ new StringDiagnostic(
+ "Duplicate entry for '" + name + "' in dictionary", new PathOrigin(path)));
+ }
namesBuilder.add(name);
name = reader.readName();
}
diff --git a/src/test/java/com/android/tools/r8/naming/ObfuscationDictionaryDuplicateTest.java b/src/test/java/com/android/tools/r8/naming/ObfuscationDictionaryDuplicateTest.java
new file mode 100644
index 0000000..17c2296
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/naming/ObfuscationDictionaryDuplicateTest.java
@@ -0,0 +1,82 @@
+// Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.naming;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.utils.FileUtils;
+import java.io.IOException;
+import java.nio.file.Path;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class ObfuscationDictionaryDuplicateTest extends TestBase {
+
+ public static class Main {
+ public static void a() {
+ System.out.println("a");
+ }
+
+ public static void b() {
+ System.out.println("b");
+ }
+
+ public static void c() {
+ System.out.println("c");
+ }
+
+ public static void main(String[] args) {
+ a();
+ b();
+ c();
+ }
+ }
+
+ public static class FirstClass {}
+
+ public static class SecondClass {}
+
+ private final TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimes().build();
+ }
+
+ public ObfuscationDictionaryDuplicateTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test(expected = CompilationFailedException.class)
+ public void testHavingDuplicateMethodNames() throws IOException, CompilationFailedException {
+ Path dictionary = temp.getRoot().toPath().resolve("dictionary.txt");
+ FileUtils.writeTextFile(dictionary, "x", "y", "x");
+ testForR8(parameters.getBackend())
+ .addInnerClasses(ObfuscationDictionaryDuplicateTest.class)
+ .addKeepRules("-obfuscationdictionary " + dictionary.toString())
+ .addKeepAllClassesRuleWithAllowObfuscation()
+ .addKeepMainRule(Main.class)
+ .setMinApi(parameters.getRuntime())
+ .compile();
+ }
+
+ @Test(expected = CompilationFailedException.class)
+ public void testHavingDuplicateClassNames() throws IOException, CompilationFailedException {
+ Path dictionary = temp.getRoot().toPath().resolve("dictionary.txt");
+ FileUtils.writeTextFile(dictionary, "x", "y", "x");
+ testForR8(parameters.getBackend())
+ .addInnerClasses(ObfuscationDictionaryDuplicateTest.class)
+ .addKeepRules("-classobfuscationdictionary " + dictionary.toString())
+ .addKeepAllClassesRuleWithAllowObfuscation()
+ .addKeepMainRule(Main.class)
+ .setMinApi(parameters.getRuntime())
+ .compile();
+ }
+}
