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

K2: Fix false-positive resolution to j.l.String constructor

Browse Source 
In K1 (see LazyImportScope), default start import with different
priority worked as follows:
- if something is found in HIGH, don't look at LOW
- otherwise, look at LOW

That, in particular, helped to avoid looking into JDK mirroring classes'
constructors like when resolving calls like String(...) because we
just don't look into j.l.String while already found kotlin.String

The change inside FirTowerResolveTask.kt is not made accidentally:
- At first, it's more or less obviously a bug fix because tower group
for hide-members candidate with implicit receiver should take into
account the tower level of the receiver itself.
- The change is attached to this commit because otherwise the test
at compiler/testData/diagnostics/testsWithStdLib/kt55503.kt starts
failing.
The bug was hidden because previously after finding a successful
`Sequence.forEach` candidate for the inner receiver
(at the default HIGH star import scope), resolver was continuing to
look into default LOW star import scope where it's frozen forever because
we had the better/closer candidate anyway.

But after this change with merging default star imports into the same
tower leve, resolver was continuing its job, enumerating implicit
receivers, finding List<Int> there and noticing that there's
a TopPrioritized hide-member candidates for them
(erroneously ignoring it has a worse/more far receiver).

^KT-51670 Fixed
This commit is contained in:
Denis.Zharkov
2023-06-21 17:31:03 +02:00
committed by Space Team
parent 12dcfd25e6
commit 01354c8ce5
8 changed files with 143 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/stringConstructors.fir.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
FILE: stringConstructors.kt
public final val sRef: R|kotlin/reflect/KFunction0<kotlin/String>| = ::R|kotlin/String.String|
public get(): R|kotlin/reflect/KFunction0<kotlin/String>|
public final val s: R|java/lang/String| = R|java/lang/String.String|(R|kotlin/byteArrayOf|(vararg(Byte(1), Byte(2), Byte(3))), Int(4), Int(5), Int(6))
public get(): R|java/lang/String|
public final val s: R|kotlin/String| = R|kotlin/text/String<Inapplicable(INAPPLICABLE): kotlin/text/String>#|(R|kotlin/byteArrayOf|(vararg(Byte(1), Byte(2), Byte(3))), Int(4), Int(5), Int(6))
public get(): R|kotlin/String|
public final val s2: R|java/lang/String| = Q|java/lang|.R|java/lang/String.String|(R|kotlin/byteArrayOf|(vararg(Byte(1), Byte(2), Byte(3))), Int(4), Int(5), Int(6))
public get(): R|java/lang/String|
public final val s3: R|kotlin/String| = R|kotlin/text/String|(R|kotlin/byteArrayOf|(vararg(Byte(1), Byte(2), Byte(3))), Int(4), Int(5))
compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/stringConstructors.kt
Vendored
+1 -4
View File
@@ -2,10 +2,7 @@
val sRef = ::String
// Note: FE 1.0 resolves this to kotlin.text.String() synthetic call with type mismatch on the last argument
// May be we (FIR) should migrate to the same behavior
// Other properties in this file are resolved similarly in FE 1.0 & FIR
val s = <!DEPRECATION!>String<!>(byteArrayOf(1, 2, 3), 4, 5, 6)
val s = String(byteArrayOf(1, 2, 3), 4, 5, <!ARGUMENT_TYPE_MISMATCH!>6<!>)
val s2 = java.lang.<!DEPRECATION!>String<!>(byteArrayOf(1, 2, 3), 4, 5, 6)
val s3 = String(byteArrayOf(1, 2, 3), 4, 5)
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirDefaultStarImportingScope.kt
+52 -50
View File
@@ -1,67 +1,69 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.scopes.impl
import org.jetbrains.kotlin.config.AnalysisFlags
import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.builder.buildImport
import org.jetbrains.kotlin.fir.declarations.builder.buildResolvedImport
import org.jetbrains.kotlin.fir.languageVersionSettings
import org.jetbrains.kotlin.fir.moduleData
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
import org.jetbrains.kotlin.fir.scopes.FirScope
import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.name.Name
/**
* Works as composite scope that only looks to the second scope if the first one is empty.
* It's necessary, e.g. to make sure we don't look for java.lang.String classifier/constructors once we've found kotlin.String one.
* @see org.jetbrains.kotlin.resolve.lazy.LazyImportScope that produces similar semantics
*/
class FirDefaultStarImportingScope(
session: FirSession,
scopeSession: ScopeSession,
priority: DefaultImportPriority,
excludedImportNames: Set<FqName>
) : FirAbstractStarImportingScope(
session, scopeSession,
lookupInFir = session.languageVersionSettings.getFlag(AnalysisFlags.allowKotlinPackage),
excludedImportNames
) {
// TODO: put languageVersionSettings into FirSession?
override val starImports = run {
val analyzerServices = session.moduleData.analyzerServices
val allDefaultImports = priority.getAllDefaultImports(analyzerServices, LanguageVersionSettingsImpl.DEFAULT)
allDefaultImports
?.filter { it.isAllUnder }
?.map {
buildResolvedImport {
delegate = buildImport {
importedFqName = it.fqName
isAllUnder = true
}
packageFqName = it.fqName
}
} ?: emptyList()
private val first: FirSingleLevelDefaultStarImportingScope,
private val second: FirSingleLevelDefaultStarImportingScope,
) : FirScope(), DefaultStarImportingScopeMarker {
override fun processClassifiersByNameWithSubstitution(name: Name, processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit) {
var wasFoundAny = false
first.processClassifiersByNameWithSubstitution(name) { symbol, substitutor ->
wasFoundAny = true
processor(symbol, substitutor)
}
if (!wasFoundAny) {
second.processClassifiersByNameWithSubstitution(name, processor)
}
}
private fun <S : FirCallableSymbol<*>> processSymbolsByName(
name: Name,
processingFactory: FirScope.(Name, (S) -> Unit) -> Unit,
processor: (S) -> Unit,
) {
var wasFoundAny = false
first.processingFactory(name) {
wasFoundAny = true
processor(it)
}
if (!wasFoundAny) {
second.processingFactory(name, processor)
}
}
override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) {
if (name.isSpecial || name.identifier.isNotEmpty()) {
for (import in starImports) {
for (symbol in provider.getTopLevelFunctionSymbols(import.packageFqName, name)) {
processor(symbol)
}
}
}
processSymbolsByName(name, FirScope::processFunctionsByName, processor)
}
override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) {
if (name.isSpecial || name.identifier.isNotEmpty()) {
for (import in starImports) {
for (symbol in provider.getTopLevelPropertySymbols(import.packageFqName, name)) {
processor(symbol)
}
}
processSymbolsByName(name, FirScope::processPropertiesByName, processor)
}
override fun processDeclaredConstructors(processor: (FirConstructorSymbol) -> Unit) {
var wasFoundAny = false
first.processDeclaredConstructors { symbol ->
wasFoundAny = true
processor(symbol)
}
if (!wasFoundAny) {
second.processDeclaredConstructors(processor)
}
}
}
}
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirSingleLevelDefaultStarImportingScope.kt
+69
View File
@@ -0,0 +1,69 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.scopes.impl
import org.jetbrains.kotlin.config.AnalysisFlags
import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.builder.buildImport
import org.jetbrains.kotlin.fir.declarations.builder.buildResolvedImport
import org.jetbrains.kotlin.fir.languageVersionSettings
import org.jetbrains.kotlin.fir.moduleData
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
interface DefaultStarImportingScopeMarker
class FirSingleLevelDefaultStarImportingScope(
session: FirSession,
scopeSession: ScopeSession,
priority: DefaultImportPriority,
excludedImportNames: Set<FqName>
) : FirAbstractStarImportingScope(
session, scopeSession,
lookupInFir = session.languageVersionSettings.getFlag(AnalysisFlags.allowKotlinPackage),
excludedImportNames
), DefaultStarImportingScopeMarker {
// TODO: put languageVersionSettings into FirSession?
override val starImports = run {
val analyzerServices = session.moduleData.analyzerServices
val allDefaultImports = priority.getAllDefaultImports(analyzerServices, LanguageVersionSettingsImpl.DEFAULT)
allDefaultImports
?.filter { it.isAllUnder }
?.map {
buildResolvedImport {
delegate = buildImport {
importedFqName = it.fqName
isAllUnder = true
}
packageFqName = it.fqName
}
} ?: emptyList()
}
override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) {
if (name.isSpecial || name.identifier.isNotEmpty()) {
for (import in starImports) {
for (symbol in provider.getTopLevelFunctionSymbols(import.packageFqName, name)) {
processor(symbol)
}
}
}
}
override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) {
if (name.isSpecial || name.identifier.isNotEmpty()) {
for (import in starImports) {
for (symbol in provider.getTopLevelPropertySymbols(import.packageFqName, name)) {
processor(symbol)
}
}
}
}
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolveTask.kt
+1 -1
View File
@@ -421,7 +421,7 @@ internal open class FirTowerResolveTask(
skipSynthetics: Boolean,
) {
processExtensionsThatHideMembers(
info, receiver, TowerGroup.EmptyRoot,
info, receiver, parentGroup,
ExplicitReceiverKind.NO_EXPLICIT_RECEIVER,
)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/ImportingScopes.kt
+11 -8
View File
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
import org.jetbrains.kotlin.name.FqName
private val ALL_IMPORTS = scopeSessionKey<FirFile, ListStorageFirScope>()
private val DEFAULT_STAR_IMPORT = scopeSessionKey<DefaultStarImportKey, FirDefaultStarImportingScope>()
private val DEFAULT_STAR_IMPORT = scopeSessionKey<DefaultStarImportKey, FirSingleLevelDefaultStarImportingScope>()
private val DEFAULT_SIMPLE_IMPORT = scopeSessionKey<DefaultImportPriority, FirDefaultSimpleImportingScope>()
private data class DefaultStarImportKey(val priority: DefaultImportPriority, val excludedImportNames: Set<FqName>)
@@ -48,12 +48,15 @@ private fun doCreateImportingScopes(
}
return listOf(
scopeSession.getOrBuild(DefaultStarImportKey(DefaultImportPriority.LOW, excludedImportNames), DEFAULT_STAR_IMPORT) {
FirDefaultStarImportingScope(session, scopeSession, DefaultImportPriority.LOW, excludedImportNames)
},
scopeSession.getOrBuild(DefaultStarImportKey(DefaultImportPriority.HIGH, excludedImportNames), DEFAULT_STAR_IMPORT) {
FirDefaultStarImportingScope(session, scopeSession, DefaultImportPriority.HIGH, excludedImportNames)
},
FirDefaultStarImportingScope(
scopeSession.getOrBuild(DefaultStarImportKey(DefaultImportPriority.HIGH, excludedImportNames), DEFAULT_STAR_IMPORT) {
FirSingleLevelDefaultStarImportingScope(session, scopeSession, DefaultImportPriority.HIGH, excludedImportNames)
},
scopeSession.getOrBuild(DefaultStarImportKey(DefaultImportPriority.LOW, excludedImportNames), DEFAULT_STAR_IMPORT) {
FirSingleLevelDefaultStarImportingScope(session, scopeSession, DefaultImportPriority.LOW, excludedImportNames)
},
),
scopeSession.getOrBuild(DefaultImportPriority.KOTLIN_THROWS, DEFAULT_SIMPLE_IMPORT) {
FirDefaultSimpleImportingScope(session, scopeSession, priority = DefaultImportPriority.KOTLIN_THROWS)
},
@@ -79,4 +82,4 @@ private fun doCreateImportingScopes(
)
}
private class ListStorageFirScope(val result: List<FirScope>) : FirScope()
private class ListStorageFirScope(val result: List<FirScope>) : FirScope()
compiler/testData/diagnostics/tests/j+k/javaLangStringCtr.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// WITH_STDLIB
// ISSUE: KT-51670
val s = <!DEPRECATION!>String<!>(byteArrayOf(1, 2, 3), 4, 5, 6)
val s = String(byteArrayOf(1, 2, 3), 4, 5, <!ARGUMENT_TYPE_MISMATCH!>6<!>)
compiler/testData/diagnostics/tests/platformTypes/javaMappedCtors.fir.kt
Vendored
+6 -6
View File
@@ -11,7 +11,7 @@ typealias ADouble = Double
fun main() {
<!INVISIBLE_REFERENCE!>ABoolean<!>(false)
Boolean(false)
<!INVISIBLE_REFERENCE!>Boolean<!>(false)
<!INVISIBLE_REFERENCE!>AChar<!>('c')
<!INVISIBLE_REFERENCE!>Char<!>('c')
@@ -20,17 +20,17 @@ fun main() {
<!INVISIBLE_REFERENCE!>Int<!>(42)
<!INVISIBLE_REFERENCE!>ALong<!>(42)
Long(42)
<!INVISIBLE_REFERENCE!>Long<!>(42)
<!INVISIBLE_REFERENCE!>AShort<!>(42)
Short(42)
<!INVISIBLE_REFERENCE!>Short<!>(42)
<!INVISIBLE_REFERENCE!>AByte<!>(42)
Byte(42)
<!INVISIBLE_REFERENCE!>Byte<!>(42)
<!INVISIBLE_REFERENCE!>AFloat<!>(4.2f)
Float(4.2f)
<!INVISIBLE_REFERENCE!>Float<!>(4.2f)
<!INVISIBLE_REFERENCE!>ADouble<!>(4.2)
Double(4.2)
<!INVISIBLE_REFERENCE!>Double<!>(4.2)
}