Use ParameterId for index

Julien Couvreur · Julien Couvreur · commit b93c86155dcb · 2025-07-23T12:31:56.000-07:00
diff --git a/src/Compilers/CSharp/Portable/CodeGen/EmitExpression.cs b/src/Compilers/CSharp/Portable/CodeGen/EmitExpression.cs
@@ -3593,12 +3593,7 @@ private void EmitParameterIdExpression(BoundParameterId node)
 
             if (node.HoistedField is null)
             {
-                var containingSymbol = node.Parameter.ContainingSymbol;
-                if (containingSymbol.GetIsNewExtensionMember())
-                {
-
-                }
-                _builder.EmitIntConstant(node.Parameter.Ordinal); // Tracked by https://github.com/dotnet/roslyn/issues/78963 : Follow up TODO2
+                _builder.EmitIntConstant(node.Parameter.Ordinal);
             }
             else
             {
diff --git a/src/Compilers/CSharp/Portable/Lowering/Instrumentation/LocalStateTracingInstrumenter.cs b/src/Compilers/CSharp/Portable/Lowering/Instrumentation/LocalStateTracingInstrumenter.cs
@@ -314,7 +314,7 @@ public override void InstrumentBlock(BoundBlock original, LocalRewriter rewriter
                 if (parameterLogger != null)
                 {
                     prologueBuilder.Add(_factory.ExpressionStatement(_factory.Call(receiver: _factory.Local(_scope.ContextVariable), parameterLogger,
-                        MakeStoreLoggerArguments(parameterLogger.Parameters[0], parameter, parameter.Type, _factory.Parameter(parameter), refAssignmentSourceIndex: null, _factory.Literal((ushort)parameter.Ordinal)))));
+                        MakeStoreLoggerArguments(parameterLogger.Parameters[0], parameter, parameter.Type, _factory.Parameter(parameter), refAssignmentSourceIndex: null, _factory.ParameterId(parameter)))));
                 }
             }
 
@@ -441,6 +441,7 @@ private ImmutableArray<BoundExpression> MakeStoreLoggerArguments(
             BoundExpression? refAssignmentSourceIndex,
             BoundExpression index)
         {
+            Debug.Assert(index is BoundParameterId or BoundLocalId);
             if (refAssignmentSourceIndex != null)
             {
                 return ImmutableArray.Create(_factory.Sequence(new[] { value }, refAssignmentSourceIndex), index);
diff --git a/src/Compilers/CSharp/Test/Emit2/Emit/LocalStateTracing/LocalStateTracingTests.cs b/src/Compilers/CSharp/Test/Emit2/Emit/LocalStateTracing/LocalStateTracingTests.cs

Original file line number	Diff line number	Diff line change
`@@ -3593,12 +3593,7 @@ private void EmitParameterIdExpression(BoundParameterId node)`
`3593`	`3593`
`3594`	`3594`	`if (node.HoistedField is null)`
`3595`	`3595`	`{`
`3596`		`- var containingSymbol = node.Parameter.ContainingSymbol;`
`3597`		`- if (containingSymbol.GetIsNewExtensionMember())`
`3598`		`- {`
`3599`		`-`
`3600`		`- }`
`3601`		`- _builder.EmitIntConstant(node.Parameter.Ordinal); // Tracked by https://github.com/dotnet/roslyn/issues/78963 : Follow up TODO2`
	`3596`	`+ _builder.EmitIntConstant(node.Parameter.Ordinal);`
`3602`	`3597`	`}`
`3603`	`3598`	`else`
`3604`	`3599`	`{`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ public override void InstrumentBlock(BoundBlock original, LocalRewriter rewriter`
`314`	`314`	`if (parameterLogger != null)`
`315`	`315`	`{`
`316`	`316`	`prologueBuilder.Add(_factory.ExpressionStatement(_factory.Call(receiver: _factory.Local(_scope.ContextVariable), parameterLogger,`
`317`		`- MakeStoreLoggerArguments(parameterLogger.Parameters[0], parameter, parameter.Type, _factory.Parameter(parameter), refAssignmentSourceIndex: null, _factory.Literal((ushort)parameter.Ordinal)))));`
	`317`	`+ MakeStoreLoggerArguments(parameterLogger.Parameters[0], parameter, parameter.Type, _factory.Parameter(parameter), refAssignmentSourceIndex: null, _factory.ParameterId(parameter)))));`
`318`	`318`	`}`
`319`	`319`	`}`
`320`	`320`
`@@ -441,6 +441,7 @@ private ImmutableArray<BoundExpression> MakeStoreLoggerArguments(`
`441`	`441`	`BoundExpression? refAssignmentSourceIndex,`
`442`	`442`	`BoundExpression index)`
`443`	`443`	`{`
	`444`	`+ Debug.Assert(index is BoundParameterId or BoundLocalId);`
`444`	`445`	`if (refAssignmentSourceIndex != null)`
`445`	`446`	`{`
`446`	`447`	`return ImmutableArray.Create(_factory.Sequence(new[] { value }, refAssignmentSourceIndex), index);`