commit | d9421c6ababe28ab9aa540bfa1bb3ae043c66914 | [log] [tgz] |
---|---|---|
author | Ian Zerny <zerny@google.com> | Thu Oct 15 08:23:36 2020 +0200 |
committer | Ian Zerny <zerny@google.com> | Thu Oct 15 08:23:36 2020 +0200 |
tree | b15c76700efff40d5155e40206f46d217cd7b4ae | |
parent | 9bae49f9a48410b51ccef76a89890abb14157b07 [diff] |
Don't assume types in main-dex list must exist. This was introduced with 0fa8f9540228c189270c7f4ad53d5aa2bee0f98c CL https://r8-review.googlesource.com/c/r8/+/54998 where DexApplication was replaced by AppView. Change-Id: I467b97bfae32bd357947275af08edb020b430df8
diff --git a/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java b/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java index 5beed30..bba5fb0 100644 --- a/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java +++ b/src/main/java/com/android/tools/r8/synthesis/SyntheticFinalization.java
@@ -312,7 +312,10 @@ // TODO(b/168584485): Remove this once class-mapping support is removed. DexProgramClass from = DexProgramClass.asProgramClassOrNull( - appView.definitionFor(member.getContext().getSynthesizingContextType())); + appView + .appInfo() + .definitionForWithoutExistenceAssert( + member.getContext().getSynthesizingContextType())); if (from != null) { externalSyntheticClass.addSynthesizedFrom(from); }