Skip to content

Commit 0c36cf6

Browse files
committed
Fix nameless parameter type output
1 parent 570f75d commit 0c36cf6

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrFunction.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,11 @@ LlvmIrFunctionParameter EnsureParameterName (LlvmIrFunctionParameter parameter)
116116
return parameter;
117117
}
118118

119-
return new LlvmIrFunctionParameter (parameter.Type, GetNextSlotName ());
119+
string name = GetNextSlotName ();
120+
if (parameter.NativeFunction != null) {
121+
return new LlvmIrFunctionParameter (parameter.NativeFunction, name, parameter.IsNativePointer, parameter.IsCplusPlusReference);
122+
}
123+
return new LlvmIrFunctionParameter (parameter.Type, name, parameter.IsNativePointer, parameter.IsCplusPlusReference);
120124
}
121125
}
122126

src/Xamarin.Android.Build.Tasks/Utilities/LlvmIrGenerator/LlvmIrGenerator.Code.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void WriteFunctionStart (LlvmIrFunction function)
4646
WriteFunctionParameters (function.Parameters, writeNames: true);
4747
Output.Write(") local_unnamed_addr ");
4848
if (attributes != null) {
49-
Output.Write ($"#{function.AttributeSetID} ");
49+
Output.Write ($"#{function.AttributeSetID}");
5050
}
5151
Output.WriteLine ();
5252
Output.WriteLine ("{");
@@ -366,7 +366,7 @@ public void EmitLabel (LlvmIrFunction function, string labelName)
366366
Output.Write ($"{paramType} ");
367367

368368
if (argument.Value is LlvmIrFunctionLocalVariable variable) {
369-
Output.Write ($" %{variable.Name}");
369+
Output.Write ($"%{variable.Name}");
370370
} else if (parameter.Type.IsNativePointer () || parameter.IsNativePointer) {
371371
if (parameter.IsCplusPlusReference) {
372372
Output.Write ("nonnull ");

0 commit comments

Comments
 (0)