[dotnet-linker] Fix computing block signatures. Fixes #21008. #21011

rolfbjarne · 2024-08-09T18:51:10Z

When we compute the signature of a block for Objective-C, we need to use parameters of the user-provided callback (and not the intermediate UnmanagedCallersOnly method) to compute the signature.

This is because the intermediate method's parameters don't have all the information we need to correctly compute the block signature (in particular for the issue in question, the user callback has an NSError parameter, while the intermediate method has an IntPtr parameter, and these two parameter types show up differently in the block signature).

This is solved by adding the UserDelegateType attribute (which was created for exactly this, and it's just in older generated code) to the intermediate method, pointing to a delegate with the correct managed signature.

Fixes #21008.

Pending: * Tests * Better description. Fixes #21008.

github-actions · 2024-08-12T13:45:45Z

⚠️ Your code has been reformatted. ⚠️

If this is not desired, add the actions-disable-autoformat label, and revert the reformatting commit.

If files unrelated to your change were modified, try reverting the reformatting commit + merging with the target branch (and push those changes).

vs-mobiletools-engineering-service2 · 2024-08-14T18:45:27Z

📚 [CI Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [PR build]

vs-mobiletools-engineering-service2 · 2024-08-14T18:47:15Z

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

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

Pipeline on Agent
Hash: 263e729ef1a2b53c0dab3f4ca925997998ea035b [PR build]

vs-mobiletools-engineering-service2 · 2024-08-14T18:51:12Z

💻 [CI Build] Tests on macOS M1 - Mac Big Sur (11) passed 💻

✅ All tests on macOS M1 - Mac Big Sur (11) passed.

Pipeline on Agent
Hash: 263e729ef1a2b53c0dab3f4ca925997998ea035b [PR build]

vs-mobiletools-engineering-service2 · 2024-08-14T18:52:07Z

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

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

Pipeline on Agent
Hash: 263e729ef1a2b53c0dab3f4ca925997998ea035b [PR build]

vs-mobiletools-engineering-service2 · 2024-08-14T18:53:41Z

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

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

Pipeline on Agent
Hash: 263e729ef1a2b53c0dab3f4ca925997998ea035b [PR build]

vs-mobiletools-engineering-service2 · 2024-08-14T19:00:08Z

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)

~~iOS~~ (no change detected)
~~tvOS~~ (no change detected)
~~watchOS~~ (no change detected)
~~macOS~~ (no change detected)

NET (empty diffs)

~~iOS~~: (empty diff detected)
~~tvOS~~: (empty diff detected)
~~MacCatalyst~~: (empty diff detected)
~~macOS~~: (empty diff detected)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)

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

.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)
Microsoft.iOS vs Microsoft.MacCatalyst: vsdrops gist

Legacy Xamarin (stable) vs .NET

iOS: vsdrops gist
tvOS: vsdrops gist
macOS: vsdrops gist

ℹ️ Generator diff

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

Pipeline on Agent
Hash: 263e729ef1a2b53c0dab3f4ca925997998ea035b [PR build]

vs-mobiletools-engineering-service2 · 2024-08-14T19:10:34Z

❌ [CI Build] Windows Integration Tests failed ❌

❌ Failed ❌

Pipeline on Agent
Hash: 263e729ef1a2b53c0dab3f4ca925997998ea035b [PR build]

vs-mobiletools-engineering-service2 · 2024-08-14T20:18:38Z

❌ [CI Build] Windows Integration Tests failed ❌

❌ Failed ❌

Pipeline on Agent
Hash: 263e729ef1a2b53c0dab3f4ca925997998ea035b [PR build]

vs-mobiletools-engineering-service2 · 2024-08-15T07:15:51Z

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

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

Pipeline on Agent
Hash: 263e729ef1a2b53c0dab3f4ca925997998ea035b [PR build]

vs-mobiletools-engineering-service2 · 2024-08-15T07:21:27Z

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 168 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 6 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ install-source: All 1 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 7 tests passed. Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. Html Report (VSDrops) Download
✅ mac-binding-project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 6 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 7 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 8 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (watchOS): All 4 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 263e729ef1a2b53c0dab3f4ca925997998ea035b [PR build]

vs-mobiletools-engineering-service2 · 2024-08-15T07:55:09Z

💻 [CI Build] Windows Integration Tests passed 💻

✅ All Windows Integration Tests passed.

Pipeline on Agent
Hash: 263e729ef1a2b53c0dab3f4ca925997998ea035b [PR build]

rolfbjarne · 2024-08-15T08:03:12Z

/sudo backport release/8.0.1xx-xcode15.4

vs-mobiletools-engineering-service2 · 2024-08-15T08:04:09Z

Backport Job to branch release/8.0.1xx-xcode15.4 Created! The magic is happening here

vs-mobiletools-engineering-service2 · 2024-08-15T08:07:35Z

Hooray! Backport succeeded! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=10052000 for more details.

…tures. Fixes #21008. (#21048) When we compute the signature of a block for Objective-C, we need to use parameters of the user-provided callback (and not the intermediate UnmanagedCallersOnly method) to compute the signature. This is because the intermediate method's parameters don't have all the information we need to correctly compute the block signature (in particular for the issue in question, the user callback has an `NSError` parameter, while the intermediate method has an `IntPtr` parameter, and these two parameter types show up differently in the block signature). This is solved by adding the `UserDelegateType` attribute (which was created for exactly this, and it's just in older generated code) to the intermediate method, pointing to a delegate with the correct managed signature. Fixes #21008. Backport of #21011

[dotnet-linker] Fix computing block signatures. Fixes #21008.

2a26296

Pending: * Tests * Better description. Fixes #21008.

This comment has been minimized.

Sign in to view

rolfbjarne and others added 3 commits August 12, 2024 15:39

Add test

c3ed780

Fix the dynamic registrar logic as well.

bb2d15f

Auto-format source code

d7fead3

rolfbjarne marked this pull request as ready for review August 12, 2024 13:46

dalexsoto approved these changes Aug 12, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

Fix assert for macOS/x64.

3439d5a

This comment has been minimized.

Sign in to view

Try to get this right now

6f5d509

This comment has been minimized.

Sign in to view

Fix static registrar.

263e729

This comment has been minimized.

Sign in to view

rolfbjarne merged commit 854ca93 into main Aug 15, 2024
28 checks passed

rolfbjarne deleted the dev/rolf/issue-21008-nativehandle-signature-as-intptr branch August 15, 2024 08:02

vs-mobiletools-engineering-service2 mentioned this pull request Aug 15, 2024

[release/8.0.1xx-xcode15.4] [dotnet-linker] Fix computing block signatures. Fixes #21008. #21044

Closed

rolfbjarne mentioned this pull request Aug 15, 2024

[release/8.0.1xx-xcode15.4] [dotnet-linker] Fix computing block signatures. Fixes #21008. #21048

Merged

[dotnet-linker] Fix computing block signatures. Fixes #21008. #21011

[dotnet-linker] Fix computing block signatures. Fixes #21008. #21011

Conversation

rolfbjarne commented Aug 9, 2024 • edited Loading

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.

github-actions bot commented Aug 12, 2024

⚠️ Your code has been reformatted. ⚠️

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.

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 Aug 14, 2024

📚 [CI Build] Artifacts 📚

Packages generated

vs-mobiletools-engineering-service2 commented Aug 14, 2024

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

vs-mobiletools-engineering-service2 commented Aug 14, 2024

💻 [CI Build] Tests on macOS M1 - Mac Big Sur (11) passed 💻

vs-mobiletools-engineering-service2 commented Aug 14, 2024

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

vs-mobiletools-engineering-service2 commented Aug 14, 2024

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

vs-mobiletools-engineering-service2 commented Aug 14, 2024

✅ API diff for current PR / commit

✅ API diff vs stable

ℹ️ Generator diff

vs-mobiletools-engineering-service2 commented Aug 14, 2024

❌ [CI Build] Windows Integration Tests failed ❌

vs-mobiletools-engineering-service2 commented Aug 14, 2024

❌ [CI Build] Windows Integration Tests failed ❌

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Aug 15, 2024

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

vs-mobiletools-engineering-service2 commented Aug 15, 2024

🚀 [CI Build] Test results 🚀

Test results

Tests counts

vs-mobiletools-engineering-service2 commented Aug 15, 2024

💻 [CI Build] Windows Integration Tests passed 💻

rolfbjarne commented Aug 15, 2024

vs-mobiletools-engineering-service2 commented Aug 15, 2024

vs-mobiletools-engineering-service2 commented Aug 15, 2024

rolfbjarne commented Aug 9, 2024 •

edited

Loading