Revert the recently added status file changes for art implicit null check
These only started not failing on 5.1.1 because we inlined methods that was being kept.
Revert "Update test expectation for Art test"
This reverts commit 05e53998eae8b7119533445c15c26ea74282bd9f.
Revert "Update test expectations for implicit null check test"
This reverts commit b6c62bb02eeb893b517c72d6e2b5e382307558cc.
Change-Id: Icaf0979250504189dbdf70bbc76be4008abb9587
diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index afb440a..3dfac08 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -687,15 +687,13 @@
TestCondition.D8_COMPILER, TestCondition.runtimes(DexVm.Version.V6_0_1)))
// Regression test for an issue that is not fixed on version 5.1.1. Throws an Exception
// instance instead of the expected NullPointerException. This bug is only tickled when
- // (1) running the R8 generated code when starting from jar or from dex code generated
- // with dx and (2) certain virtual methods are not inlined. This test no longer fails with
- // R8 since we now inline virtual methods with a single caller, meaning that (2) is no
- // longer satisfied. Note that the code that R8 generates is valid and there is nothing we
- // can do for this one.
+ // running the R8 generated code when starting from jar or from dex code generated with
+ // dx. However, the code that R8 generates is valid and there is nothing we can do for
+ // this one.
.put("551-implicit-null-checks",
TestCondition.match(
TestCondition.tools(DexTool.NONE, DexTool.DX),
- TestCondition.compilers(CompilerUnderTest.R8_AFTER_D8),
+ TestCondition.R8DEX_COMPILER,
TestCondition.runtimes(DexVm.Version.V5_1_1)))
// Contains a method (B.<init>) which pass too few arguments to invoke. Also, contains an
// iput on a static field.
