commit 258a409355a21e36ce9407c93d7eac5ea353ba77
author Yohann Roussel <yroussel@google.com> Fri Sep 22 08:37:56 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 22 08:37:56 2017 +0000
tree 8e2fe44db2f986dedcb24468bca0bf5ad61c5cb9
parent 4ba8a2bd30ce5be14099b9e4dfa53acaf2c690cc
parent f005a28f297ac13268ae7e53d49cce4eada7baef

Merge "Check parsing of SynthesizedClassMapMessage"

src/main/java/com/android/tools/r8/graph/DexAnnotation.java

diff --git a/src/main/java/com/android/tools/r8/graph/DexAnnotation.java b/src/main/java/com/android/tools/r8/graph/DexAnnotation.java
index 3a8d56b..232a86c 100644
--- a/src/main/java/com/android/tools/r8/graph/DexAnnotation.java
+++ b/src/main/java/com/android/tools/r8/graph/DexAnnotation.java
@@ -5,6 +5,7 @@
 
 import com.android.tools.r8.dex.IndexedItemCollection;
 import com.android.tools.r8.dex.MixedSectionCollection;
+import com.android.tools.r8.errors.CompilationError;
 import com.android.tools.r8.graph.DexValue.DexValueAnnotation;
 import com.android.tools.r8.graph.DexValue.DexValueArray;
 import com.android.tools.r8.graph.DexValue.DexValueInt;
@@ -15,7 +16,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -239,11 +239,26 @@
     DexAnnotation foundAnnotation = programClass.annotations.getFirstMatching(
         dexItemFactory.annotationSynthesizedClassMap);
     if (foundAnnotation != null) {
+      if (foundAnnotation.annotation.elements.length != 1) {
+        throw new CompilationError(
+            getInvalidSynthesizedClassMapMessage(programClass, foundAnnotation));
+      }
       DexAnnotationElement value = foundAnnotation.annotation.elements[0];
-      assert value.name.toSourceString().equals("value");
+      if (!value.name.toSourceString().equals("value")) {
+        throw new CompilationError(
+            getInvalidSynthesizedClassMapMessage(programClass, foundAnnotation));
+      }
+      if (!(value.value instanceof DexValueArray)) {
+        throw new CompilationError(
+            getInvalidSynthesizedClassMapMessage(programClass, foundAnnotation));
+      }
       DexValueArray existingList = (DexValueArray) value.value;
       Collection<DexType> synthesized = new ArrayList<>(existingList.values.length);
       for (DexValue element : existingList.getValues()) {
+        if (!(element instanceof DexValueType)) {
+          throw new CompilationError(
+              getInvalidSynthesizedClassMapMessage(programClass, foundAnnotation));
+        }
         synthesized.add(((DexValueType) element).value);
       }
       return synthesized;
@@ -251,6 +266,15 @@
     return Collections.emptyList();
   }
 
+  private static String getInvalidSynthesizedClassMapMessage(
+      DexProgramClass annotatedClass,
+      DexAnnotation invalidAnnotation) {
+    return annotatedClass.toSourceString()
+        + " is annotated with invalid "
+        + invalidAnnotation.annotation.type.toString()
+        + ": " + invalidAnnotation.toString();
+  }
+
   public static DexAnnotation createAnnotationSynthesizedClassMap(
       Set<DexType> synthesized,
       DexItemFactory dexItemFactory) {