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

Avoid duplicate IR elements in ForLoopsLowering (accidentally introduced

Browse Source 
in #2620).
This commit is contained in:
Mark Punzalan
2019-09-30 15:15:59 -07:00
committed by max-kammerer
parent 3b563eaca1
commit 9daea89221
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/loops/HeaderProcessor.kt
+6 -1
View File
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrDoWhileLoopImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrWhileLoopImpl import org.jetbrains.kotlin.ir.expressions.impl.IrWhileLoopImpl
import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.symbols.IrSymbol
import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.util.deepCopyWithSymbols
import org.jetbrains.kotlin.ir.util.functions import org.jetbrains.kotlin.ir.util.functions
import org.jetbrains.kotlin.ir.util.getPackageFragment import org.jetbrains.kotlin.ir.util.getPackageFragment
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
@@ -43,12 +44,16 @@ internal data class LoopReplacement(
internal sealed class ForLoopHeader( internal sealed class ForLoopHeader(
protected open val headerInfo: HeaderInfo, protected open val headerInfo: HeaderInfo,
val inductionVariable: IrVariable, val inductionVariable: IrVariable,
val lastExpression: IrExpression, lastExpression: IrExpression,
val step: IrVariable, val step: IrVariable,
var loopVariable: IrVariable? = null, var loopVariable: IrVariable? = null,
val isLastInclusive: Boolean, val isLastInclusive: Boolean,
val declarations: List<IrVariable> val declarations: List<IrVariable>
) { ) {
val lastExpression: IrExpression = lastExpression
// Always copy `lastExpression` is it may be used in multiple conditions.
get() = field.deepCopyWithSymbols()
/** Expression used to initialize the loop variable at the beginning of the loop. */ /** Expression used to initialize the loop variable at the beginning of the loop. */
abstract fun initializeLoopVariable(symbols: Symbols<CommonBackendContext>, builder: DeclarationIrBuilder): IrExpression abstract fun initializeLoopVariable(symbols: Symbols<CommonBackendContext>, builder: DeclarationIrBuilder): IrExpression