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

Fix compilation error in FlattenStringConcatenationLowering

Browse Source 
See cf13293363 and 8dc34ae7b9, which were merged independently
This commit is contained in:
Alexander Udalov
2019-05-24 14:38:08 +02:00
parent 8dc34ae7b9
commit 8ec466c2cc
1 changed files with 2 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/FlattenStringConcatenationLowering.kt
+2 -1
View File
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.ir.expressions.IrStringConcatenation
import org.jetbrains.kotlin.ir.expressions.impl.IrStringConcatenationImpl import org.jetbrains.kotlin.ir.expressions.impl.IrStringConcatenationImpl
import org.jetbrains.kotlin.ir.types.isStringClassType import org.jetbrains.kotlin.ir.types.isStringClassType
import org.jetbrains.kotlin.ir.util.fqNameSafe import org.jetbrains.kotlin.ir.util.fqNameSafe
import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
@@ -89,7 +90,7 @@ class FlattenStringConcatenationLowering(val context: CommonBackendContext) : Fi
expression.type.isStringClassType() && expression.type.isStringClassType() &&
expression.valueArgumentsCount == 1 && expression.valueArgumentsCount == 1 &&
function.name == PLUS_NAME && function.name == PLUS_NAME &&
function.parent.fqNameSafe in PARENT_NAMES function.fqNameWhenAvailable?.parent() in PARENT_NAMES
} }
else -> false else -> false
} }