From 41f878e104ef67310ffd1e6a65fef1434d6f3feb Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 3 Nov 2020 16:05:59 +0300 Subject: [PATCH] FIR: Adjust test data for type alias constructors They are not SubstitutionOverrides anymore --- .../resolve/diagnostics/testIllegalAnnotationClass.txt | 2 +- .../testData/resolve/expresssions/typeAliasConstructor.txt | 2 +- .../testData/resolveWithStdlib/addAllOnJavaCollection.txt | 4 ++-- .../testData/resolveWithStdlib/hashMapTypeAlias.txt | 2 +- .../inference/builderInferenceFromStdlib.txt | 2 +- .../testData/resolveWithStdlib/typeAliasDeserialization.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.txt index c77236154d8..8df815368a9 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.txt @@ -5,7 +5,7 @@ FILE: KotlinImporterComponent.kt } public final class State : R|kotlin/Any| { - public constructor(directories: R|kotlin/collections/List| = R|SubstitutionOverride|!|>()): R|simulation/KotlinImporterComponent.State| { + public constructor(directories: R|kotlin/collections/List| = R|java/util/ArrayList.ArrayList|!|>()): R|simulation/KotlinImporterComponent.State| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.txt index 618092083dc..2447605b6ff 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.txt @@ -15,5 +15,5 @@ FILE: typeAliasConstructor.kt public final typealias BB = R|B| public final fun main(): R|kotlin/Unit| { lval x: R|A| = R|/A.A|(Int(1)) - lval y: R|B| = R|SubstitutionOverride|(String(bb)) + lval y: R|B| = R|/B.B|(String(bb)) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt index 466c951f137..898b85fe9ca 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt @@ -1,11 +1,11 @@ FILE: addAllOnJavaCollection.kt public final fun foo(): R|kotlin/Unit| { lval y: R|kotlin/collections/List| = R|kotlin/collections/listOf|(vararg(String(Alpha), String(Beta))) - lval x: R|java/util/LinkedHashSet| = R|SubstitutionOverride|().R|kotlin/apply||>( = apply@fun R|java/util/LinkedHashSet|.(): R|kotlin/Unit| { + lval x: R|java/util/LinkedHashSet| = R|java/util/LinkedHashSet.LinkedHashSet|().R|kotlin/apply||>( = apply@fun R|java/util/LinkedHashSet|.(): R|kotlin/Unit| { this@R|special/anonymous|.R|SubstitutionOverride|(R|/y|) } ) - lval z: R|java/util/ArrayList| = R|SubstitutionOverride|() + lval z: R|java/util/ArrayList| = R|java/util/ArrayList.ArrayList|() R|/z|.R|SubstitutionOverride|(R|/y|) R|/z|.R|SubstitutionOverride|(String(Omega)) } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.txt index d093c4d2df3..9322eb4c238 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.txt @@ -3,7 +3,7 @@ FILE: hashMapTypeAlias.kt public final fun R|MyT|.add(x: R|X|, y: R|kotlin/Int|): R|kotlin/Unit| { } public final fun main(): R|kotlin/Unit| { - R|SubstitutionOverride|().R|kotlin/apply||>( = apply@fun R|java/util/HashMap|.(): R|kotlin/Unit| { + R|java/util/HashMap.HashMap|().R|kotlin/apply||>( = apply@fun R|java/util/HashMap|.(): R|kotlin/Unit| { this@R|special/anonymous|.R|/add|(String(1), Int(2)) } ) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt index ef31d5679c0..03d82157f11 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt @@ -14,7 +14,7 @@ FILE: builderInferenceFromStdlib.kt R|/takeList|(R|/list|) } public final fun myBuildList(@R|kotlin/BuilderInference|() builderAction: R|kotlin/collections/MutableList.() -> kotlin/Unit|): R|kotlin/collections/List| { - ^myBuildList R|SubstitutionOverride|().R|kotlin/apply||>(R|/builderAction|) + ^myBuildList R|java/util/ArrayList.ArrayList|().R|kotlin/apply||>(R|/builderAction|) } public final fun takeList(list: R|kotlin/collections/List|): R|kotlin/Unit| { } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt index af361ae3b58..9788fc3d8d8 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt @@ -1,5 +1,5 @@ FILE: typeAliasDeserialization.kt public final fun main(): R|kotlin/Unit| { - lval a: R|java/util/LinkedHashSet| = R|SubstitutionOverride|() + lval a: R|java/util/LinkedHashSet| = R|java/util/LinkedHashSet.LinkedHashSet|() R|/a|.R|SubstitutionOverride|(String()) }