Fix for KT-16411, KT-16412: Exception from compiler when try call SAM constructor where argument is callable reference to nested class inside object

  #Fixed KT-16411
  #Fixed KT-16412

Author: Mikhael Bogdanov

compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java

@@ -37,6 +37,8 @@
 
 import java.util.*;
 
+import static org.jetbrains.kotlin.resolve.DescriptorUtils.isObject;
+
 public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrategy.CodegenBased {
     private final ResolvedCall<?> resolvedCall;
     private final FunctionDescriptor referencedFunction;
@@ -146,6 +148,12 @@ private void computeAndSaveArguments(@NotNull List<? extends ValueArgument> fake
                         (referencedFunction.getExtensionReceiverParameter() != null ? 1 : 0) -
                         (receiverType != null ? 1 : 0);
 
+        if (receivers < 0 &&  referencedFunction instanceof ConstructorDescriptor && isObject(referencedFunction.getContainingDeclaration().getContainingDeclaration())) {
+            //reference to object nested class
+            //TODO: seems problem should be fixed on frontend side (note that object instance are captured by generated class)
+            receivers = 0;
+        }
+
         List<ValueParameterDescriptor> parameters = CollectionsKt.drop(functionDescriptor.getValueParameters(), receivers);
         for (int i = 0; i < parameters.size(); i++) {
             ValueParameterDescriptor parameter = parameters.get(i);

compiler/testData/codegen/boxAgainstJava/callableReference/kt16412.kt

@@ -0,0 +1,20 @@
+// FILE: MFunction.java
+
+public interface MFunction<T, R> {
+    R invoke(T t);
+}
+
+// FILE: 1.kt
+
+
+object Foo {
+    class Requester(val dealToBeOffered: String)
+}
+
+class Bar {
+    val foo = MFunction(Foo::Requester)
+}
+
+fun box(): String {
+    return Bar().foo("OK").dealToBeOffered
+}

compiler/testData/codegen/boxInline/callableReference/kt16411.kt

@@ -0,0 +1,17 @@
+// FILE: 1.kt
+
+inline fun <R> startFlow(
+        flowConstructor: (String) -> R
+): R {
+    return flowConstructor("OK")
+}
+
+object Foo {
+    class Requester(val dealToBeOffered: String)
+}
+
+// FILE: 2.kt
+
+fun box(): String {
+    return startFlow(Foo::Requester).dealToBeOffered
+}

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java

@@ -152,6 +152,12 @@ public void testConstructor() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata("kt16412.kt")
+        public void testKt16412() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/kt16412.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("publicFinalField.kt")
         public void testPublicFinalField() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/publicFinalField.kt");

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

@@ -596,6 +596,12 @@ public void testKt15449() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata("kt16411.kt")
+        public void testKt16411() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/kt16411.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("propertyIntrinsic.kt")
         public void testPropertyIntrinsic() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/propertyIntrinsic.kt");

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

@@ -596,6 +596,12 @@ public void testKt15449() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata("kt16411.kt")
+        public void testKt16411() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/kt16411.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("propertyIntrinsic.kt")
         public void testPropertyIntrinsic() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/propertyIntrinsic.kt");

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CallableReferenceInlineTestsGenerated.java

@@ -66,6 +66,12 @@ public void testKt15449() throws Exception {
         doTest(fileName);
     }
 
+    @TestMetadata("kt16411.kt")
+    public void testKt16411() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/kt16411.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("propertyIntrinsic.kt")
     public void testPropertyIntrinsic() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/propertyIntrinsic.kt");