From 3dd342143770b0277b623359ab533df7469ff3c8 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 5 Nov 2019 15:39:34 +0300 Subject: [PATCH] Temporary: resolve type to kotlin/reflect/Function instead of kotlin/Function This arises in callable reference resolve test due to incorrect fictitious symbols caching --- .../moreSpecificAmbiguousExtensions.kt | 1 + .../moreSpecificAmbiguousExtensions.txt | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.kt b/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.kt index 159f39d9611..bcf4a60fb0c 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.kt +++ b/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.kt @@ -10,6 +10,7 @@ fun test() { } fun testWithExpectedType() { + // NB: should be resolved to kotlin/FunctionX, not kotlin/reflect/FunctionX val extFun_AB_A: IA.(IB) -> Unit = IA::extFun val extFun_AA_B: IA.(IA) -> Unit = IB::extFun val extFun_BB_A: IB.(IB) -> Unit = IA::extFun diff --git a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.txt b/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.txt index 11b5d6195f7..38b26f72fcb 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.txt @@ -12,9 +12,9 @@ FILE: moreSpecificAmbiguousExtensions.kt lval extFun2: R|kotlin/reflect/KFunction2| = Q|IB|::R|/extFun| } public final fun testWithExpectedType(): R|kotlin/Unit| { - lval extFun_AB_A: @R|kotlin/ExtensionFunctionType|() R|kotlin/Function2| = Q|IA|::R|/extFun| - lval extFun_AA_B: @R|kotlin/ExtensionFunctionType|() R|kotlin/Function2| = Q|IB|::R|/extFun| - lval extFun_BB_A: @R|kotlin/ExtensionFunctionType|() R|kotlin/Function2| = Q|IA|::R|/extFun| - lval extFun_BA_B: @R|kotlin/ExtensionFunctionType|() R|kotlin/Function2| = Q|IB|::R|/extFun| - lval extFun_BB_B: @R|kotlin/ExtensionFunctionType|() R|kotlin/Function2| = Q|IB|::R|/extFun| + lval extFun_AB_A: @R|kotlin/ExtensionFunctionType|() R|kotlin/reflect/KFunction2| = Q|IA|::R|/extFun| + lval extFun_AA_B: @R|kotlin/ExtensionFunctionType|() R|kotlin/reflect/KFunction2| = Q|IB|::R|/extFun| + lval extFun_BB_A: @R|kotlin/ExtensionFunctionType|() R|kotlin/reflect/KFunction2| = Q|IA|::R|/extFun| + lval extFun_BA_B: @R|kotlin/ExtensionFunctionType|() R|kotlin/reflect/KFunction2| = Q|IB|::R|/extFun| + lval extFun_BB_B: @R|kotlin/ExtensionFunctionType|() R|kotlin/reflect/KFunction2| = Q|IB|::R|/extFun| }