azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K2: fix using compatibility resolve for SAM constructors

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-07-19 10:26:36 +02:00
committed by Space
parent 32a73968de
commit 577b9686c1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt
+5 -1
View File
@@ -450,6 +450,7 @@ internal object CheckArguments : CheckerStage() {
candidate.system.hasContradiction && callInfo.arguments.isNotEmpty() -> { candidate.system.hasContradiction && callInfo.arguments.isNotEmpty() -> {
sink.yieldDiagnostic(InapplicableCandidate) sink.yieldDiagnostic(InapplicableCandidate)
} }
candidate.usesSAM && !candidate.isJavaApplicableCandidate() -> { candidate.usesSAM && !candidate.isJavaApplicableCandidate() -> {
sink.markCandidateForCompatibilityResolve(context) sink.markCandidateForCompatibilityResolve(context)
} }
@@ -458,9 +459,12 @@ internal object CheckArguments : CheckerStage() {
} }
private fun Candidate.isJavaApplicableCandidate(): Boolean { private fun Candidate.isJavaApplicableCandidate(): Boolean {
val symbol = symbol as? FirNamedFunctionSymbol ?: return false val symbol = symbol as? FirFunctionSymbol ?: return false
if (symbol.origin == FirDeclarationOrigin.Enhancement) return true if (symbol.origin == FirDeclarationOrigin.Enhancement) return true
if (originScope !is FirTypeScope) return false if (originScope !is FirTypeScope) return false
// Note: constructor can also be Java applicable with enhancement origin, but it doesn't have overridden functions
// See samConstructorVsFun.kt diagnostic test
if (symbol !is FirNamedFunctionSymbol) return false
var result = false var result = false