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

FIR: optimize converting string expressions in raw FIR builder

Browse Source 
Do get ASTNode for every string template entry as it is expensive operation
This commit is contained in:
Ilya Kirillov
2020-09-25 20:14:57 +03:00
parent 5937ffae4d
commit 852d705c71
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+15 -3
View File
@@ -1449,9 +1449,21 @@ class RawFirBuilder(
generateConstantExpressionByLiteral(expression) generateConstantExpressionByLiteral(expression)
override fun visitStringTemplateExpression(expression: KtStringTemplateExpression, data: Unit): FirElement { override fun visitStringTemplateExpression(expression: KtStringTemplateExpression, data: Unit): FirElement {
return expression.entries.toInterpolatingCall(expression) { return expression.entries.toInterpolatingCall(
(this as KtStringTemplateEntryWithExpression).expression.toFirExpression(it) expression,
} getElementType = { element ->
when (element) {
is KtLiteralStringTemplateEntry -> KtNodeTypes.LITERAL_STRING_TEMPLATE_ENTRY
is KtEscapeStringTemplateEntry -> KtNodeTypes.ESCAPE_STRING_TEMPLATE_ENTRY
is KtSimpleNameStringTemplateEntry -> KtNodeTypes.SHORT_STRING_TEMPLATE_ENTRY
is KtBlockStringTemplateEntry -> KtNodeTypes.LONG_STRING_TEMPLATE_ENTRY
else -> error("invalid node type $element")
}
},
convertTemplateEntry = {
(this as KtStringTemplateEntryWithExpression).expression.toFirExpression(it)
},
)
} }
override fun visitReturnExpression(expression: KtReturnExpression, data: Unit): FirElement { override fun visitReturnExpression(expression: KtReturnExpression, data: Unit): FirElement {
compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt
+2 -1
View File
@@ -325,6 +325,7 @@ abstract class BaseFirBuilder<T>(val baseSession: FirSession, val context: Conte
fun Array<out T?>.toInterpolatingCall( fun Array<out T?>.toInterpolatingCall(
base: T, base: T,
getElementType: (T) -> IElementType = { it.elementType },
convertTemplateEntry: T?.(String) -> FirExpression convertTemplateEntry: T?.(String) -> FirExpression
): FirExpression { ): FirExpression {
return buildStringConcatenationCall { return buildStringConcatenationCall {
@@ -333,7 +334,7 @@ abstract class BaseFirBuilder<T>(val baseSession: FirSession, val context: Conte
argumentList = buildArgumentList { argumentList = buildArgumentList {
L@ for (entry in this@toInterpolatingCall) { L@ for (entry in this@toInterpolatingCall) {
if (entry == null) continue if (entry == null) continue
arguments += when (entry.elementType) { arguments += when (getElementType(entry)) {
OPEN_QUOTE, CLOSING_QUOTE -> continue@L OPEN_QUOTE, CLOSING_QUOTE -> continue@L
LITERAL_STRING_TEMPLATE_ENTRY -> { LITERAL_STRING_TEMPLATE_ENTRY -> {
sb.append(entry.asText) sb.append(entry.asText)