Fix missing semicolon on non-const global struct initializers#726
Merged
tannergooding merged 1 commit intoJul 13, 2026
Merged
Conversation
The EndValue path for ValueKind.Unmanaged only emitted the terminating
semicolon when the value was constant, so a non-const global initialized
with a struct initializer list (e.g. Point p = { .x = 10, .y = 20 };) was
emitted as a closing '}' with no ';', corrupting the rest of the file.
Emit the semicolon for the non-const case as well, matching the constant
path and the primitive/string/guid value kinds.
Fixes dotnet#503
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #503.
A non-const global variable initialized with a struct initializer list was emitted with a closing
}but no terminating;, which broke the rest of the generated file:Root cause
CSharpOutputBuilder.EndValueonly wrote the terminating semicolon forValueKind.Unmanagedwhendesc.IsConstantwas true.constglobals (emitted asstatic readonly) and arrays (flagged constant viaIsTypeConstantOrIncompleteArray) therefore terminated correctly, but a plain non-const global struct fell through and emitted nothing.ForRecordTypehad already setNeedsSemicolon, but nothing flushed it on this path.Fix
Emit the semicolon for the non-const case as well, matching the constant branch and the
Primitive/String/GuidMembervalue kinds.XML output is unaffected --
XmlOutputBuilder.EndValuecloses<value>unconditionally. The fix is language/platform-invariant (the struct renders identically across all C# variants), so a singleClangSharp.PInvokeGenerator.UnitTestsregression test (GlobalStructInitializerTest) covers it;generate-helper-typesis not involved.Validation
Note
This PR description and the change were drafted with Copilot.