FIC: Move sam related methods to ClassDescriptor, fix JVM backend part

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

@@ -72,11 +72,8 @@ public class SamType {
     @NotNull
     public KotlinType getKotlinFunctionType() {
         ClassDescriptor descriptor = getClassDescriptor();
-        if (descriptor instanceof JavaClassDescriptor) {
-            return ((JavaClassDescriptor) descriptor).getDefaultFunctionTypeForSamInterface();
-        }
-
-        return null;
+        //noinspection ConstantConditions
+        return descriptor.getDefaultFunctionTypeForSamInterface();
     }
 
     @NotNull

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyClassContext.kt

@@ -45,4 +45,5 @@ interface LazyClassContext {
     val delegationFilter: DelegationFilter
     val wrappedTypeFactory: WrappedTypeFactory
     val kotlinTypeChecker: NewKotlinTypeChecker
+    val samConversionResolver: SamConversionResolver
 }

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java

@@ -83,6 +83,7 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
     private DelegationFilter delegationFilter;
     private WrappedTypeFactory wrappedTypeFactory;
     private PlatformDiagnosticSuppressor platformDiagnosticSuppressor;
+    private SamConversionResolver samConversionResolver;
 
     private final SyntheticResolveExtension syntheticResolveExtension;
 
@@ -150,6 +151,11 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
         this.platformDiagnosticSuppressor = platformDiagnosticSuppressor;
     }
 
+    @Inject
+    public void setSamConversionResolver(@NotNull SamConversionResolver samConversionResolver) {
+        this.samConversionResolver = samConversionResolver;
+    }
+
     // Only calls from injectors expected
     @Deprecated
     public ResolveSession(
@@ -477,4 +483,10 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
     public NewKotlinTypeChecker getKotlinTypeChecker() {
         return kotlinTypeChecker;
     }
+
+    @NotNull
+    @Override
+    public SamConversionResolver getSamConversionResolver() {
+        return samConversionResolver;
+    }
 }

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java

@@ -421,6 +421,17 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
         return companionObjectDescriptor.invoke();
     }
 
+    @Nullable
+    @Override
+    public SimpleType getDefaultFunctionTypeForSamInterface() {
+        return c.getSamConversionResolver().resolveFunctionTypeIfSamInterface(this);
+    }
+
+    @Override
+    public boolean isDefinitelyNotSamInterface() {
+        return !isFun();
+    }
+
     @NotNull
     @ReadOnly
     public List<ClassDescriptor> getDescriptorsForExtraCompanionObjects() {

compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt

@@ -67,7 +67,8 @@ class LocalClassifierAnalyzer(
     private val languageVersionSettings: LanguageVersionSettings,
     private val delegationFilter: DelegationFilter,
     private val wrappedTypeFactory: WrappedTypeFactory,
-    private val kotlinTypeChecker: NewKotlinTypeChecker
+    private val kotlinTypeChecker: NewKotlinTypeChecker,
+    private val samConversionResolver: SamConversionResolver
 ) {
     fun processClassOrObject(
         scope: LexicalWritableScope?,
@@ -101,7 +102,8 @@ class LocalClassifierAnalyzer(
                 SyntheticResolveExtension.getInstance(project),
                 delegationFilter,
                 wrappedTypeFactory,
-                kotlinTypeChecker
+                kotlinTypeChecker,
+                samConversionResolver
             ),
             analyzerServices
         )
@@ -130,7 +132,8 @@ class LocalClassDescriptorHolder(
     val syntheticResolveExtension: SyntheticResolveExtension,
     val delegationFilter: DelegationFilter,
     val wrappedTypeFactory: WrappedTypeFactory,
-    val kotlinTypeChecker: NewKotlinTypeChecker
+    val kotlinTypeChecker: NewKotlinTypeChecker,
+    val samConversionResolver: SamConversionResolver
 ) {
     // We do not need to synchronize here, because this code is used strictly from one thread
     private var classDescriptor: ClassDescriptor? = null
@@ -171,6 +174,7 @@ class LocalClassDescriptorHolder(
                     override val delegationFilter: DelegationFilter = this@LocalClassDescriptorHolder.delegationFilter
                     override val wrappedTypeFactory: WrappedTypeFactory = this@LocalClassDescriptorHolder.wrappedTypeFactory
                     override val kotlinTypeChecker: NewKotlinTypeChecker = this@LocalClassDescriptorHolder.kotlinTypeChecker
+                    override val samConversionResolver: SamConversionResolver = this@LocalClassDescriptorHolder.samConversionResolver
                 },
                 containingDeclaration,
                 classOrObject.nameAsSafeName,

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt

@@ -638,6 +638,14 @@ open class WrappedClassDescriptor(
     override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
         visitor!!.visitClassDescriptor(this, null)
     }
+
+    override fun getDefaultFunctionTypeForSamInterface(): SimpleType? {
+        return owner.descriptor.defaultFunctionTypeForSamInterface
+    }
+
+    override fun isDefinitelyNotSamInterface(): Boolean {
+        return owner.descriptor.isDefinitelyNotSamInterface
+    }
 }
 
 class LazyTypeConstructor(
@@ -751,6 +759,10 @@ open class WrappedEnumEntryDescriptor(
     override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
         visitor!!.visitClassDescriptor(this, null)
     }
+
+    override fun getDefaultFunctionTypeForSamInterface(): SimpleType? = null
+
+    override fun isDefinitelyNotSamInterface() = true
 }