From a40c80e90b31b80cce56eb969665ccf6950196df Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 4 Sep 2015 20:04:47 +0300 Subject: [PATCH] fix tests in org.jetbrains.kotlin.codegen.generated --- compiler/testData/codegen/box/privateConstructors/inline.kt | 2 +- .../anonymousObject/capturedLambdaInInlineObject.1.kt | 2 +- .../anonymousObject/capturedLambdaInInlineObject.2.kt | 4 ++-- .../codegen/boxInline/modifiers/packagePrivateMembers.2.kt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/testData/codegen/box/privateConstructors/inline.kt b/compiler/testData/codegen/box/privateConstructors/inline.kt index 2816df3f16a..9b80c07d05a 100644 --- a/compiler/testData/codegen/box/privateConstructors/inline.kt +++ b/compiler/testData/codegen/box/privateConstructors/inline.kt @@ -1,7 +1,7 @@ // See also KT-6299 public open class Outer private constructor() { companion object { - inline fun foo() = Outer() + internal inline fun foo() = Outer() } } diff --git a/compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.1.kt b/compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.1.kt index a5b838f9e35..6e404cbbe90 100644 --- a/compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.1.kt +++ b/compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.1.kt @@ -1,6 +1,6 @@ //NO_CHECK_LAMBDA_INLINING import test.* -fun box(): String { +internal fun box(): String { return bar { "OK" }.run() } \ No newline at end of file diff --git a/compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.2.kt b/compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.2.kt index f54f014b2bf..4e4688cced8 100644 --- a/compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.2.kt +++ b/compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.2.kt @@ -1,10 +1,10 @@ package test -interface A { +internal interface A { fun run(): T; } -inline fun bar(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) y: () -> String) = object : A { +internal inline fun bar(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) y: () -> String) = object : A { override fun run() : String { return call(y) } diff --git a/compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.2.kt b/compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.2.kt index 8048995811f..fb63bc65db0 100644 --- a/compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.2.kt +++ b/compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.2.kt @@ -4,10 +4,10 @@ private val packageProp = "O" private fun packageFun() = "K" -inline fun packageInline(p: (String, String) -> String): String { +internal inline fun packageInline(p: (String, String) -> String): String { return p(packageProp, packageFun()) } -fun samePackageCall(): String { +internal fun samePackageCall(): String { return packageInline { s, s2 -> s + s2 } } \ No newline at end of file