From 2be7afc7f99f97e021e6e01b6bf123cc96219f6b Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Fri, 9 Oct 2020 20:03:08 +0200
Subject: [PATCH] IR: minor, give names to anonymous lowering visitors

To improve stacktraces and make the code a bit more readable.
---
 .../jetbrains/kotlin/backend/common/Lower.kt  | 110 ++++++++++--------
 1 file changed, 62 insertions(+), 48 deletions(-)

diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Lower.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Lower.kt
index 49f77fdfd7c..ed0ef7af5c6 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Lower.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Lower.kt
@@ -76,29 +76,37 @@ fun FileLoweringPass.lower(moduleFragment: IrModuleFragment) = moduleFragment.fi
 //}
 
 fun ClassLoweringPass.runOnFilePostfix(irFile: IrFile) {
-    irFile.acceptVoid(object : IrElementVisitorVoid {
-        override fun visitElement(element: IrElement) {
-            element.acceptChildrenVoid(this)
-        }
+    irFile.acceptVoid(ClassLoweringVisitor(this))
+}
 
-        override fun visitClass(declaration: IrClass) {
-            declaration.acceptChildrenVoid(this)
-            lower(declaration)
-        }
-    })
+private class ClassLoweringVisitor(
+    private val loweringPass: ClassLoweringPass
+) : IrElementVisitorVoid {
+    override fun visitElement(element: IrElement) {
+        element.acceptChildrenVoid(this)
+    }
+
+    override fun visitClass(declaration: IrClass) {
+        declaration.acceptChildrenVoid(this)
+        loweringPass.lower(declaration)
+    }
 }
 
 fun ScriptLoweringPass.runOnFilePostfix(irFile: IrFile) {
-    irFile.acceptVoid(object : IrElementVisitorVoid {
-        override fun visitElement(element: IrElement) {
-            element.acceptChildrenVoid(this)
-        }
+    irFile.acceptVoid(ScriptLoweringVisitor(this))
+}
 
-        override fun visitScript(declaration: IrScript) {
-            declaration.acceptChildrenVoid(this)
-            lower(declaration)
-        }
-    })
+private class ScriptLoweringVisitor(
+    private val loweringPass: ScriptLoweringPass
+) : IrElementVisitorVoid {
+    override fun visitElement(element: IrElement) {
+        element.acceptChildrenVoid(this)
+    }
+
+    override fun visitScript(declaration: IrScript) {
+        declaration.acceptChildrenVoid(this)
+        loweringPass.lower(declaration)
+    }
 }
 
 fun DeclarationContainerLoweringPass.asClassLoweringPass() = object : ClassLoweringPass {
@@ -125,42 +133,48 @@ fun BodyLoweringPass.runOnFilePostfix(
     withLocalDeclarations: Boolean = false,
     allowDeclarationModification: Boolean = false
 ) {
-    ArrayList(irFile.declarations).forEach {
-        it.accept(object : IrElementVisitor<Unit, IrDeclaration?> {
-            override fun visitElement(element: IrElement, data: IrDeclaration?) {
-                element.acceptChildren(this, data)
-            }
+    val visitor = BodyLoweringVisitor(this, withLocalDeclarations, allowDeclarationModification)
+    for (declaration in ArrayList(irFile.declarations)) {
+        declaration.accept(visitor, null)
+    }
+}
 
-            override fun visitDeclaration(declaration: IrDeclarationBase, data: IrDeclaration?) {
-                declaration.acceptChildren(this, declaration)
-            }
+private class BodyLoweringVisitor(
+    private val loweringPass: BodyLoweringPass,
+    private val withLocalDeclarations: Boolean,
+    private val allowDeclarationModification: Boolean,
+) : IrElementVisitor<Unit, IrDeclaration?> {
+    override fun visitElement(element: IrElement, data: IrDeclaration?) {
+        element.acceptChildren(this, data)
+    }
 
-            override fun visitClass(declaration: IrClass, data: IrDeclaration?) {
-                declaration.thisReceiver?.accept(this, declaration)
-                declaration.typeParameters.forEach { it.accept(this, declaration) }
-                ArrayList(declaration.declarations).forEach { it.accept(this, declaration) }
-            }
+    override fun visitDeclaration(declaration: IrDeclarationBase, data: IrDeclaration?) {
+        declaration.acceptChildren(this, declaration)
+    }
 
-            override fun visitBody(body: IrBody, data: IrDeclaration?) {
-                if (withLocalDeclarations) body.acceptChildren(this, null)
-                if (allowDeclarationModification) {
-                    lower(body, data!!)
-                } else {
-                    stageController.bodyLowering {
-                        lower(body, data!!)
-                    }
-                }
-            }
+    override fun visitClass(declaration: IrClass, data: IrDeclaration?) {
+        declaration.thisReceiver?.accept(this, declaration)
+        declaration.typeParameters.forEach { it.accept(this, declaration) }
+        ArrayList(declaration.declarations).forEach { it.accept(this, declaration) }
+    }
 
-            override fun visitScript(declaration: IrScript, data: IrDeclaration?) {
-                ArrayList(declaration.declarations).forEach { it.accept(this, declaration) }
-                if (withLocalDeclarations) {
-                    declaration.statements.forEach { it.accept(this, null) }
-                }
-                declaration.thisReceiver.accept(this, declaration)
+    override fun visitBody(body: IrBody, data: IrDeclaration?) {
+        if (withLocalDeclarations) body.acceptChildren(this, null)
+        if (allowDeclarationModification) {
+            loweringPass.lower(body, data!!)
+        } else {
+            stageController.bodyLowering {
+                loweringPass.lower(body, data!!)
             }
+        }
+    }
 
-        }, null)
+    override fun visitScript(declaration: IrScript, data: IrDeclaration?) {
+        ArrayList(declaration.declarations).forEach { it.accept(this, declaration) }
+        if (withLocalDeclarations) {
+            declaration.statements.forEach { it.accept(this, null) }
+        }
+        declaration.thisReceiver.accept(this, declaration)
     }
 }