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

[IR] Slightly simplify string concatenation folding

Browse Source 
#KT-58923
This commit is contained in:
Ivan Kylchik
2023-05-29 14:13:33 +02:00
committed by Space Team
parent dd264cff50
commit a6a389933d
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/transformer/IrConstExpressionTransformer.kt
+4 -7
View File
@@ -115,25 +115,22 @@ internal abstract class IrConstExpressionTransformer(
folded += next folded += next
buildersList.add(StringBuilder(next.getConstStringOrEmpty())) buildersList.add(StringBuilder(next.getConstStringOrEmpty()))
} else { } else {
buildersList.last().append(nextAsConst.value.toString())
folded[folded.size - 1] = IrConstImpl.string( folded[folded.size - 1] = IrConstImpl.string(
// Inlined strings may have `last.startOffset > next.endOffset` // Inlined strings may have `last.startOffset > next.endOffset`
min(last.startOffset, next.startOffset), max(last.endOffset, next.endOffset), expression.type, "" min(last.startOffset, next.startOffset), max(last.endOffset, next.endOffset),
expression.type, buildersList.last().toString()
) )
buildersList.last().append(nextAsConst.value.toString())
} }
} }
} }
} }
val foldedConst = folded.singleOrNull() as? IrConst<*> val foldedConst = folded.singleOrNull() as? IrConst<*>
if (foldedConst != null) { if (foldedConst != null && foldedConst.value is String) {
return IrConstImpl.string(expression.startOffset, expression.endOffset, expression.type, buildersList.single().toString()) return IrConstImpl.string(expression.startOffset, expression.endOffset, expression.type, buildersList.single().toString())
} }
folded.zip(buildersList).forEach {
@Suppress("UNCHECKED_CAST")
(it.first as? IrConst<String>)?.value = it.second.toString()
}
return IrStringConcatenationImpl(expression.startOffset, expression.endOffset, expression.type, folded) return IrStringConcatenationImpl(expression.startOffset, expression.endOffset, expression.type, folded)
} }
} }