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

[FIR] Fix leaking mutable map type of resolved argument mapping

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-04-23 09:56:15 +03:00
committed by TeamCityServer
parent 1afb844e1a
commit 8925b8c922
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
+1 -1
View File
@@ -529,7 +529,7 @@ class CallAndReferenceGenerator(
} }
private fun IrMemberAccessExpression<*>.applyArgumentsWithReorderingIfNeeded( private fun IrMemberAccessExpression<*>.applyArgumentsWithReorderingIfNeeded(
argumentMapping: LinkedHashMap<FirExpression, FirValueParameter>, argumentMapping: Map<FirExpression, FirValueParameter>,
valueParameters: List<FirValueParameter>, valueParameters: List<FirValueParameter>,
substitutor: ConeSubstitutor, substitutor: ConeSubstitutor,
annotationMode: Boolean annotationMode: Boolean
compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionUtil.kt
+2 -2
View File
@@ -43,13 +43,13 @@ inline val FirCall.arguments: List<FirExpression> get() = argumentList.arguments
inline val FirCall.argument: FirExpression get() = argumentList.arguments.first() inline val FirCall.argument: FirExpression get() = argumentList.arguments.first()
inline val FirCall.resolvedArgumentMapping: LinkedHashMap<FirExpression, FirValueParameter>? inline val FirCall.resolvedArgumentMapping: Map<FirExpression, FirValueParameter>?
get() = when (val argumentList = argumentList) { get() = when (val argumentList = argumentList) {
is FirResolvedArgumentList -> argumentList.mapping is FirResolvedArgumentList -> argumentList.mapping
else -> null else -> null
} }
inline val FirCall.argumentMapping: LinkedHashMap<FirExpression, FirValueParameter>? inline val FirCall.argumentMapping: Map<FirExpression, FirValueParameter>?
get() = when (val argumentList = argumentList) { get() = when (val argumentList = argumentList) {
is FirResolvedArgumentList -> argumentList.mapping is FirResolvedArgumentList -> argumentList.mapping
is FirPartiallyResolvedArgumentList -> argumentList.mapping is FirPartiallyResolvedArgumentList -> argumentList.mapping