| commit | 8d621b9329d0b991805b64f5244808e186ad814c | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Fri Jan 08 16:51:55 2021 +0100 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Fri Jan 08 16:51:55 2021 +0100 |
| tree | 8ad2b7aff437fbcd449ed122f6e02d054320d7dc | |
| parent | d064a4bac25285d89412d25bbc704957d0c094b7 [diff] |
Update test to reflect enum unboxing is disabled for CF Change-Id: I77428386aa2774cb574c033faa7ab95456dae6a7
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java index aad40d0..bbc415c 100644 --- a/src/test/java/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java +++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/IllegalInliningOfMergedConstructorTest.java
@@ -33,7 +33,8 @@ testForR8(parameters.getBackend()) .addInnerClasses(getClass()) .addKeepMainRule(Main.class) - .addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(Reprocess.class)) + .addEnumUnboxingInspector( + inspector -> inspector.assertUnboxedIf(parameters.isDexRuntime(), Reprocess.class)) .addHorizontallyMergedClassesInspector( inspector -> inspector.assertMergedInto(B.class, A.class)) .addOptionsModification(options -> options.inliningInstructionLimit = 4)