commit 635701059213987805523c13fd80d1b0f0c99c02
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jun 20 11:08:31 2018 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Jun 20 11:08:31 2018 +0200
tree aa005346e9712ab6fa357edc8a92331a5848c971
parent 70af422ae709aa66afc233d9b99778b58c05f072

Disable new assert in VerticalClassMerger

Commit 70af422ae709aa66afc233d9b99778b58c05f072 started using `assertNotModified` for appInfo.pinnedItems. This caused the tests to fail because `assertNotModified` does currently not expect any items of type DexClass, DexField, or DexMethod.

Change-Id: Iffa17fe73a653bee3b198720c895e2784834c759

src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java

diff --git a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
index 0c770cc..67a7eff 100644
--- a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
+++ b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
@@ -275,7 +275,8 @@
     timing.end();
     assert result.assertNotModified(appInfo.alwaysInline);
     assert result.assertNotModified(appInfo.noSideEffects.keySet());
-    assert result.assertNotModified(appInfo.pinnedItems);
+    // TODO(christofferqa): Enable this assert.
+    // assert result.assertNotModified(appInfo.pinnedItems);
     return result;
   }