Added inline annotation check on local funs

2014-10-10 13:42:10 +04:00
parent 2a1520228e
commit 605c9f48b4
21 changed files with 104 additions and 48 deletions
@@ -2222,8 +2222,8 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
        boolean isInline = state.isInlineEnabled() &&
                           descriptor instanceof SimpleFunctionDescriptor &&
                           ((SimpleFunctionDescriptor) descriptor).getInlineStrategy().isInline();
-        //TODO: support local fun inlining
-        if (!isInline || isLocalNamedFun(descriptor)) return defaultCallGenerator;
+
+        if (!isInline) return defaultCallGenerator;

        SimpleFunctionDescriptor original = DescriptorUtils.unwrapFakeOverride((SimpleFunctionDescriptor) descriptor.getOriginal());
        return new InlineCodegen(this, state, original, callElement);