Skip to content
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.

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

Fix build break on osx/arm64 Debug #102631

Merged
merged 5 commits into from
May 24, 2024
Merged

Conversation

kunalspathak
Copy link
Member

Fixes: #102618 and the errors reported in
#102297 (comment)

@dotnet-issue-labeler dotnet-issue-labeler bot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label May 23, 2024
Copy link
Contributor

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

@@ -44,6 +44,34 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
*/

#ifdef SWIFT_SUPPORT
regMaskTP rsAllCalleeSavedMask;
regMaskTP rsIntCalleeSavedMask;
Copy link
Member

@amanasifkhalid amanasifkhalid May 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think it would be cleaner to initialize these here instead of in RegSet's constructor below? (Never mind, I realized we want the constructor to reset these values between methods compiled) Also, it might be nice to add a comment explaining these aren't const or constexpr because rsClearRegsModified (and only this method) may modify them in Swift interop scenarios.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think it would be cleaner to initialize these here instead of in RegSet's constructor below?

sure.

constexpr

Was there a specific TP improvement we saw by marking them constexpr? I am inclined to just make them and it is just cleaner.

regMaskTP rsAllCalleeSavedMask = RBM_CALLEE_SAVED;
regMaskTP rsIntCalleeSavedMask = RBM_INT_CALLEE_SAVED;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will check if there is any TP impact with this change.

Copy link
Member

@amanasifkhalid amanasifkhalid May 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there a specific TP improvement we saw by marking them constexpr?

This was part of a bigger change, so I'm not sure what the TP impact is of changing this. I'm curious to see as well. If there is no impact, then maybe we should move them back into the RegSet class.

@kunalspathak kunalspathak merged commit a8bc8fa into dotnet:main May 24, 2024
107 checks passed
@kunalspathak kunalspathak deleted the osx-arm64-debug branch May 24, 2024 00:21
@am11
Copy link
Member

am11 commented May 24, 2024

Thanks @kunalspathak! Build on osx-arm64 is succeeded. 👍

Ruihan-Yin pushed a commit to Ruihan-Yin/runtime that referenced this pull request May 30, 2024
* fix build break on osx/arm64 Debug

* remove constexpr

* Revert "remove constexpr"

This reverts commit e67ca1a.

* Revert "fix build break on osx/arm64 Debug"

This reverts commit dc5ad92.

* remove static constexpr

---------

Co-authored-by: Kunal Pathak <kunalpathak@kunals-mbp.lan>
@github-actions github-actions bot locked and limited conversation to collaborators Jun 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Debug build errors out
4 participants