Version 1.5.29 Cherry-pick: Revert the recently added status file changes for art implicit null check CL: https://r8-review.googlesource.com/c/r8/+/38161 Change-Id: Ia0d5b8cfae9b79749065c58e03ddecfaad7a1458
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index 6847ccb..e1d4f30 100644 --- a/src/main/java/com/android/tools/r8/Version.java +++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@ // This field is accessed from release scripts using simple pattern matching. // Therefore, changing this field could break our release scripts. - public static final String LABEL = "1.5.28"; + public static final String LABEL = "1.5.29"; private Version() { }
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.