From aec173ac5cd4c508f87c65acfb811f7335b6b075 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 6 Sep 2018 13:03:34 +0300 Subject: [PATCH] Minor: fix tests after rebase --- .../box/inlineClasses/callSpecializedEqualsViaReflection.kt | 2 +- ...daryConstructorsInsideInlineClassWithPrimitiveCarrierType.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/testData/codegen/box/inlineClasses/callSpecializedEqualsViaReflection.kt b/compiler/testData/codegen/box/inlineClasses/callSpecializedEqualsViaReflection.kt index b66157c0076..a7cfff4f100 100644 --- a/compiler/testData/codegen/box/inlineClasses/callSpecializedEqualsViaReflection.kt +++ b/compiler/testData/codegen/box/inlineClasses/callSpecializedEqualsViaReflection.kt @@ -12,7 +12,7 @@ fun box(): String { var s = "" val name = "equals-impl0" val specializedEquals = - Class.forName("Simple\$Erased").getDeclaredMethod(name, String::class.java, String::class.java) + Class.forName("Simple").getDeclaredMethod(name, String::class.java, String::class.java) ?: return "$name not found" try { diff --git a/compiler/testData/codegen/box/inlineClasses/secondaryConstructorsInsideInlineClassWithPrimitiveCarrierType.kt b/compiler/testData/codegen/box/inlineClasses/secondaryConstructorsInsideInlineClassWithPrimitiveCarrierType.kt index 86edc6ea450..948aa2aa925 100644 --- a/compiler/testData/codegen/box/inlineClasses/secondaryConstructorsInsideInlineClassWithPrimitiveCarrierType.kt +++ b/compiler/testData/codegen/box/inlineClasses/secondaryConstructorsInsideInlineClassWithPrimitiveCarrierType.kt @@ -8,6 +8,7 @@ inline class Foo(val x: Int) { constructor(z: Long) : this(z.toInt() + 1) + @Suppress("SECONDARY_CONSTRUCTOR_WITH_BODY_INSIDE_INLINE_CLASS") constructor(other: Char) : this(other.toInt().toString()) { global = "OK" }