From 8ec466c2cc7f5a8676e1d2848bb75835a3819524 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 24 May 2019 14:38:08 +0200 Subject: [PATCH] Fix compilation error in FlattenStringConcatenationLowering See cf132933639 and 8dc34ae7b9f, which were merged independently --- .../backend/common/lower/FlattenStringConcatenationLowering.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FlattenStringConcatenationLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FlattenStringConcatenationLowering.kt index 8426cfcf033..b49bb153d2f 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FlattenStringConcatenationLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FlattenStringConcatenationLowering.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.ir.expressions.IrStringConcatenation import org.jetbrains.kotlin.ir.expressions.impl.IrStringConcatenationImpl import org.jetbrains.kotlin.ir.types.isStringClassType 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.IrElementVisitorVoid import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid @@ -89,7 +90,7 @@ class FlattenStringConcatenationLowering(val context: CommonBackendContext) : Fi expression.type.isStringClassType() && expression.valueArgumentsCount == 1 && function.name == PLUS_NAME && - function.parent.fqNameSafe in PARENT_NAMES + function.fqNameWhenAvailable?.parent() in PARENT_NAMES } else -> false }