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

[FIR] JvmMappedScope: don't add Java methods if Kotlin ones are here

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-10-26 18:26:34 +03:00
parent ce407471ec
commit 5c3269f489
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt
+13 -3
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
import org.jetbrains.kotlin.fir.scopes.* import org.jetbrains.kotlin.fir.scopes.*
import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.utils.addIfNotNull
class JvmMappedScope( class JvmMappedScope(
private val declaredMemberScope: FirScope, private val declaredMemberScope: FirScope,
@@ -21,14 +22,23 @@ class JvmMappedScope(
override fun processFunctionsByName(name: Name, processor: (FirFunctionSymbol<*>) -> Unit) { override fun processFunctionsByName(name: Name, processor: (FirFunctionSymbol<*>) -> Unit) {
val visibleMethods = signatures.visibleMethodSignaturesByName[name] val visibleMethods = signatures.visibleMethodSignaturesByName[name]
?: return declaredMemberScope.processFunctionsByName(name, processor) ?: return declaredMemberScope.processFunctionsByName(name, processor)
val declared = mutableListOf<FirNamedFunctionSymbol>()
declaredMemberScope.processFunctionsByName(name) { symbol ->
declared.addIfNotNull(symbol as FirNamedFunctionSymbol)
processor(symbol)
}
val declaredSignatures by lazy {
declared.mapTo(mutableSetOf()) { it.fir.computeJvmDescriptorReplacingKotlinToJava() }
}
javaMappedClassUseSiteScope.processFunctionsByName(name) { symbol -> javaMappedClassUseSiteScope.processFunctionsByName(name) { symbol ->
val jvmSignature = symbol.fir.computeJvmDescriptorReplacingKotlinToJava() val jvmSignature = symbol.fir.computeJvmDescriptorReplacingKotlinToJava()
if (jvmSignature in visibleMethods) { if (jvmSignature in visibleMethods && jvmSignature !in declaredSignatures) {
processor(symbol) processor(symbol)
} }
} }
declaredMemberScope.processFunctionsByName(name, processor)
} }
override fun processDirectOverriddenFunctionsWithBaseScope( override fun processDirectOverriddenFunctionsWithBaseScope(
compiler/testData/codegen/box/reflection/methodsFromAny/builtinFunctionsToString.kt
Vendored
-1
View File
@@ -1,6 +1,5 @@
// SKIP_JDK6 // SKIP_JDK6
// TARGET_BACKEND: JVM // TARGET_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// FULL_JDK // FULL_JDK
// WITH_REFLECT // WITH_REFLECT
compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.fir.kt
Vendored
+6 -6
View File
@@ -4,14 +4,14 @@ abstract class A : Map<Int, String>
fun foo(x: Map<Int, String>, a: A, b: java.util.HashMap<Int, String>) { fun foo(x: Map<Int, String>, a: A, b: java.util.HashMap<Int, String>) {
x.getOrDefault(1, "") x.getOrDefault(1, "")
x.<!NONE_APPLICABLE!>getOrDefault<!>("", "") x.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", "")
x.<!NONE_APPLICABLE!>getOrDefault<!>(1, 2) x.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>(1, 2)
x.<!NONE_APPLICABLE!>getOrDefault<!>("", 2) x.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", 2)
a.getOrDefault(1, "") a.getOrDefault(1, "")
a.<!NONE_APPLICABLE!>getOrDefault<!>("", "") a.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", "")
a.<!NONE_APPLICABLE!>getOrDefault<!>(1, 2) a.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>(1, 2)
a.<!NONE_APPLICABLE!>getOrDefault<!>("", 2) a.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", 2)
b.getOrDefault(1, "") b.getOrDefault(1, "")
b.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", "") b.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", "")