Introduce fictitious numbered Function class descriptors

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

@@ -28,11 +28,12 @@ import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM;
 import org.jetbrains.kotlin.storage.LockBasedStorageManager;
 import org.jetbrains.kotlin.types.JetType;
+import org.jetbrains.kotlin.types.JetTypeImpl;
+import org.jetbrains.kotlin.types.TypeProjection;
+import org.jetbrains.kotlin.types.TypeProjectionImpl;
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
+import java.util.*;
 
 import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns;
 
@@ -94,30 +95,40 @@ public class JvmRuntimeTypes {
         ReceiverParameterDescriptor extensionReceiver = descriptor.getExtensionReceiverParameter();
         ReceiverParameterDescriptor dispatchReceiver = descriptor.getDispatchReceiverParameter();
 
+        List<TypeProjection> typeArguments = new ArrayList<TypeProjection>(2);
+
+        ClassDescriptor kFunctionClass;
         ClassDescriptor functionImplClass;
         JetType receiverType;
         if (extensionReceiver != null) {
             functionImplClass = extensionFunctionImpl;
             receiverType = extensionReceiver.getType();
+            kFunctionClass = reflectionTypes.getkExtensionFunction();
+            typeArguments.add(new TypeProjectionImpl(receiverType));
         }
         else if (dispatchReceiver != null) {
             functionImplClass = memberFunctionImpl;
             receiverType = dispatchReceiver.getType();
+            kFunctionClass = reflectionTypes.getkMemberFunction();
+            typeArguments.add(new TypeProjectionImpl(receiverType));
         }
         else {
             functionImplClass = functionImpl;
             receiverType = null;
+            kFunctionClass = reflectionTypes.getkFunction();
         }
 
         JetType functionImplType = functionImplClass.getDefaultType();
 
         //noinspection ConstantConditions
-        JetType kFunctionType = reflectionTypes.getKFunctionType(
-                Annotations.EMPTY,
-                receiverType,
-                ExpressionTypingUtils.getValueParametersTypes(descriptor.getValueParameters()),
-                descriptor.getReturnType(),
-                extensionReceiver != null
+        typeArguments.add(new TypeProjectionImpl(descriptor.getReturnType()));
+
+        JetType kFunctionType = new JetTypeImpl(
+                kFunctionClass.getDefaultType().getAnnotations(),
+                kFunctionClass.getTypeConstructor(),
+                false,
+                typeArguments,
+                kFunctionClass.getMemberScope(typeArguments)
         );
 
         return Arrays.asList(functionImplType, kFunctionType);

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

@@ -256,7 +256,7 @@ public class InlineCodegenUtil {
             return false;
         }
 
-        for (String prefix : Arrays.asList("kotlin/Function", "kotlin/ExtensionFunction")) {
+        for (String prefix : Arrays.asList("kotlin/jvm/functions/Function", "kotlin/ExtensionFunction")) {
             if (owner.startsWith(prefix)) {
                 String suffix = owner.substring(prefix.length());
                 if (isInteger(suffix)) {

compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java

@@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.builtins.PrimitiveType;
+import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor;
 import org.jetbrains.kotlin.codegen.*;
 import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
 import org.jetbrains.kotlin.codegen.binding.MutableClosure;
@@ -595,7 +596,9 @@ public class JetTypeMapper {
 
                 signature = mapSignature(functionDescriptor.getOriginal());
 
-                ClassDescriptor receiver = currentIsInterface && !originalIsInterface ? declarationOwner : currentOwner;
+                ClassDescriptor receiver = (currentIsInterface && !originalIsInterface) || currentOwner instanceof FunctionClassDescriptor
+                                           ? declarationOwner
+                                           : currentOwner;
                 owner = mapClass(receiver);
                 thisClass = owner;
             }