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

Generate less JS inline function wrappers

Browse Source
This commit is contained in:
Alexey Andreev
2017-07-05 17:40:40 +03:00
parent aaf3380050
commit 8e6b1da592
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java
+14 -1
View File
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.js.inline.context.FunctionContext;
import org.jetbrains.kotlin.js.inline.context.InliningContext; import org.jetbrains.kotlin.js.inline.context.InliningContext;
import org.jetbrains.kotlin.js.inline.context.NamingContext; import org.jetbrains.kotlin.js.inline.context.NamingContext;
import org.jetbrains.kotlin.js.inline.util.*; import org.jetbrains.kotlin.js.inline.util.*;
import org.jetbrains.kotlin.js.translate.expression.InlineMetadata;
import org.jetbrains.kotlin.resolve.inline.InlineStrategy; import org.jetbrains.kotlin.resolve.inline.InlineStrategy;
import java.util.*; import java.util.*;
@@ -64,6 +65,7 @@ public class JsInliner extends JsVisitorWithContextImpl {
private final LinkedList<JsCallInfo> inlineCallInfos = new LinkedList<>(); private final LinkedList<JsCallInfo> inlineCallInfos = new LinkedList<>();
private final Function1<JsNode, Boolean> canBeExtractedByInliner = private final Function1<JsNode, Boolean> canBeExtractedByInliner =
node -> node instanceof JsInvocation && hasToBeInlined((JsInvocation) node); node -> node instanceof JsInvocation && hasToBeInlined((JsInvocation) node);
private int inlineFunctionDepth;
public static void process( public static void process(
@NotNull JsConfig.Reporter reporter, @NotNull JsConfig.Reporter reporter,
@@ -266,6 +268,10 @@ public class JsInliner extends JsVisitorWithContextImpl {
@Override @Override
public boolean visit(@NotNull JsInvocation call, @NotNull JsContext context) { public boolean visit(@NotNull JsInvocation call, @NotNull JsContext context) {
if (InlineMetadata.decompose(call) != null) {
inlineFunctionDepth++;
}
if (!hasToBeInlined(call)) return true; if (!hasToBeInlined(call)) return true;
JsFunction containingFunction = getCurrentNamedFunction(); JsFunction containingFunction = getCurrentNamedFunction();
@@ -280,7 +286,10 @@ public class JsInliner extends JsVisitorWithContextImpl {
reportInlineCycle(call, definition.getFunction()); reportInlineCycle(call, definition.getFunction());
} }
else if (!processedFunctions.contains(definition.getFunction())) { else if (!processedFunctions.contains(definition.getFunction())) {
inlineFunctionDepth++;
visit(definition); visit(definition);
inlineFunctionDepth--;
return false;
} }
return true; return true;
@@ -288,6 +297,10 @@ public class JsInliner extends JsVisitorWithContextImpl {
@Override @Override
public void endVisit(@NotNull JsInvocation x, @NotNull JsContext ctx) { public void endVisit(@NotNull JsInvocation x, @NotNull JsContext ctx) {
if (InlineMetadata.decompose(x) != null) {
inlineFunctionDepth--;
}
if (hasToBeInlined(x)) { if (hasToBeInlined(x)) {
inline(x, ctx); inline(x, ctx);
} }
@@ -381,7 +394,7 @@ public class JsInliner extends JsVisitorWithContextImpl {
String tag = getImportTag(jsVars); String tag = getImportTag(jsVars);
if (tag != null) { if (tag != null) {
JsName name = jsVars.getVars().get(0).getName(); JsName name = jsVars.getVars().get(0).getName();
JsName existingName = existingImports == null ? MetadataProperties.getLocalAlias(name) : null; JsName existingName = inlineFunctionDepth == 0 ? MetadataProperties.getLocalAlias(name) : null;
if (existingName == null) { if (existingName == null) {
existingName = existingImports.computeIfAbsent(tag, t -> { existingName = existingImports.computeIfAbsent(tag, t -> {
copiedStatements.add(jsVars); copiedStatements.add(jsVars);