Update Art530-checker-lse2 to fail on both D8 and R8
The test require desugaring which we no longer do on dex input
Change-Id: Ibd02cbb1235935fdd666805bb3b6284a400f5a3b
diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index d9ed43f..9fe1539 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -620,76 +620,87 @@
"461-get-reference-vreg",
TestCondition.match(
TestCondition.D8_COMPILER,
- TestCondition
- .runtimes(DexVm.Version.V7_0_0, DexVm.Version.V6_0_1, DexVm.Version.V5_1_1)))
+ TestCondition.runtimes(
+ DexVm.Version.V7_0_0, DexVm.Version.V6_0_1, DexVm.Version.V5_1_1)))
// Dalvik fails on reading an uninitialized local.
.put(
"471-uninitialized-locals",
TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// Out of memory.
- .put("152-dead-large-object",
+ .put(
+ "152-dead-large-object",
TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// Cannot resolve exception handler. Interestingly, D8 generates different code in
// release mode (which is also the code generated by R8) which passes.
- .put("111-unresolvable-exception",
+ .put(
+ "111-unresolvable-exception",
TestCondition.match(
- TestCondition.D8_COMPILER,
- TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
+ TestCondition.D8_COMPILER, TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// Fails because the code has to be desugared to run on art <= 6.0.1
// When running from dx code we don't desugar.
- .put("530-checker-lse2",
+ .put(
+ "530-checker-lse2",
TestCondition.match(
TestCondition.tools(DexTool.DX),
- TestCondition.D8_COMPILER,
TestCondition.runtimesUpTo(DexVm.Version.V6_0_1)))
- .put("534-checker-bce-deoptimization",
- TestCondition
- .match(TestCondition.D8_COMPILER, TestCondition.runtimes(DexVm.Version.V6_0_1)))
+ .put(
+ "534-checker-bce-deoptimization",
+ TestCondition.match(
+ TestCondition.D8_COMPILER, TestCondition.runtimes(DexVm.Version.V6_0_1)))
// Type not present.
- .put("124-missing-classes",
+ .put(
+ "124-missing-classes",
TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// Failed creating vtable.
- .put("587-inline-class-error",
+ .put(
+ "587-inline-class-error",
TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// Failed creating vtable.
- .put("595-error-class",
+ .put(
+ "595-error-class",
TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// NoSuchFieldException: systemThreadGroup on Art 4.4.4.
- .put("129-ThreadGetId",
+ .put(
+ "129-ThreadGetId",
TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// Verifier says: can't modify final field LMain;.staticFinalField.
- .put("600-verifier-fails",
+ .put(
+ "600-verifier-fails",
TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// VFY: tried to get class from non-ref register.
- .put("506-verify-aput",
+ .put(
+ "506-verify-aput",
TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// NoSuchMethod: startMethodTracing.
- .put("545-tracing-and-jit",
+ .put(
+ "545-tracing-and-jit",
TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// filled-new-array arg 0(1) not valid.
- .put("412-new-array",
+ .put(
+ "412-new-array",
TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// TODO(ager): unclear what is failing here.
- .put("098-ddmc",
- TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
+ .put("098-ddmc", TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// Unsatisfiable link error:
// libarttest.so: undefined symbol: _ZN3art6Thread18RunEmptyCheckpointEv
- .put("543-env-long-ref",
+ .put(
+ "543-env-long-ref",
TestCondition.match(
TestCondition.D8_COMPILER,
- TestCondition
- .runtimes(
- DexVm.Version.V8_1_0,
- DexVm.Version.V7_0_0,
- DexVm.Version.V6_0_1,
- DexVm.Version.V5_1_1)))
+ TestCondition.runtimes(
+ DexVm.Version.V8_1_0,
+ DexVm.Version.V7_0_0,
+ DexVm.Version.V6_0_1,
+ DexVm.Version.V5_1_1)))
// lib64 libarttest.so: wrong ELF class ELFCLASS64.
- .put("543-env-long-ref",
+ .put(
+ "543-env-long-ref",
TestCondition.match(TestCondition.runtimesUpTo(DexVm.Version.V4_4_4)))
// Leaving two static-get triggers LSE bug on 6.0.1 (b/25735083).
// R8, with subtyping, knows the first sget is dead, and removing it avoids the bug.
// Due to the lack of subtype hierarchy, D8 can't guarantee <clinit> side effects.
- .put("550-new-instance-clinit",
+ .put(
+ "550-new-instance-clinit",
TestCondition.match(
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
@@ -697,40 +708,37 @@
// 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",
+ .put(
+ "551-implicit-null-checks",
TestCondition.match(
TestCondition.tools(DexTool.NONE, DexTool.DX),
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.
- .put("600-verifier-fails",
+ .put(
+ "600-verifier-fails",
TestCondition.match(
TestCondition.D8_COMPILER,
- TestCondition.runtimes(DexVm.Version.V7_0_0, DexVm.Version.V6_0_1,
- DexVm.Version.V5_1_1)))
+ TestCondition.runtimes(
+ DexVm.Version.V7_0_0, DexVm.Version.V6_0_1, DexVm.Version.V5_1_1)))
// Dalvik 4.0.4 is missing ReflectiveOperationException class.
- .put("140-field-packing",
- TestCondition.match(
- TestCondition.runtimes(DexVm.Version.V4_0_4)))
+ .put(
+ "140-field-packing",
+ TestCondition.match(TestCondition.runtimes(DexVm.Version.V4_0_4)))
// Dalvik 4.0.4 is missing theUnsafe field.
- .put("528-long-hint",
- TestCondition.match(
- TestCondition.runtimes(DexVm.Version.V4_0_4)))
+ .put("528-long-hint", TestCondition.match(TestCondition.runtimes(DexVm.Version.V4_0_4)))
// Cannot catch exception in Dalvik 4.0.4.
- .put("084-class-init",
- TestCondition.match(
- TestCondition.runtimes(DexVm.Version.V4_0_4)))
+ .put("084-class-init", TestCondition.match(TestCondition.runtimes(DexVm.Version.V4_0_4)))
// Tested regression still exists in Dalvik 4.0.4.
- .put("301-abstract-protected",
- TestCondition.match(
- TestCondition.runtimes(DexVm.Version.V4_0_4)))
+ .put(
+ "301-abstract-protected",
+ TestCondition.match(TestCondition.runtimes(DexVm.Version.V4_0_4)))
// Illegal class flags in Dalvik 4.0.4.
- .put("121-modifiers",
- TestCondition.match(
- TestCondition.runtimes(DexVm.Version.V4_0_4)))
+ .put("121-modifiers", TestCondition.match(TestCondition.runtimes(DexVm.Version.V4_0_4)))
// Switch regression still present in Dalvik 4.0.4.
- .put("095-switch-MAX_INT",
+ .put(
+ "095-switch-MAX_INT",
TestCondition.match(
TestCondition.tools(DexTool.DX),
TestCondition.D8_COMPILER,
