azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IR BE] Update parents in ArrayConstructorLowering

Browse Source
This commit is contained in:
Svyatoslav Kuzmich
2019-05-13 15:27:10 +03:00
parent 2d5f41cfe3
commit 0702b88bf3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/ArrayConstructorLowering.kt
+6 -1
View File
@@ -62,7 +62,8 @@ class ArrayConstructorLowering(val context: CommonBackendContext) : IrElementTra
// (and similar for primitive arrays) // (and similar for primitive arrays)
val size = expression.getValueArgument(0)!!.transform(this, null) val size = expression.getValueArgument(0)!!.transform(this, null)
val invokable = expression.getValueArgument(1)!!.transform(this, null) val invokable = expression.getValueArgument(1)!!.transform(this, null)
return context.createIrBuilder(currentScope!!.scope.scopeOwnerSymbol).irBlock(expression.startOffset, expression.endOffset) { val scope = currentScope!!.scope
return context.createIrBuilder(scope.scopeOwnerSymbol).irBlock(expression.startOffset, expression.endOffset) {
val index = irTemporaryVar(irInt(0)) val index = irTemporaryVar(irInt(0))
val sizeVar = irTemporary(size) val sizeVar = irTemporary(size)
val result = irTemporary(irCall(sizeConstructor, expression.type).apply { val result = irTemporary(irCall(sizeConstructor, expression.type).apply {
@@ -91,6 +92,10 @@ class ArrayConstructorLowering(val context: CommonBackendContext) : IrElementTra
} }
} }
+irGet(result) +irGet(result)
}.also {
// Some parents of local declarations are not updated during ad-hoc inlining
// TODO: Remove when generic inliner is used
it.patchDeclarationParents(scope.getLocalDeclarationParent())
} }
} }