[RGen] Correctly cast enum results from the native invocation. #23079

mandel-macaque · 2025-06-18T19:59:11Z

Generate a simple cast when the result is a non-native non-smart enum.

Copilot

Pull Request Overview

This PR ensures that non-smart, non-native enums returned from native invocations are explicitly cast back to their enum type.

Adds a new test case for enum return types in the trampoline syntax factory tests.
Updates expected trampoline outputs to include an explicit cast to AudioUnitStatus.
Implements a new switch arm in BindingSyntaxFactory.Trampoline to emit a CastExpression for normal enums.

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
tests/rgen/Microsoft.Macios.Generator.Tests/Emitters/BindingSyntaxFactoryTrampolineTests.cs	Added a test input string and expected output for enum return type casting.
tests/rgen/Microsoft.Macios.Generator.Tests/Classes/Data/ExpectedTrampolinePropertyTestsTrampolines.cs	Changed trampoline implementation to cast `ret` to `AudioUnitStatus`.
src/rgen/Microsoft.Macios.Generator/Emitters/BindingSyntaxFactory.Trampoline.cs	Added a new pattern match arm to generate a `CastExpression` for non-smart enums.

Comments suppressed due to low confidence (1)

tests/rgen/Microsoft.Macios.Generator.Tests/Emitters/BindingSyntaxFactoryTrampolineTests.cs:763

The delegate declaration in the test input string is missing a terminating semicolon. Add ; after Callback() to make the code syntactically valid.

	public delegate TestEnum Callback()

Copilot · 2025-06-18T20:02:01Z

.../Microsoft.Macios.Generator.Tests/Classes/Data/ExpectedTrampolinePropertyTestsTrampolines.cs

-			if (realtimeEventListHead is null)
-				global::ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (realtimeEventListHead));
-			var realtimeEventListHead__handle__ = realtimeEventListHead.GetHandle ();
+			var outputData__handle__ = outputData!.GetNonNullHandle (nameof (outputData));


Avoid using the null-forgiving operator !. Per nullable reference guidelines, replace this with an explicit null check or use ArgumentNullException.ThrowIfNull(outputData) before calling GetNonNullHandle.

Copilot · 2025-06-18T20:02:02Z

.../Microsoft.Macios.Generator.Tests/Classes/Data/ExpectedTrampolinePropertyTestsTrampolines.cs

-				global::ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (realtimeEventListHead));
-			var realtimeEventListHead__handle__ = realtimeEventListHead.GetHandle ();
+			var outputData__handle__ = outputData!.GetNonNullHandle (nameof (outputData));
+			var realtimeEventListHead__handle__ = realtimeEventListHead!.GetNonNullHandle (nameof (realtimeEventListHead));


Avoid using the null-forgiving operator !. Per nullable reference guidelines, replace this with an explicit null check or use ArgumentNullException.ThrowIfNull(realtimeEventListHead) before calling GetNonNullHandle.

vs-mobiletools-engineering-service2 · 2025-06-18T22:21:29Z

✅ [CI Build #41f18f0] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 41f18f062f2f23fb9911c5abadd7d1ff53fccbe8 [PR build]

vs-mobiletools-engineering-service2 · 2025-06-18T22:23:28Z

✅ [PR Build #41f18f0] Build passed (Detect API changes) ✅

Pipeline on Agent
Hash: 41f18f062f2f23fb9911c5abadd7d1ff53fccbe8 [PR build]

vs-mobiletools-engineering-service2 · 2025-06-18T22:49:48Z

✅ API diff for current PR / commit

.NET ( No breaking changes )

iOS: vsdrops gist ( No breaking changes )
tvOS: vsdrops gist ( No breaking changes )
MacCatalyst: vsdrops gist ( No breaking changes )
macOS: vsdrops gist ( No breaking changes )

✅ API diff vs stable

.NET ( No breaking changes )

iOS: vsdrops gist ( No breaking changes )
tvOS: vsdrops gist ( No breaking changes )
MacCatalyst: vsdrops gist ( No breaking changes )
macOS: vsdrops gist ( No breaking changes )

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 41f18f062f2f23fb9911c5abadd7d1ff53fccbe8 [PR build]

vs-mobiletools-engineering-service2 · 2025-06-18T22:52:16Z

✅ [CI Build #41f18f0] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 41f18f062f2f23fb9911c5abadd7d1ff53fccbe8 [PR build]

vs-mobiletools-engineering-service2 · 2025-06-18T23:02:00Z

💻 [CI Build #41f18f0] Tests on macOS X64 - Mac Sonoma (14) passed 💻

✅ All tests on macOS X64 - Mac Sonoma (14) passed.

Pipeline on Agent
Hash: 41f18f062f2f23fb9911c5abadd7d1ff53fccbe8 [PR build]

vs-mobiletools-engineering-service2 · 2025-06-18T23:04:12Z

💻 [CI Build #41f18f0] Tests on macOS M1 - Mac Monterey (12) passed 💻

✅ All tests on macOS M1 - Mac Monterey (12) passed.

Pipeline on Agent
Hash: 41f18f062f2f23fb9911c5abadd7d1ff53fccbe8 [PR build]

vs-mobiletools-engineering-service2 · 2025-06-18T23:05:24Z

💻 [CI Build #41f18f0] Tests on macOS arm64 - Mac Sequoia (15) passed 💻

✅ All tests on macOS arm64 - Mac Sequoia (15) passed.

Pipeline on Agent
Hash: 41f18f062f2f23fb9911c5abadd7d1ff53fccbe8 [PR build]

vs-mobiletools-engineering-service2 · 2025-06-18T23:05:33Z

💻 [CI Build #41f18f0] Tests on macOS M1 - Mac Ventura (13) passed 💻

✅ All tests on macOS M1 - Mac Ventura (13) passed.

Pipeline on Agent
Hash: 41f18f062f2f23fb9911c5abadd7d1ff53fccbe8 [PR build]

vs-mobiletools-engineering-service2 · 2025-06-19T00:31:02Z

🚀 [CI Build #41f18f0] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 115 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. Html Report (VSDrops) Download
✅ framework: All 2 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 4 tests passed. Html Report (VSDrops) Download
✅ generator: All 5 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. Html Report (VSDrops) Download
✅ introspection: All 4 tests passed. Html Report (VSDrops) Download
✅ linker: All 44 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 8 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 9 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 8 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ windows: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 41f18f062f2f23fb9911c5abadd7d1ff53fccbe8 [PR build]

[RGen] Correctly cast enum results from the native invocation.

9e68be1

Generate a simple cast when the result is a non-native non-smart enum.

mandel-macaque requested a review from Copilot June 18, 2025 20:01

Copilot AI reviewed Jun 18, 2025

View reviewed changes

dalexsoto approved these changes Jun 18, 2025

View reviewed changes

Auto-format source code

52a8046

This comment has been minimized.

Sign in to view

Merge branch 'main' into dev/mandel/cast-return-enumerator

41f18f0

This comment has been minimized.

Sign in to view

rolfbjarne approved these changes Jun 19, 2025

View reviewed changes

mandel-macaque merged commit 38e4bc3 into main Jun 19, 2025
44 checks passed

mandel-macaque deleted the dev/mandel/cast-return-enumerator branch June 19, 2025 13:22

[RGen] Correctly cast enum results from the native invocation. #23079

[RGen] Correctly cast enum results from the native invocation. #23079

Uh oh!

Conversation

mandel-macaque commented Jun 18, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Jun 18, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jun 18, 2025

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Jun 18, 2025

✅ [CI Build #41f18f0] Build passed (Build packages) ✅

Uh oh!

vs-mobiletools-engineering-service2 commented Jun 18, 2025

✅ [PR Build #41f18f0] Build passed (Detect API changes) ✅

Uh oh!

vs-mobiletools-engineering-service2 commented Jun 18, 2025

✅ API diff for current PR / commit

✅ API diff vs stable

ℹ️ Generator diff

Uh oh!

vs-mobiletools-engineering-service2 commented Jun 18, 2025

✅ [CI Build #41f18f0] Build passed (Build macOS tests) ✅

Uh oh!

vs-mobiletools-engineering-service2 commented Jun 18, 2025

💻 [CI Build #41f18f0] Tests on macOS X64 - Mac Sonoma (14) passed 💻

Uh oh!

vs-mobiletools-engineering-service2 commented Jun 18, 2025

💻 [CI Build #41f18f0] Tests on macOS M1 - Mac Monterey (12) passed 💻

Uh oh!

vs-mobiletools-engineering-service2 commented Jun 18, 2025

💻 [CI Build #41f18f0] Tests on macOS arm64 - Mac Sequoia (15) passed 💻

Uh oh!

vs-mobiletools-engineering-service2 commented Jun 18, 2025

💻 [CI Build #41f18f0] Tests on macOS M1 - Mac Ventura (13) passed 💻

Uh oh!

This comment has been minimized.

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Jun 19, 2025

🚀 [CI Build #41f18f0] Test results 🚀

Test results

Tests counts

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants