From fed1a5d63f68bd8301460bf326b18918b6969748 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <32519625+PavelPunegov@users.noreply.github.com>
Date: Tue, 7 Nov 2017 12:45:13 +0300
Subject: [PATCH] Fix packages that have the same names as locals

---
 .../external/codegen/boxInline/anonymousObject/kt9064.kt      | 4 ++--
 .../external/codegen/boxInline/anonymousObject/kt9064v2.kt    | 4 ++--
 .../tryFinally/callSite/exceptionTableSplit.kt                | 4 ++--
 .../tryFinally/callSite/exceptionTableSplitNoReturn.kt        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend.native/tests/external/codegen/boxInline/anonymousObject/kt9064.kt b/backend.native/tests/external/codegen/boxInline/anonymousObject/kt9064.kt
index d5a4c742c58..1e02fc44601 100644
--- a/backend.native/tests/external/codegen/boxInline/anonymousObject/kt9064.kt
+++ b/backend.native/tests/external/codegen/boxInline/anonymousObject/kt9064.kt
@@ -1,6 +1,6 @@
 // FILE: 1.kt
 
-package test
+package testpack
 
 class Test(val _member: String) {
     val _parameter: Z =  test {
@@ -21,7 +21,7 @@ inline fun test(s: () -> Z): Z {
 // FILE: 2.kt
 
 //NO_CHECK_LAMBDA_INLINING
-import test.*
+import testpack.*
 
 fun box(): String {
 
diff --git a/backend.native/tests/external/codegen/boxInline/anonymousObject/kt9064v2.kt b/backend.native/tests/external/codegen/boxInline/anonymousObject/kt9064v2.kt
index c68ac612b04..d0d37963ec1 100644
--- a/backend.native/tests/external/codegen/boxInline/anonymousObject/kt9064v2.kt
+++ b/backend.native/tests/external/codegen/boxInline/anonymousObject/kt9064v2.kt
@@ -1,6 +1,6 @@
 // FILE: 1.kt
 
-package test
+package testpack
 
 class Test(val _member: String) {
     val _parameter: Z<Z<String>> =  test {
@@ -25,7 +25,7 @@ inline fun <T> test(s: () -> Z<T>): Z<T> {
 // FILE: 2.kt
 
 //NO_CHECK_LAMBDA_INLINING
-import test.*
+import testpack.*
 
 fun box(): String {
 
diff --git a/backend.native/tests/external/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.kt b/backend.native/tests/external/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.kt
index 4d944fae4c0..f1f060af423 100644
--- a/backend.native/tests/external/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.kt
+++ b/backend.native/tests/external/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.kt
@@ -1,6 +1,6 @@
 // FILE: 1.kt
 // WITH_RUNTIME
-package test
+package holder
 
 public class Holder(var value: String = "") {
 
@@ -36,7 +36,7 @@ public inline fun <R> doCallWithException(h: Holder, block: ()-> R) : R {
 
 // FILE: 2.kt
 
-import test.*
+import holder.*
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import kotlin.test.fail
diff --git a/backend.native/tests/external/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.kt b/backend.native/tests/external/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.kt
index 91c01700263..3da0a59d67d 100644
--- a/backend.native/tests/external/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.kt
+++ b/backend.native/tests/external/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.kt
@@ -1,6 +1,6 @@
 // FILE: 1.kt
 // WITH_RUNTIME
-package test
+package testpack
 
 public class Holder(var value: String = "") {
 
@@ -36,7 +36,7 @@ public inline fun <R> doCallWithException(h: Holder, block: ()-> R) {
 
 // FILE: 2.kt
 
-import test.*
+import testpack.*
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import kotlin.test.fail