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

[LL API] Fix value capturing for multiple receivers

Browse Source 
There were problem when 'this' bound symbol was used twice for a call

KT-61144
This commit is contained in:
Alexey Merkulov
2023-07-27 18:49:55 +02:00
committed by Space Team
parent 35eca56d32
commit 3d92d0d05f
20 changed files with 219 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCompilerFacility.kt
+18 -8
View File
@@ -14,9 +14,13 @@ import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnostic
import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession
import org.jetbrains.kotlin.analysis.api.impl.base.util.KtCompiledFileForOutputFile
import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirInternals
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.*
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirResolveSession
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDiagnosticsForFile
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirFile
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirWholeFileResolveTarget
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.resolve
import org.jetbrains.kotlin.analysis.low.level.api.fir.compile.CodeFragmentCapturedId
import org.jetbrains.kotlin.analysis.low.level.api.fir.compile.CodeFragmentCapturedValueAnalyzer
import org.jetbrains.kotlin.analysis.low.level.api.fir.compile.CompilationPeerCollector
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.codeFragment
@@ -324,7 +328,9 @@ internal class KtFirCompilerFacility(
val capturedSymbols = capturedData.symbols
val capturedValues = capturedSymbols.map { it.value }
val injectedSymbols = capturedSymbols.map { InjectedValue(it.symbol, it.typeRef, it.value.isMutated) }
val injectedSymbols = capturedSymbols.map {
InjectedValue(it.symbol, it.contextReceiverNumber, it.typeRef, it.value.isMutated)
}
codeFragment.conversionData = CodeFragmentConversionData(
classId = ClassId(FqName.ROOT, Name.identifier(configuration[CODE_FRAGMENT_CLASS_NAME] ?: "CodeFragment")),
@@ -332,7 +338,9 @@ internal class KtFirCompilerFacility(
injectedSymbols
)
val injectedSymbolMapping = injectedSymbols.associateBy { it.symbol }
val injectedSymbolMapping = injectedSymbols.associateBy {
CodeFragmentCapturedId(it.symbol, it.contextReceiverNumber)
}
val injectedValueProvider = InjectedSymbolProvider(mainKtFile, injectedSymbolMapping)
return CodeFragmentMappings(capturedValues, capturedData.files, injectedValueProvider)
@@ -340,7 +348,7 @@ internal class KtFirCompilerFacility(
private class InjectedSymbolProvider(
private val mainKtFile: KtFile,
private val injectedSymbolMapping: Map<FirBasedSymbol<*>, InjectedValue>
private val injectedSymbolMapping: Map<CodeFragmentCapturedId, InjectedValue>
) : (FirReference, Fir2IrConversionScope) -> InjectedValue? {
override fun invoke(calleeReference: FirReference, conversionScope: Fir2IrConversionScope): InjectedValue? {
val irFile = conversionScope.containingFileIfAny()
@@ -350,11 +358,13 @@ internal class KtFirCompilerFacility(
return null
}
val symbol = when (calleeReference) {
is FirThisReference -> calleeReference.boundSymbol
else -> calleeReference.toResolvedSymbol<FirBasedSymbol<*>>()
val id = when (calleeReference) {
is FirThisReference -> calleeReference.boundSymbol?.let {
CodeFragmentCapturedId(it, calleeReference.contextReceiverNumber)
}
else -> calleeReference.toResolvedSymbol<FirBasedSymbol<*>>()?.let { CodeFragmentCapturedId(it) }
}
return injectedSymbolMapping[symbol]
return injectedSymbolMapping[id]
}
}
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/compilerFacility/FirIdeNormalAnalysisSourceModuleCompilerFacilityTestGenerated.java
Generated
+18
View File
@@ -220,6 +220,24 @@ public class FirIdeNormalAnalysisSourceModuleCompilerFacilityTestGenerated exten
runTest("analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/capturing/localMutated.kt");
}
@Test
@TestMetadata("multipleClassAndFunctionContextReceivers.kt")
public void testMultipleClassAndFunctionContextReceivers() throws Exception {
runTest("analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/capturing/multipleClassAndFunctionContextReceivers.kt");
}
@Test
@TestMetadata("multipleClassContextReceivers.kt")
public void testMultipleClassContextReceivers() throws Exception {
runTest("analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/capturing/multipleClassContextReceivers.kt");
}
@Test
@TestMetadata("multipleFunctionContextReceivers.kt")
public void testMultipleFunctionContextReceivers() throws Exception {
runTest("analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/capturing/multipleFunctionContextReceivers.kt");
}
@Test
@TestMetadata("nestedOuterClass.kt")
public void testNestedOuterClass() throws Exception {