[IR] update testdata: better support for enum and object accesses

JetBrains · Nov 25, 2020 · 5cb2572 · 5cb2572
1 parent 1fd12b7
commit 5cb2572
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 28 deletions.
diff --git a/compiler/testData/ir/irText/classes/enum.kt.txt b/compiler/testData/ir/irText/classes/enum.kt.txt
@@ -87,7 +87,7 @@ abstract enum class TestEnum4 : Enum<TestEnum4> {
     }
 
     override fun foo() {
-      println(message = TestEnum4)
+      println(message = TestEnum4.TEST1)
     }
 
   }
@@ -108,7 +108,7 @@ abstract enum class TestEnum4 : Enum<TestEnum4> {
     }
 
     override fun foo() {
-      println(message = TestEnum4)
+      println(message = TestEnum4.TEST2)
     }
 
   }

diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt
@@ -27,7 +27,7 @@ annotation class TestAnn : Annotation {
 
 }
 
-@TestAnn(x = En)
+@TestAnn(x = En.A)
 fun test1() {
 }
 
diff --git a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.kt.txt
@@ -1,7 +1,7 @@
 @file:A(x = "File annotation")
 package test
 
-@Target(allowedTargets = [AnnotationTarget])
+@Target(allowedTargets = [AnnotationTarget.FILE])
 annotation class A : Annotation {
   constructor(x: String) /* primary */ 
   val x: String

diff --git a/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.kt.txt
@@ -1,4 +1,4 @@
-@Target(allowedTargets = [AnnotationTarget])
+@Target(allowedTargets = [AnnotationTarget.TYPEALIAS])
 annotation class TestAnn : Annotation {
   constructor(x: String) /* primary */ 
   val x: String

diff --git a/compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.kt.txt
@@ -1,4 +1,4 @@
-@Target(allowedTargets = [AnnotationTarget])
+@Target(allowedTargets = [AnnotationTarget.TYPE_PARAMETER])
 annotation class Anno : Annotation {
   constructor() /* primary */ 
 

diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt.txt
@@ -19,7 +19,7 @@ abstract enum class X : Enum<X> {
 
     override val value: Function0<String>
       field = local fun <anonymous>(): String {
-        return B.<get-value2>()
+        return X.B.<get-value2>()
       }
 
       override get
@@ -36,6 +36,6 @@ abstract enum class X : Enum<X> {
 }
 
 fun box(): String {
-  return X.<get-value>().invoke()
+  return X.B.<get-value>().invoke()
 }
 
diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt.txt
@@ -28,8 +28,8 @@ open enum class MyEnum : Enum<MyEnum> {
 
     val aLambda: Function0<Unit>
       field = local fun <anonymous>() {
-        Z.<set-counter>(<set-?> = 1)
-        Z.foo()
+        MyEnum.Z.<set-counter>(<set-?> = 1)
+        MyEnum.Z.foo()
       }
 
       get
@@ -44,13 +44,13 @@ open enum class MyEnum : Enum<MyEnum> {
           }
 
           init {
-            Z.<set-counter>(<set-?> = 1)
-            Z.foo()
+            MyEnum.Z.<set-counter>(<set-?> = 1)
+            MyEnum.Z.foo()
           }
 
           fun test() {
-            Z.<set-counter>(<set-?> = 1)
-            Z.foo()
+            MyEnum.Z.<set-counter>(<set-?> = 1)
+            MyEnum.Z.foo()
           }
 
         }

diff --git a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt
@@ -18,7 +18,7 @@ fun testVariableAssignment_throws(a: A) {
   { // BLOCK
     val tmp0_subject: A = a
     when {
-      EQEQ(arg0 = tmp0_subject, arg1 = A) -> x = 11
+      EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> x = 11
       true -> noWhenBranchMatchedException()
     }
   }
@@ -28,7 +28,7 @@ fun testStatement_empty(a: A) {
   { // BLOCK
     val tmp0_subject: A = a
     when {
-      EQEQ(arg0 = tmp0_subject, arg1 = A) -> 1 /*~> Unit */
+      EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> 1 /*~> Unit */
     }
   }
 }
@@ -37,7 +37,7 @@ fun testParenthesized_throwsJvm(a: A) {
   { // BLOCK
     val tmp0_subject: A = a
     when {
-      EQEQ(arg0 = tmp0_subject, arg1 = A) -> 1 /*~> Unit */
+      EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> 1 /*~> Unit */
     }
   }
 }
@@ -46,7 +46,7 @@ fun testAnnotated_throwsJvm(a: A) {
   { // BLOCK
     val tmp0_subject: A = a
     when {
-      EQEQ(arg0 = tmp0_subject, arg1 = A) -> 1 /*~> Unit */
+      EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> 1 /*~> Unit */
     }
   }
 }
@@ -55,7 +55,7 @@ fun testExpression_throws(a: A): Int {
   return { // BLOCK
     val tmp0_subject: A = a
     when {
-      EQEQ(arg0 = tmp0_subject, arg1 = A) -> 1
+      EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> 1
       true -> noWhenBranchMatchedException()
     }
   }
@@ -68,7 +68,7 @@ fun testIfTheElseStatement_empty(a: A, flag: Boolean) {
       { // BLOCK
         val tmp0_subject: A = a
         when {
-          EQEQ(arg0 = tmp0_subject, arg1 = A) -> 1 /*~> Unit */
+          EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> 1 /*~> Unit */
         }
       }
     }
@@ -82,7 +82,7 @@ fun testIfTheElseParenthesized_throwsJvm(a: A, flag: Boolean) {
       { // BLOCK
         val tmp0_subject: A = a
         when {
-          EQEQ(arg0 = tmp0_subject, arg1 = A) -> 1 /*~> Unit */
+          EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> 1 /*~> Unit */
         }
       }
     }
@@ -96,7 +96,7 @@ fun testIfTheElseAnnotated_throwsJvm(a: A, flag: Boolean) {
       { // BLOCK
         val tmp0_subject: A = a
         when {
-          EQEQ(arg0 = tmp0_subject, arg1 = A) -> 1 /*~> Unit */
+          EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> 1 /*~> Unit */
         }
       }
     }
@@ -108,7 +108,7 @@ fun testLambdaResultExpression_throws(a: A) {
     return { // BLOCK
       val tmp0_subject: A = a
       when {
-        EQEQ(arg0 = tmp0_subject, arg1 = A) -> 1
+        EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> 1
         true -> noWhenBranchMatchedException()
       }
     }

diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.kt.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.kt.txt
@@ -35,6 +35,6 @@ val test1: Int
   get
 
 val test2: Int
-  field = En.invoke(i = 42)
+  field = En.X.invoke(i = 42)
   get
 
diff --git a/compiler/testData/ir/irText/expressions/values.kt.txt b/compiler/testData/ir/irText/expressions/values.kt.txt
@@ -45,7 +45,7 @@ class Z {
 }
 
 fun test1(): Enum {
-  return Enum
+  return Enum.A
 }
 
 fun test2(): A {

diff --git a/compiler/testData/ir/irText/singletons/enumEntry.kt.txt b/compiler/testData/ir/irText/singletons/enumEntry.kt.txt
@@ -24,7 +24,7 @@ open enum class Z : Enum<Z> {
       }
 
       fun test2() {
-        ENTRY.test()
+        Z.ENTRY.test()
       }
 
     }

diff --git a/compiler/testData/ir/irText/stubs/javaEnum.kt.txt b/compiler/testData/ir/irText/stubs/javaEnum.kt.txt
@@ -1,4 +1,4 @@
 val test: JEnum
-  field = JEnum
+  field = JEnum.ONE
   get
 
diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
@@ -26,7 +26,7 @@ inline fun <T : Any?> unsafeFlow(crossinline block: @ExtensionFunctionType Suspe
   TODO()
 }
 
-@Deprecated(message = "binary compatibility with a version w/o FlowCollector receiver", level = DeprecationLevel)
+@Deprecated(message = "binary compatibility with a version w/o FlowCollector receiver", level = DeprecationLevel.HIDDEN)
 fun <T : Any?> Flow<T>.onCompletion(action: SuspendFunction1<@ParameterName(name = "cause") Throwable?, Unit>): Flow<T> {
   return <this>.onCompletion<T>(action = local suspend fun FlowCollector<T>.<anonymous>(it: Throwable?) {
     action.invoke(p1 = it)
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ open enum class Z : Enum<Z> { @@
           }
           fun test2() {
-            ENTRY.test()
+            Z.ENTRY.test()
           }
         }
@@ Expand Down @@