Fix nameless function inlining

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java

@@ -299,7 +299,7 @@ public class InlineCodegen extends CallGenerator {
     }
 
     private SMAPAndMethodNode generateLambdaBody(LambdaInfo info) {
-        JetExpression declaration = info.getFunctionLiteralOrCallableReference();
+        JetExpression declaration = info.getFunctionWithBodyOrCallableReference();
         FunctionDescriptor descriptor = info.getFunctionDescriptor();
 
         MethodContext parentContext = codegen.getContext();
@@ -524,14 +524,18 @@ public class InlineCodegen extends CallGenerator {
         //TODO deparenthisise typed
         JetExpression deparenthesized = JetPsiUtil.deparenthesize(expression);
         return InlineUtil.isInlineLambdaParameter(valueParameterDescriptor) &&
-               (deparenthesized instanceof JetFunctionLiteralExpression ||
-               deparenthesized instanceof JetCallableReferenceExpression);
+               isInlinableParameterExpression(deparenthesized);
+    }
+
+    protected static boolean isInlinableParameterExpression(JetExpression deparenthesized) {
+        return deparenthesized instanceof JetFunctionLiteralExpression ||
+               deparenthesized instanceof JetNamedFunction ||
+               deparenthesized instanceof JetCallableReferenceExpression;
     }
 
     public void rememberClosure(JetExpression expression, Type type) {
         JetExpression lambda = JetPsiUtil.deparenthesize(expression);
-        assert lambda instanceof JetCallableReferenceExpression || lambda instanceof JetFunctionLiteralExpression :
-                "Couldn't find inline expression in " + expression.getText();
+        assert isInlinableParameterExpression(lambda) :"Couldn't find inline expression in " + expression.getText();
 
         String labelNameIfPresent = null;
         PsiElement parent = lambda.getParent();

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java

@@ -86,7 +86,7 @@ public class LambdaInfo implements CapturedParamOwner, LabelOwner {
         return functionDescriptor;
     }
 
-    public JetExpression getFunctionLiteralOrCallableReference() {
+    public JetExpression getFunctionWithBodyOrCallableReference() {
         return expression;
     }
 

compiler/testData/codegen/boxInline/nameless/extension.1.kt

@@ -0,0 +1,37 @@
+fun test1(): Int {
+    val inlineX = Inline(9)
+    return inlineX.calcExt(fun smth(z: Int) = z, 25)
+}
+
+fun test2(): Int {
+    val inlineX = Inline(9)
+    return inlineX.calcExt2(fun Int.(): Int = this, 25)
+}
+
+fun test3(): Int {
+    val inlineX = Inline(9)
+    return inlineX.doWork(InlineX(11))
+}
+
+fun test4(): Double {
+    val inlineX = Inline(9)
+    return inlineX.doWorkWithDouble(11.0)
+}
+
+fun test5(): Double {
+    val inlineX = Inline(9)
+    with(inlineX) {
+        11.0.calcDouble(fun (a: Int, b: Double) = a + b)
+    }
+    return inlineX.doWorkWithDouble(11.0)
+}
+
+fun box(): String {
+    if (test1() != 25) return "test1: ${test1()}"
+    if (test2() != 25) return "test2: ${test2()}"
+    if (test3() != 20) return "test3: ${test3()}"
+    if (test4() != 20.0) return "test4: ${test4()}"
+    if (test5() != 20.0) return "test5: ${test5()}"
+
+    return "OK"
+}

compiler/testData/codegen/boxInline/nameless/extension.2.kt

@@ -0,0 +1,29 @@
+inline fun Inline.calcExt(s: (Int) -> Int, p: Int) : Int {
+    return s(p)
+}
+
+inline fun  Inline.calcExt2(s: Int.() -> Int, p: Int) : Int {
+    return p.s()
+}
+
+class InlineX(val value : Int) {}
+
+class Inline(val res: Int) {
+
+    inline fun InlineX.calcInt(s: (Int, Int) -> Int) : Int {
+        return s(res, this.value)
+    }
+
+    inline fun Double.calcDouble(s: (Int, Double) -> Double) : Double {
+        return s(res, this)
+    }
+
+    fun doWork(l : InlineX) : Int {
+        return l.calcInt(fun (a: Int, b: Int) = a + b)
+    }
+
+    fun doWorkWithDouble(s : Double) : Double {
+        return s.calcDouble(fun (a: Int, b: Double) = a + b)
+    }
+
+}

compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java

@@ -338,6 +338,21 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/boxInline/nameless")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Nameless extends AbstractBlackBoxInlineCodegenTest {
+        public void testAllFilesPresentInNameless() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nameless"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+
+        @TestMetadata("extension.1.kt")
+        public void testExtension() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nameless/extension.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/boxInline/noInline")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)

compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java

@@ -338,6 +338,21 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         }
     }
 
+    @TestMetadata("compiler/testData/codegen/boxInline/nameless")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Nameless extends AbstractCompileKotlinAgainstInlineKotlinTest {
+        public void testAllFilesPresentInNameless() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nameless"), Pattern.compile("^(.+)\\.1.kt$"), true);
+        }
+
+        @TestMetadata("extension.1.kt")
+        public void testExtension() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nameless/extension.1.kt");
+            doBoxTestWithInlineCheck(fileName);
+        }
+    }
+
     @TestMetadata("compiler/testData/codegen/boxInline/noInline")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)