commit e78ad38f5e20db7513f3a7b1abab72bb31797b2a
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Sep 20 08:07:33 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Sep 20 08:07:33 2021 +0200
tree d825216de1963191fd3aaacad5f5420bff626404
parent f3421b579a32dd06270d81c6880682dba6193781

Update test expectations after rewriting throwing instructions pt. 2

Change-Id: Ic8315e6665408e8ca80a886d572e5e60f302b11c

src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionInvokeVirtualTest.java

diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionInvokeVirtualTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionInvokeVirtualTest.java
index c960b33..2639a1f 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionInvokeVirtualTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/DefaultInterfaceMethodDesugaringWithPublicStaticResolutionInvokeVirtualTest.java
@@ -103,7 +103,8 @@
     // Invalid invoke case is where the invoke-virtual targets C.m.
     if (invalidInvoke) {
       if (parameters.isDexRuntimeVersion(Version.V7_0_0)
-          && parameters.canUseDefaultAndStaticInterfaceMethodsWhenDesugaring()) {
+          && parameters.canUseDefaultAndStaticInterfaceMethodsWhenDesugaring()
+          && !isR8) {
         // The v7 VM incorrectly fails to throw.
         result.assertSuccessWithOutput(EXPECTED);
       } else {