From d06b2f4d0a208b83528799abad2b88ca4e2f68d9 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 4 Mar 2015 21:33:46 +0300 Subject: [PATCH] JS: do not inline safe calls A temporary hack until js inliner learns how to decompose expressions --- .../kotlin/js/translate/reference/CallExpressionTranslator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java index 7ce224f08ff..029c450c74b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java @@ -66,7 +66,7 @@ public final class CallExpressionTranslator extends AbstractCallExpressionTransl JsExpression callExpression = (new CallExpressionTranslator(expression, receiver, context)).translate(); CallableDescriptor descriptor = getFunctionDescriptor(expression, context); - if (shouldBeInlined(expression, context)) { + if (!resolvedCall.isSafeCall() && shouldBeInlined(expression, context)) { setInlineCallMetadata(callExpression, descriptor, context); }