Fix exception during resolution of incorrect fun interface

#KT-37541 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2020-04-27 05:18:31 +03:00
parent 780bc1f607
commit 1a26d2e157
7 changed files with 61 additions and 6 deletions
@@ -7954,6 +7954,11 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
runTest("compiler/testData/diagnostics/tests/funInterface/genericSubstitutionForFunInterface.kt");
}
@TestMetadata("resolveFunInterfaceWithoutMainMethod.kt")
public void testResolveFunInterfaceWithoutMainMethod() throws Exception {
runTest("compiler/testData/diagnostics/tests/funInterface/resolveFunInterfaceWithoutMainMethod.kt");
}
@TestMetadata("severalConversionsForFunInterface.kt")
public void testSeveralConversionsForFunInterface() throws Exception {
runTest("compiler/testData/diagnostics/tests/funInterface/severalConversionsForFunInterface.kt");
@@ -0,0 +1,12 @@
fun interface IsolatedFunFace {
}
typealias FunAlias = IsolatedFunFace
fun referIsolatedFunFace(iff: IsolatedFunFace) {}
fun callIsolatedFunFace() {
referIsolatedFunFace(<!UNRESOLVED_REFERENCE!>IsolatedFunFace<!> {})
referIsolatedFunFace(<!UNRESOLVED_REFERENCE!>FunAlias<!> {})
<!INAPPLICABLE_CANDIDATE!>referIsolatedFunFace<!>({})
}
@@ -0,0 +1,12 @@
<!FUN_INTERFACE_WRONG_COUNT_OF_ABSTRACT_MEMBERS!>fun<!> interface IsolatedFunFace {
}
typealias FunAlias = IsolatedFunFace
fun referIsolatedFunFace(<!UNUSED_PARAMETER!>iff<!>: IsolatedFunFace) {}
fun callIsolatedFunFace() {
referIsolatedFunFace(<!RESOLUTION_TO_CLASSIFIER!>IsolatedFunFace<!> {})
referIsolatedFunFace(<!RESOLUTION_TO_CLASSIFIER!>FunAlias<!> {})
referIsolatedFunFace(<!TYPE_MISMATCH!>{}<!>)
}
@@ -0,0 +1,11 @@
package
public fun callIsolatedFunFace(): kotlin.Unit
public fun referIsolatedFunFace(/*0*/ iff: IsolatedFunFace): kotlin.Unit
public fun interface IsolatedFunFace {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public typealias FunAlias = IsolatedFunFace
@@ -7961,6 +7961,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTestWithFirVali
runTest("compiler/testData/diagnostics/tests/funInterface/genericSubstitutionForFunInterface.kt");
}
@TestMetadata("resolveFunInterfaceWithoutMainMethod.kt")
public void testResolveFunInterfaceWithoutMainMethod() throws Exception {
runTest("compiler/testData/diagnostics/tests/funInterface/resolveFunInterfaceWithoutMainMethod.kt");
}
@TestMetadata("severalConversionsForFunInterface.kt")
public void testSeveralConversionsForFunInterface() throws Exception {
runTest("compiler/testData/diagnostics/tests/funInterface/severalConversionsForFunInterface.kt");
@@ -7956,6 +7956,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
runTest("compiler/testData/diagnostics/tests/funInterface/genericSubstitutionForFunInterface.kt");
}
@TestMetadata("resolveFunInterfaceWithoutMainMethod.kt")
public void testResolveFunInterfaceWithoutMainMethod() throws Exception {
runTest("compiler/testData/diagnostics/tests/funInterface/resolveFunInterfaceWithoutMainMethod.kt");
}
@TestMetadata("severalConversionsForFunInterface.kt")
public void testSeveralConversionsForFunInterface() throws Exception {
runTest("compiler/testData/diagnostics/tests/funInterface/severalConversionsForFunInterface.kt");
@@ -58,21 +58,26 @@ class FunInterfaceConstructorsSyntheticScope(
return getTypeAliasSamConstructor(classifier)
}
if (classifier !is ClassDescriptor) return null
if (!classifier.isFun) return null
return samConstructorForClassifier(classifier)
val classDescriptor = checkIfClassifierApplicable(classifier) ?: return null
return samConstructorForClassifier(classDescriptor)
}
private fun getTypeAliasSamConstructor(classifier: TypeAliasDescriptor): SamConstructorDescriptor? {
val classDescriptor = classifier.classDescriptor ?: return null
if (!classDescriptor.isFun) return null
val classDescriptor = checkIfClassifierApplicable(classifier.classDescriptor ?: return null) ?: return null
return createTypeAliasSamConstructorFunction(
classifier, samConstructorForClassifier(classDescriptor), samResolver, samConversionOracle
)
}
private fun checkIfClassifierApplicable(classifier: ClassifierDescriptor): ClassDescriptor? {
if (classifier !is ClassDescriptor) return null
if (!classifier.isFun) return null
if (getSingleAbstractMethodOrNull(classifier) == null) return null
return classifier
}
private fun recordSamLookupsToClassifier(classifier: ClassifierDescriptor, location: LookupLocation) {
if (classifier !is ClassDescriptor || !classifier.isFun) return
lookupTracker.record(location, classifier, SAM_LOOKUP_NAME)