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

[FIR] varargs: do not leak source of value parameter to the call site

Browse Source 
when source for compiled fir elements is set, it leaks e.g. to diagnostics,
which is then filtered

see `TestsWithStdLib.Experimental.testImplicitUsages`
This commit is contained in:
Anna Kozlova
2023-04-14 14:43:00 +02:00
committed by teamcity
parent e94946d8df
commit 1f4e4f94a7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveUtils.kt
+3 -2
View File
@@ -44,8 +44,9 @@ internal fun remapArgumentsWithVararg(
var indexAfterVarargs = argumentList.size var indexAfterVarargs = argumentList.size
val newArgumentMapping = linkedMapOf<FirExpression, FirValueParameter>() val newArgumentMapping = linkedMapOf<FirExpression, FirValueParameter>()
val varargArgument = buildVarargArgumentsExpression { val varargArgument = buildVarargArgumentsExpression {
this.varargElementType = varargParameterTypeRef.withReplacedConeType(varargElementType) //todo ideally we should use here a source from the use-site and not from the declaration-site
this.typeRef = varargParameterTypeRef.withReplacedConeType(varargArrayType) this.varargElementType = varargParameterTypeRef.withReplacedConeType(varargElementType, KtFakeSourceElementKind.VarargArgument)
this.typeRef = varargParameterTypeRef.withReplacedConeType(varargArrayType, KtFakeSourceElementKind.VarargArgument)
for ((i, arg) in argumentList.withIndex()) { for ((i, arg) in argumentList.withIndex()) {
val valueParameter = argumentMapping.getValue(arg) val valueParameter = argumentMapping.getValue(arg)
// Collect arguments if `arg` is a vararg argument of interest or other vararg arguments. // Collect arguments if `arg` is a vararg argument of interest or other vararg arguments.
compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt
Vendored
+1 -1
View File
@@ -36,7 +36,7 @@ fun takeUInt(@ImplicitIntegerCoercion u: UInt) {}
fun takeULong(@ImplicitIntegerCoercion u: ULong) {} fun takeULong(@ImplicitIntegerCoercion u: ULong) {}
@ExperimentalUnsignedTypes @ExperimentalUnsignedTypes
fun takeUBytes(@ImplicitIntegerCoercion vararg u: <!OPT_IN_USAGE!>UByte<!>) {} fun takeUBytes(@ImplicitIntegerCoercion vararg u: UByte) {}
fun takeLong(@ImplicitIntegerCoercion l: Long) {} fun takeLong(@ImplicitIntegerCoercion l: Long) {}