Skip to content

Allow passing Unsafe.NullRef<bool>() for nullable bool* parameters #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
armadavalor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow passing Unsafe.NullRef<bool>() for nullable bool* parameters #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/CodeGenerator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,9 +628,16 @@ private static void EmitOverload(
{
string nativeArgName = "native_" + tr.Name;
marshalledParameters[i] = new MarshalledParameter("ref bool", false, nativeArgName, false);
preCallLines.Add($"byte {nativeArgName}_val = {correctedIdentifier} ? (byte)1 : (byte)0;");
preCallLines.Add($"byte* {nativeArgName} = &{nativeArgName}_val;");
postCallLines.Add($"{correctedIdentifier} = {nativeArgName}_val != 0;");
// Allow Unsafe.NullRef<bool>() to be passed through as a null pointer.
// The ref must only be read inside the branch, otherwise the JIT may load it unconditionally.
preCallLines.Add($"byte {nativeArgName}_val = 0;");
preCallLines.Add($"byte* {nativeArgName} = null;");
preCallLines.Add($"if (!System.Runtime.CompilerServices.Unsafe.IsNullRef(ref {correctedIdentifier}))");
preCallLines.Add("{");
preCallLines.Add($" {nativeArgName}_val = {correctedIdentifier} ? (byte)1 : (byte)0;");
preCallLines.Add($" {nativeArgName} = &{nativeArgName}_val;");
preCallLines.Add("}");
postCallLines.Add($"if ({nativeArgName} != null) {{ {correctedIdentifier} = {nativeArgName}_val != 0; }}");
}
else if (tr.Type == "void*" || tr.Type == "ImWchar*")
{
Expand Down
Loading