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

JS inline minor: inlined doDirectInline()

Browse Source
This commit is contained in:
Alexey Tsvetkov
2014-10-02 15:41:42 +04:00
committed by Zalim Bashorov
parent 6018b103cc
commit fb475775c9
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.inliner/src/org/jetbrains/k2js/inline/FunctionInlineMutator.java
+4 -6
View File
@@ -84,7 +84,10 @@ class FunctionInlineMutator {
renameLocalNames(namingContext, invokedFunction); renameLocalNames(namingContext, invokedFunction);
if (canBeExpression(body)) { if (canBeExpression(body)) {
doDirectInline(); resultExpr = asExpression(body);
body.getStatements().clear();
/** JsExpression can be immutable, so need to reassign */
resultExpr = (JsExpression) namingContext.applyRenameTo(resultExpr);
} else { } else {
processReturns(); processReturns();
namingContext.applyRenameTo(body); namingContext.applyRenameTo(body);
@@ -116,11 +119,6 @@ class FunctionInlineMutator {
} }
} }
private void doDirectInline() {
resultExpr = asExpression(body);
body.getStatements().clear();
}
private void doReplaceReturns(int returnCount) { private void doReplaceReturns(int returnCount) {
JsReturn returnOnTop = ContainerUtil.findInstance(body.getStatements(), JsReturn.class); JsReturn returnOnTop = ContainerUtil.findInstance(body.getStatements(), JsReturn.class);
boolean hasReturnOnTopLevel = returnOnTop != null; boolean hasReturnOnTopLevel = returnOnTop != null;