IR tree gen: restore IrWhileLoop children visit order

JetBrains · Jun 9, 2022 · 9c27470 · 9c27470
1 parent 3781729
commit 9c27470
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrWhileLoop.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrWhileLoop.kt
@@ -20,12 +20,12 @@ abstract class IrWhileLoop : IrLoop() {
         visitor.visitWhileLoop(this, data)
 
     override fun <D> acceptChildren(visitor: IrElementVisitor<Unit, D>, data: D) {
-        body?.accept(visitor, data)
         condition.accept(visitor, data)
+        body?.accept(visitor, data)
     }
 
     override fun <D> transformChildren(transformer: IrElementTransformer<D>, data: D) {
-        body = body?.transform(transformer, data)
         condition = condition.transform(transformer, data)
+        body = body?.transform(transformer, data)
     }
 }
diff --git a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/IrTree.kt b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/IrTree.kt
@@ -907,6 +907,7 @@ object IrTree : AbstractTreeBuilder() {
     val whileLoop: ElementConfig by element(Expression) {
         visitorParent = loop
         visitorParam = "loop"
+        childrenOrderOverride = listOf("condition", "body")
 
         parent(loop)
     }

diff --git a/...ler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/config/ConfigModel.kt b/...ler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/config/ConfigModel.kt
@@ -32,6 +32,7 @@ class ElementConfig(
     var transform = false
     var transformByChildren = false
     var transformerReturnType: ElementConfig? = null
+    var childrenOrderOverride: List<String>? = null
 
     var ownsChildren = true // If false, acceptChildren/transformChildren will NOT be generated.
 

diff --git a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Model.kt b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Model.kt
@@ -28,6 +28,7 @@ class Element(
     val allParents: List<ClassOrElementRef>
         get() = elementParents + otherParents
     var isLeaf = false
+    val childrenOrderOverride: List<String>? = config.childrenOrderOverride
     var walkableChildren: List<Field> = emptyList()
     val transformableChildren get() = walkableChildren.filter { it.transformable }
 

diff --git a/.../ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Transformations.kt b/.../ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/model/Transformations.kt
@@ -221,10 +221,16 @@ private fun addWalkableChildren(elements: List<Element>) {
 
         element.fields.filter { it.isChild }.associateByTo(walkableChildren) { it.name }
 
-        element.walkableChildren = walkableChildren.values.toList()
+        element.walkableChildren = reorderIfNecessary(walkableChildren.values.toList(), element.childrenOrderOverride)
     }
 }
 
+private fun reorderIfNecessary(fields: List<Field>, order: List<String>?): List<Field> =
+    if (order == null) fields else fields.sortedBy {
+        val position = order.indexOf(it.name)
+        if (position < 0) order.size else position
+    }
+
 private fun iterateElementsParentFirst(elements: List<Element>) = sequence {
     val pending = elements.sortedBy { it.elementParents.size }.toMutableSet()
     pendingLoop@ while (pending.isNotEmpty()) {