From 25cebe03e91eb732f7bb2e55e93a2b9d93fb97c4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 24 Feb 2016 14:54:00 +0300 Subject: [PATCH] Fix inline codegen tests after regroup and rename --- .../codegen/boxInline/enclosingInfo/anonymousInLambda.kt | 2 +- .../testData/codegen/boxInline/enclosingInfo/inlineChain.kt | 4 ++-- .../testData/codegen/boxInline/enclosingInfo/inlineChain2.kt | 4 ++-- .../codegen/boxInline/enclosingInfo/objectInInlineFun.kt | 2 +- .../codegen/boxInline/enclosingInfo/transformedConstructor.kt | 4 ++-- .../transformedConstructorWithAdditionalObject.kt | 2 +- .../enclosingInfo/transformedConstructorWithNestedInline.kt | 4 ++-- compiler/testData/codegen/boxInline/innerClasses/kt10259.kt | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/compiler/testData/codegen/boxInline/enclosingInfo/anonymousInLambda.kt b/compiler/testData/codegen/boxInline/enclosingInfo/anonymousInLambda.kt index 8cd7b82ae05..cbe7407d465 100644 --- a/compiler/testData/codegen/boxInline/enclosingInfo/anonymousInLambda.kt +++ b/compiler/testData/codegen/boxInline/enclosingInfo/anonymousInLambda.kt @@ -17,7 +17,7 @@ fun box(): String { if (enclosingMethod?.name != "box") return "fail 1: ${enclosingMethod?.name}" var enclosingClass = res.javaClass.enclosingClass - if (enclosingClass?.name != "AnonymousInLambda_1Kt") return "fail 2: ${enclosingClass?.name}" + if (enclosingClass?.name != "_2Kt") return "fail 2: ${enclosingClass?.name}" return res() } diff --git a/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain.kt b/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain.kt index 7dee610fb73..c089d726cff 100644 --- a/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain.kt +++ b/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain.kt @@ -19,7 +19,7 @@ fun box(): String { if (enclosingMethod?.name != "box") return "fail 1: ${enclosingMethod?.name}" var enclosingClass = res.javaClass.enclosingClass - if (enclosingClass?.name != "InlineChain_1Kt") return "fail 2: ${enclosingClass?.name}" + if (enclosingClass?.name != "_2Kt") return "fail 2: ${enclosingClass?.name}" val res2 = call { call { @@ -31,7 +31,7 @@ fun box(): String { if (enclosingMethod?.name != "box") return "fail 1: ${enclosingMethod?.name}" enclosingClass = res2.javaClass.enclosingClass - if (enclosingClass?.name != "InlineChain_1Kt") return "fail 2: ${enclosingClass?.name}" + if (enclosingClass?.name != "_2Kt") return "fail 2: ${enclosingClass?.name}" return res2() } diff --git a/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain2.kt b/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain2.kt index 1f6814bd70c..c03e4262b8d 100644 --- a/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain2.kt +++ b/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain2.kt @@ -19,7 +19,7 @@ fun box(): String { if (enclosingMethod?.name != "invoke") return "fail 1: ${enclosingMethod?.name}" var enclosingClass = res.javaClass.enclosingClass - if (enclosingClass?.name != "InlineChain2_1Kt\$box$\$inlined\$call$1") return "fail 2: ${enclosingClass?.name}" + if (enclosingClass?.name != "_2Kt\$box$\$inlined\$call$1") return "fail 2: ${enclosingClass?.name}" val res2 = call { call { @@ -31,7 +31,7 @@ fun box(): String { if (enclosingMethod?.name != "invoke") return "fail 1: ${enclosingMethod?.name}" enclosingClass = res2.javaClass.enclosingClass - if (enclosingClass?.name != "InlineChain2_1Kt\$box$\$inlined\$call\$lambda\$lambda$2") return "fail 2: ${enclosingClass?.name}" + if (enclosingClass?.name != "_2Kt\$box$\$inlined\$call\$lambda\$lambda$2") return "fail 2: ${enclosingClass?.name}" return res2() } diff --git a/compiler/testData/codegen/boxInline/enclosingInfo/objectInInlineFun.kt b/compiler/testData/codegen/boxInline/enclosingInfo/objectInInlineFun.kt index 56df07383e3..04e19565dbd 100644 --- a/compiler/testData/codegen/boxInline/enclosingInfo/objectInInlineFun.kt +++ b/compiler/testData/codegen/boxInline/enclosingInfo/objectInInlineFun.kt @@ -24,7 +24,7 @@ fun box(): String { if (enclosingMethod?.name != "box") return "fail 1: ${enclosingMethod?.name}" val enclosingClass = res.javaClass.enclosingClass - if (enclosingClass?.name != "ObjectInInlineFun_1Kt") return "fail 2: ${enclosingClass?.name}" + if (enclosingClass?.name != "_2Kt") return "fail 2: ${enclosingClass?.name}" return "OK" } diff --git a/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructor.kt b/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructor.kt index 9526c4029a6..a9b289be2f2 100644 --- a/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructor.kt +++ b/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructor.kt @@ -32,10 +32,10 @@ fun box(): String { val enclosingConstructor = z.javaClass.enclosingConstructor - if (enclosingConstructor?.name != "TransformedConstructor_1Kt\$box$\$inlined\$test$1") return "fail 1: ${enclosingConstructor?.name}" + if (enclosingConstructor?.name != "_2Kt\$box$\$inlined\$test$1") return "fail 1: ${enclosingConstructor?.name}" val enclosingClass = z.javaClass.enclosingClass - if (enclosingClass?.name != "TransformedConstructor_1Kt\$box$\$inlined\$test$1") return "fail 2: ${enclosingClass?.name}" + if (enclosingClass?.name != "_2Kt\$box$\$inlined\$test$1") return "fail 2: ${enclosingClass?.name}" return res.a() } diff --git a/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructorWithAdditionalObject.kt b/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructorWithAdditionalObject.kt index 2bae1f9132f..573f69933ff 100644 --- a/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructorWithAdditionalObject.kt +++ b/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructorWithAdditionalObject.kt @@ -35,7 +35,7 @@ fun box(): String { if (enclosingMethod?.name != "box") return "fail 1: ${enclosingMethod?.name}" val enclosingClass = javaClass1.enclosingClass - if (enclosingClass?.name != "TransformedConstructorWithAdditionalObject_1Kt") return "fail 2: ${enclosingClass?.name}" + if (enclosingClass?.name != "_2Kt") return "fail 2: ${enclosingClass?.name}" val res2 = res.a() diff --git a/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructorWithNestedInline.kt b/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructorWithNestedInline.kt index 5d49ec5a511..6d28c9967e1 100644 --- a/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructorWithNestedInline.kt +++ b/compiler/testData/codegen/boxInline/enclosingInfo/transformedConstructorWithNestedInline.kt @@ -38,10 +38,10 @@ fun box(): String { val enclosingConstructor = z.javaClass.enclosingConstructor - if (enclosingConstructor?.name != "TransformedConstructorWithNestedInline_1Kt\$box$\$inlined\$test$1") return "fail 1: ${enclosingConstructor?.name}" + if (enclosingConstructor?.name != "_2Kt\$box$\$inlined\$test$1") return "fail 1: ${enclosingConstructor?.name}" val enclosingClass = z.javaClass.enclosingClass - if (enclosingClass?.name != "TransformedConstructorWithNestedInline_1Kt\$box$\$inlined\$test$1") return "fail 2: ${enclosingClass?.name}" + if (enclosingClass?.name != "_2Kt\$box$\$inlined\$test$1") return "fail 2: ${enclosingClass?.name}" return res.a() } diff --git a/compiler/testData/codegen/boxInline/innerClasses/kt10259.kt b/compiler/testData/codegen/boxInline/innerClasses/kt10259.kt index edd5e0cd336..48e0ac31383 100644 --- a/compiler/testData/codegen/boxInline/innerClasses/kt10259.kt +++ b/compiler/testData/codegen/boxInline/innerClasses/kt10259.kt @@ -25,8 +25,8 @@ fun box(): String { }() } - if (encl1 != "Kt10259_1Kt\$box\$\$inlined\$test\$lambda$1") return "fail 1: $encl1" - if (encl2 != "Kt10259_1Kt\$box\$\$inlined\$test\$lambda\$lambda$2") return "fail 2: $encl2" + if (encl1 != "_2Kt\$box\$\$inlined\$test\$lambda$1") return "fail 1: $encl1" + if (encl2 != "_2Kt\$box\$\$inlined\$test\$lambda\$lambda$2") return "fail 2: $encl2" return "OK" }