From a422a1240793e322a8f7afcaa4d03940cf77a74a Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 3 Apr 2020 18:31:27 +0300 Subject: [PATCH] Minor: update testData In BridgeTest::testFakeOverrideMisleadingImplementation, order of generated bridges has changed slightly (but the overall set of generated bridges remains the same). --- .../box/inlineClasses/boxReturnValueOnOverride/kt31585.kt | 1 + .../box/inlineClasses/boxReturnValueOnOverride/kt35234.kt | 1 + .../box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt | 1 + compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt index 7b1c5803176..69bfcee4dd0 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt31585.kt @@ -1,5 +1,6 @@ // IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME +// KJS_WITH_FULL_RUNTIME inline class FieldValue(val value: String) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234.kt index be718266f2a..6fc7678f016 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234.kt @@ -1,4 +1,5 @@ // WITH_RUNTIME +// KJS_WITH_FULL_RUNTIME inline class NumberInlineClass(val value: Double) diff --git a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt index f2cee76c94d..8c0279ca65c 100644 --- a/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt +++ b/compiler/testData/codegen/box/inlineClasses/boxReturnValueOnOverride/kt35234a.kt @@ -1,4 +1,5 @@ // WITH_RUNTIME +// KJS_WITH_FULL_RUNTIME inline class NumberInlineClass(val value: Double) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt index 242e28b0d14..13e2e4e3fda 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt @@ -477,7 +477,7 @@ class BridgeTest : TestCase() { graph(c to a, e to d, f to b, f to c, f to e) doTest(e, setOf()) // Although "a" is a concrete declaration, it's overridden with abstract in "c" and all bridges should delegate to "d" instead - doTest(f, setOf(bridge(a, d), bridge(b, d), bridge(c, d))) + doTest(f, setOf(bridge(b, d), bridge(a, d), bridge(c, d))) } // Fake override overrides another fake override (or declaration) with some bridges already present there