commit 04f09188adc566989de8a560ac10801735bcf231
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Jul 05 13:07:23 2022 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue Jul 05 11:18:18 2022 +0000
tree 5161c420301cdd83461ff64d346078746f550590
parent 3100d18cb960a083860a759770d6e3473315543a

Update test expectations to account for kotlin 1.8

Bug: b/238067321
Change-Id: I1e7d0709d2f03fa35630095192e3a0b4736c55aa

src/test/java/com/android/tools/r8/debug/KotlinInlineTest.java

diff --git a/src/test/java/com/android/tools/r8/debug/KotlinInlineTest.java b/src/test/java/com/android/tools/r8/debug/KotlinInlineTest.java
index 1a9eff3..419a379 100644
--- a/src/test/java/com/android/tools/r8/debug/KotlinInlineTest.java
+++ b/src/test/java/com/android/tools/r8/debug/KotlinInlineTest.java
@@ -361,6 +361,12 @@
         checkLocal(p_mangledLvName),
         stepInto(),
         // We're out of inlinee2
+        // For kotlin dev (18.alpha) we need an additional step, see b/238067321.
+        applyIf(
+            kotlinParameters
+                .getCompilerVersion()
+                .isGreaterThan(KotlinCompilerVersion.KOTLINC_1_7_0),
+            this::stepInto),
         checkMethod(DEBUGGEE_CLASS, inliningMethodName),
         checkLocal(inlinee1_inlineScope),
         checkNoLocal(inlinee2_inlineScope),