| commit | 18029191990a523907a5dea8656f717b5c6acb0d | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Wed May 29 09:14:43 2019 +0200 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Wed May 29 09:14:43 2019 +0200 |
| tree | 26eb4a4748083d0c58b36e1f6952d803760d6f2d | |
| parent | ffd1d8551c0a0dca1674796e986de769b8f06486 [diff] |
Handle bad merge related to libraryMethodsWithoutSideEffects Change-Id: Ied36d4ac0aa29bf4afaf2b03f2de6139a08802c0
diff --git a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java index 9202120..ecce3e9 100644 --- a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java +++ b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
@@ -101,8 +101,8 @@ public DexItemFactory() { this.kotlin = new Kotlin(this); - assert libraryMethodsWithoutSideEffects - .containsAll(libraryMethodsWithReturnValueDependingOnlyOnArguments); + assert libraryMethodsWithReturnValueDependingOnlyOnArguments.stream() + .allMatch(libraryMethodsWithoutSideEffects::containsKey); } public static boolean isInternalSentinel(DexItem item) {