Default inline flag = true

2014-02-20 12:33:18 +04:00
parent c716b6eda0
commit ee136d6594
9 changed files with 14 additions and 11 deletions
@@ -2121,9 +2121,12 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
            @NotNull ResolvedCall<? extends CallableDescriptor> resolvedCall,
            @NotNull StackValue receiver
    ) {
-        boolean disable = false;
        CallableDescriptor descriptor = resolvedCall.getResultingDescriptor();
-        boolean isInline = call != null && descriptor instanceof SimpleFunctionDescriptor && ((SimpleFunctionDescriptor) descriptor).getInlineStrategy().isInline();
+        boolean isInline = state.isInlineEnabled() &&
+                           call != null &&
+                           descriptor instanceof SimpleFunctionDescriptor &&
+                           ((SimpleFunctionDescriptor) descriptor).getInlineStrategy().isInline();
+
        Inliner inliner = !isInline ? Inliner.NOT_INLINE :
                          new InlineCodegen(this, state, (SimpleFunctionDescriptor) unwrapFakeOverride(
                                  (CallableMemberDescriptor) descriptor.getOriginal()), call);