From 00aa6158c8eb72ed5228ba8aeb3ef9a2fe583c15 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <dmitry.petrov@jetbrains.com>
Date: Fri, 31 Aug 2018 09:19:13 +0300
Subject: [PATCH] Fix IR tests for 1.3

---
 .../testData/ir/irText/expressions/augmentedAssignment2.kt  | 2 +-
 .../testData/ir/irText/expressions/augmentedAssignment2.txt | 6 +++---
 compiler/testData/ir/irText/singletons/enumEntry.kt         | 2 +-
 compiler/testData/ir/irText/singletons/enumEntry.txt        | 5 +++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment2.kt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.kt
index d7ab839fe48..f6361352b7a 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment2.kt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment2.kt
@@ -4,7 +4,7 @@ operator fun A.plusAssign(s: String) {}
 operator fun A.minusAssign(s: String) {}
 operator fun A.timesAssign(s: String) {}
 operator fun A.divAssign(s: String) {}
-operator fun A.modAssign(s: String) {}
+operator fun A.remAssign(s: String) {}
 
 val p = A()
 
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
index a451e76fb6c..45570ac2bfe 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
@@ -34,7 +34,7 @@ FILE fqName:<root> fileName:/augmentedAssignment2.kt
     $receiver: VALUE_PARAMETER name:<this> type:A flags:
     VALUE_PARAMETER name:s index:0 type:kotlin.String flags:
     BLOCK_BODY
-  FUN name:modAssign visibility:public modality:FINAL <> ($receiver:A, s:kotlin.String) returnType:kotlin.Unit flags:
+  FUN name:remAssign visibility:public modality:FINAL <> ($receiver:A, s:kotlin.String) returnType:kotlin.Unit flags:
     $receiver: VALUE_PARAMETER name:<this> type:A flags:
     VALUE_PARAMETER name:s index:0 type:kotlin.String flags:
     BLOCK_BODY
@@ -63,7 +63,7 @@ FILE fqName:<root> fileName:/augmentedAssignment2.kt
       CALL 'divAssign(String) on A: Unit' type=kotlin.Unit origin=DIVEQ
         $receiver: GET_VAR 'a: A' type=A origin=DIVEQ
         s: CONST String type=kotlin.String value=/=
-      CALL 'modAssign(String) on A: Unit' type=kotlin.Unit origin=PERCEQ
+      CALL 'remAssign(String) on A: Unit' type=kotlin.Unit origin=PERCEQ
         $receiver: GET_VAR 'a: A' type=A origin=PERCEQ
         s: CONST String type=kotlin.String value=*=
   FUN name:testProperty visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
@@ -85,7 +85,7 @@ FILE fqName:<root> fileName:/augmentedAssignment2.kt
           $receiver: CALL '<get-p>(): A' type=A origin=DIVEQ
           s: CONST String type=kotlin.String value=/=
       BLOCK type=kotlin.Unit origin=PERCEQ
-        CALL 'modAssign(String) on A: Unit' type=kotlin.Unit origin=PERCEQ
+        CALL 'remAssign(String) on A: Unit' type=kotlin.Unit origin=PERCEQ
           $receiver: CALL '<get-p>(): A' type=A origin=PERCEQ
           s: CONST String type=kotlin.String value=%=
 
diff --git a/compiler/testData/ir/irText/singletons/enumEntry.kt b/compiler/testData/ir/irText/singletons/enumEntry.kt
index d057809601c..b79d0cd9615 100644
--- a/compiler/testData/ir/irText/singletons/enumEntry.kt
+++ b/compiler/testData/ir/irText/singletons/enumEntry.kt
@@ -2,7 +2,7 @@ enum class Z {
     ENTRY {
         fun test() {}
 
-        class A {
+        inner class A {
             fun test2() {
                 test()
             }
diff --git a/compiler/testData/ir/irText/singletons/enumEntry.txt b/compiler/testData/ir/irText/singletons/enumEntry.txt
index 7db3e8abf63..6f9271aceb6 100644
--- a/compiler/testData/ir/irText/singletons/enumEntry.txt
+++ b/compiler/testData/ir/irText/singletons/enumEntry.txt
@@ -19,9 +19,10 @@ FILE fqName:<root> fileName:/enumEntry.kt
         FUN name:test visibility:public modality:FINAL <> ($this:Z.ENTRY) returnType:kotlin.Unit flags:
           $this: VALUE_PARAMETER name:<this> type:Z.ENTRY flags:
           BLOCK_BODY
-        CLASS CLASS name:A modality:FINAL visibility:public flags: superTypes:[kotlin.Any]
+        CLASS CLASS name:A modality:FINAL visibility:public flags:inner superTypes:[kotlin.Any]
           $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:Z.ENTRY.A flags:
-          CONSTRUCTOR visibility:public <> () returnType:Z.ENTRY.A flags:primary
+          CONSTRUCTOR visibility:public <> ($this:Z.ENTRY) returnType:Z.ENTRY.A flags:primary
+            $outer: VALUE_PARAMETER name:<this> type:Z.ENTRY flags:
             BLOCK_BODY
               DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
               INSTANCE_INITIALIZER_CALL classDescriptor='A'