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

JS/Inlining: in temporary variable elimination introduce better recognition of FQNs without side effects

Browse Source
This commit is contained in:
Alexey Andreev
2016-05-04 17:59:20 +03:00
parent c08e2e8ca0
commit 776c7447b1
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.inliner/src/org/jetbrains/kotlin/js/inline/clean/TemporaryVariableElimination.kt
+10 -2
View File
@@ -488,8 +488,16 @@ internal class TemporaryVariableElimination(private val root: JsStatement) {
return (expr != null && isTrivial(expr)) || usages[name] ?: 0 == 1 return (expr != null && isTrivial(expr)) || usages[name] ?: 0 == 1
} }
private fun isTrivial(expr: JsExpression) = when (expr) { private fun isTrivial(expr: JsExpression): Boolean = when (expr) {
is JsNameRef -> expr.qualifier == null && (expr.name?.let { definitions[it] ?: 0 <= 1 } ?: false) is JsNameRef -> {
val qualifier = expr.qualifier
if (qualifier == null) {
!expr.sideEffects || (expr.name?.let { definitions[it] ?: 0 <= 1 } ?: false)
}
else {
!expr.sideEffects && isTrivial(qualifier)
}
}
is JsLiteral.JsValueLiteral -> true is JsLiteral.JsValueLiteral -> true
else -> false else -> false
} }