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

Minor: remove always true is-check

Browse Source
This commit is contained in:
Dmitry Petrov
2017-05-23 15:35:46 +03:00
parent 6fd762cfce
commit e7eb078c3f
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt
+12 -14
View File
@@ -74,21 +74,19 @@ class BodyGenerator(
statementGenerator.declareComponentVariablesInBlock(ktDestructuringDeclaration, irBlockBody, parameterValue) statementGenerator.declareComponentVariablesInBlock(ktDestructuringDeclaration, irBlockBody, parameterValue)
} }
if (ktBody is KtBlockExpression) { val ktBodyStatements = ktBody.statements
val ktBodyStatements = ktBody.statements if (ktBodyStatements.isNotEmpty()) {
if (ktBodyStatements.isNotEmpty()) { for (ktStatement in ktBodyStatements.dropLast(1)) {
for (ktStatement in ktBodyStatements.dropLast(1)) { irBlockBody.statements.add(statementGenerator.generateStatement(ktStatement))
irBlockBody.statements.add(statementGenerator.generateStatement(ktStatement))
}
val ktReturnedValue = ktBodyStatements.last()
statementGenerator.generateReturnExpression(ktReturnedValue, irBlockBody)
}
else {
irBlockBody.statements.add(generateReturnExpression(
ktBody.startOffset, ktBody.endOffset,
IrGetObjectValueImpl(ktBody.startOffset, ktBody.endOffset, context.builtIns.unitType,
context.symbolTable.referenceClass(context.builtIns.unit))))
} }
val ktReturnedValue = ktBodyStatements.last()
statementGenerator.generateReturnExpression(ktReturnedValue, irBlockBody)
}
else {
irBlockBody.statements.add(generateReturnExpression(
ktBody.startOffset, ktBody.endOffset,
IrGetObjectValueImpl(ktBody.startOffset, ktBody.endOffset, context.builtIns.unitType,
context.symbolTable.referenceClass(context.builtIns.unit))))
} }
return irBlockBody return irBlockBody