From 2ec1222cd14e69df68019af8c26419cea2a593b6 Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Mon, 14 Jan 2019 16:30:08 +0300 Subject: [PATCH] Fix test data --- .../coroutines/varValueConflictsWithTableSameSort.kt | 4 +--- .../coroutines/varValueConflictsWithTableSameSort_1_2.kt | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt index a1b0292a6eb..a95343ebf86 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort.kt @@ -26,7 +26,6 @@ fun box(): String { var s: String // We shout not spill 's' to continuation field because it's not effectively initialized - // But we do this because it's not illegal (at least in Android/OpenJDK VM's) if (suspendHere() == "OK") { s = "OK" } @@ -45,5 +44,4 @@ fun box(): String { // 1 PUTFIELD VarValueConflictsWithTableSameSortKt\$box\$1.L\$0 : Ljava/lang/Object; /* 1 load in try/finally */ /* 1 load in result = s */ -/* 1 load before suspension point */ -// 3 ALOAD 3 +// 2 ALOAD 3 diff --git a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort_1_2.kt b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort_1_2.kt index 06ac3c29ad4..8ef31be39bc 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort_1_2.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/varValueConflictsWithTableSameSort_1_2.kt @@ -28,7 +28,6 @@ fun box(): String { var s: String // We shout not spill 's' to continuation field because it's not effectively initialized - // But we do this because it's not illegal (at least in Android/OpenJDK VM's) if (suspendHere() == "OK") { s = "OK" } @@ -44,8 +43,7 @@ fun box(): String { // 1 LOCALVARIABLE i Ljava/lang/String; L.* 3 // 1 LOCALVARIABLE s Ljava/lang/String; L.* 3 -// 1 PUTFIELD VarValueConflictsWithTableSameSort_1_2Kt\$box\$1.L\$0 : Ljava/lang/Object; +// 0 PUTFIELD VarValueConflictsWithTableSameSort_1_2Kt\$box\$1.L\$0 : Ljava/lang/Object; /* 1 load in try/finally */ /* 1 load in result = s */ -/* 1 load before suspension point */ -// 3 ALOAD 3 +// 2 ALOAD 3