FIR: Adjust test data for type alias constructors

They are not SubstitutionOverrides anymore
JetBrains · Nov 6, 2020 · 41f878e · 41f878e
1 parent 96c3436
commit 41f878e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git 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<kotlin/String>| = R|SubstitutionOverride<java/util/ArrayList.ArrayList>|<R|ft<kotlin/String, kotlin/String?>!|>()): R|simulation/KotlinImporterComponent.State| {
+            public constructor(directories: R|kotlin/collections/List<kotlin/String>| = R|java/util/ArrayList.ArrayList|<R|ft<kotlin/String, kotlin/String?>!|>()): R|simulation/KotlinImporterComponent.State| {
                 super<R|kotlin/Any|>()
             }
 

diff --git 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<U> = R|B<U>|
     public final fun main(): R|kotlin/Unit| {
         lval x: R|A| = R|/A.A|(Int(1))
-        lval y: R|B<kotlin/String>| = R|SubstitutionOverride</B.B>|<R|kotlin/String|>(String(bb))
+        lval y: R|B<kotlin/String>| = R|/B.B|<R|kotlin/String|>(String(bb))
     }
diff --git 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<kotlin/String>| = R|kotlin/collections/listOf|<R|kotlin/String|>(vararg(String(Alpha), String(Beta)))
-        lval x: R|java/util/LinkedHashSet<kotlin/String>| = R|SubstitutionOverride<java/util/LinkedHashSet.LinkedHashSet>|<R|kotlin/String|>().R|kotlin/apply|<R|java/util/LinkedHashSet<kotlin/String>|>(<L> = apply@fun R|java/util/LinkedHashSet<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
+        lval x: R|java/util/LinkedHashSet<kotlin/String>| = R|java/util/LinkedHashSet.LinkedHashSet|<R|kotlin/String|>().R|kotlin/apply|<R|java/util/LinkedHashSet<kotlin/String>|>(<L> = apply@fun R|java/util/LinkedHashSet<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
             this@R|special/anonymous|.R|SubstitutionOverride<java/util/LinkedHashSet.addAll: R|kotlin/Boolean|>|(R|<local>/y|)
         }
         )
-        lval z: R|java/util/ArrayList<kotlin/String>| = R|SubstitutionOverride<java/util/ArrayList.ArrayList>|<R|kotlin/String|>()
+        lval z: R|java/util/ArrayList<kotlin/String>| = R|java/util/ArrayList.ArrayList|<R|kotlin/String|>()
         R|<local>/z|.R|SubstitutionOverride<java/util/ArrayList.addAll: R|kotlin/Boolean|>|(R|<local>/y|)
         R|<local>/z|.R|SubstitutionOverride<java/util/ArrayList.add: R|kotlin/Boolean|>|(String(Omega))
     }
diff --git 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 <X> R|MyT<X>|.add(x: R|X|, y: R|kotlin/Int|): R|kotlin/Unit| {
     }
     public final fun main(): R|kotlin/Unit| {
-        R|SubstitutionOverride<java/util/HashMap.HashMap>|<R|kotlin/String|>().R|kotlin/apply|<R|java/util/HashMap<kotlin/String, kotlin/Int>|>(<L> = apply@fun R|java/util/HashMap<kotlin/String, kotlin/Int>|.<anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
+        R|java/util/HashMap.HashMap|<R|kotlin/String|>().R|kotlin/apply|<R|java/util/HashMap<kotlin/String, kotlin/Int>|>(<L> = apply@fun R|java/util/HashMap<kotlin/String, kotlin/Int>|.<anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
             this@R|special/anonymous|.R|/add|<R|kotlin/String|>(String(1), Int(2))
         }
         )

diff --git a/...er/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt b/...er/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt
@@ -14,7 +14,7 @@ FILE: builderInferenceFromStdlib.kt
         R|/takeList|(R|<local>/list|)
     }
     public final fun <E> myBuildList(@R|kotlin/BuilderInference|() builderAction: R|kotlin/collections/MutableList<E>.() -> kotlin/Unit|): R|kotlin/collections/List<E>| {
-        ^myBuildList R|SubstitutionOverride<java/util/ArrayList.ArrayList>|<R|E|>().R|kotlin/apply|<R|java/util/ArrayList<E>|>(R|<local>/builderAction|)
+        ^myBuildList R|java/util/ArrayList.ArrayList|<R|E|>().R|kotlin/apply|<R|java/util/ArrayList<E>|>(R|<local>/builderAction|)
     }
     public final fun takeList(list: R|kotlin/collections/List<kotlin/String>|): R|kotlin/Unit| {
     }
diff --git 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<kotlin/String>| = R|SubstitutionOverride<java/util/LinkedHashSet.LinkedHashSet>|<R|kotlin/String|>()
+        lval a: R|java/util/LinkedHashSet<kotlin/String>| = R|java/util/LinkedHashSet.LinkedHashSet|<R|kotlin/String|>()
         R|<local>/a|.R|SubstitutionOverride<java/util/LinkedHashSet.add: R|kotlin/Boolean|>|(String())
     }