Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[release/8.0.1xx-xcode15.4] Do not enable dedup when targeting `macca…
…talyst-x64` (#20946) Backport of #20945 --- ## Description This is a follow-up PR to: #20936 We should not enable dedup when targeting `maccatalyst-x64` because in case when the project file specifies `MtouchInterpreter=all,-System.Private.CoreLib`, the build will run the full AOT compiler with interpreter enabled. In this setup the runtime is configured to run in interp only mode: https://github.com/xamarin/xamarin-macios/blob/97a91cc4e3bf7cf8a4c657ca00ece620f2e28e91/tools/common/Target.cs#L812-L813 which means that during runtime, AOT images will be ignored - aot runtime will load them but mark them as unusuable since they are compiled with `full` compiler switch and the code falls back to interpreter (ref: https://github.com/dotnet/runtime/blob/efebf202a4a9bd78702bf4bf28a027f093e15d89/src/mono/mono/mini/aot-runtime.c#L2131-L2148 ) This is problematic for the `aot-instances` container image, which has a special handling at the runtime and does not accept it to be marked as unusable (we might want to revisit this in the future): https://github.com/dotnet/runtime/blob/efebf202a4a9bd78702bf4bf28a027f093e15d89/src/mono/mono/mini/aot-runtime.c#L2527-L2529 ## Changes This PR disables dedup optimization when targeting `maccatalyst-x64` and updates the required tests to match the behavior. --------- Co-authored-by: Ivan Povazan <ivan.povazan@gmail.com> Co-authored-by: GitHub Actions Autoformatter <github-actions-autoformatter@xamarin.com>
- Loading branch information
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔥 [CI Build] Build failed 🔥
Build failed for the job 'Build packages'
Pipeline on Agent
Hash: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✅ API diff for current PR / commit
NET (empty diffs)
iOS: (empty diff detected)tvOS: (empty diff detected)MacCatalyst: (empty diff detected)macOS: (empty diff detected)✅ API diff vs stable
.NET (No breaking changes)
ℹ️ Generator diff
Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)
Pipeline on Agent
Hash: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💻 [CI Build] Tests on macOS X64 - Mac Sonoma (14) passed 💻
✅ All tests on macOS X64 - Mac Sonoma (14) passed.
Pipeline on Agent
Hash: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💻 [CI Build] Tests on macOS M1 - Mac Monterey (12) passed 💻
✅ All tests on macOS M1 - Mac Monterey (12) passed.
Pipeline on Agent
Hash: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💻 [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: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💻 [CI Build] Tests on macOS M1 - Mac Ventura (13) passed 💻
✅ All tests on macOS M1 - Mac Ventura (13) passed.
Pipeline on Agent
Hash: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💻 [CI Build] Tests on macOS X64 - Mac Sonoma (14) passed 💻
✅ All tests on macOS X64 - Mac Sonoma (14) passed.
Pipeline on Agent
Hash: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💻 [CI Build] Tests on macOS M1 - Mac Monterey (12) passed 💻
✅ All tests on macOS M1 - Mac Monterey (12) passed.
Pipeline on Agent
Hash: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💻 [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: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💻 [CI Build] Tests on macOS M1 - Mac Ventura (13) passed 💻
✅ All tests on macOS M1 - Mac Ventura (13) passed.
Pipeline on Agent
Hash: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📚 [CI Build] Artifacts 📚
Packages generated
View packages
Pipeline on Agent
Hash: [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❌ [CI Build] Windows Integration Tests failed ❌
❌ Failed ❌
Pipeline on Agent
Hash: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💻 [CI Build] Windows Integration Tests passed 💻
✅ All Windows Integration Tests passed.
Pipeline on Agent
Hash: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚀 [CI Build] Test results 🚀
Test results
✅ All tests passed on VSTS: test results.
🎉 All 98 tests passed 🎉
Tests counts
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
⚠️ mac-binding-project: No tests selected. Html Report (VSDrops) Download
⚠️ mmp: No tests selected. Html Report (VSDrops) Download
⚠️ mononative: No tests selected. Html Report (VSDrops) Download
⚠️ mtouch: No tests selected. Html Report (VSDrops) Download
⚠️ xammac: No tests selected. 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 1 tests passed. Html Report (VSDrops) Download
✅ install-source: All 1 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 40 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 7 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 7 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 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: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]
e1cb86e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚀 [CI Build] Test results 🚀
Test results
✅ All tests passed on VSTS: test results.
🎉 All 98 tests passed 🎉
Tests counts
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
⚠️ mac-binding-project: No tests selected. Html Report (VSDrops) Download
⚠️ mmp: No tests selected. Html Report (VSDrops) Download
⚠️ mononative: No tests selected. Html Report (VSDrops) Download
⚠️ mtouch: No tests selected. Html Report (VSDrops) Download
⚠️ xammac: No tests selected. 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 1 tests passed. Html Report (VSDrops) Download
✅ install-source: All 1 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 40 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 7 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 7 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 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: e1cb86ebae0b6a071e5c4849a0955928a9bf5efe [CI build]