Fix conflicting TADDR definition #98925
Merged
Conversation
This file contains 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
huoyaoyuan
reviewed
Feb 26, 2024
This was referenced Feb 27, 2024
filipnavara
commented
Feb 28, 2024
| @@ -206,7 +206,7 @@ void HelperMethodFrame::UpdateRegDisplay(const PREGDISPLAY pRD, bool updateFloat | |||
|
|
|||
| #endif // TARGET_UNIX | |||
|
|
|||
| #define CALLEE_SAVED_REGISTER(regname) pRD->pCurrentContextPointers->regname = m_MachState.m_Ptrs.p##regname; | |||
| #define CALLEE_SAVED_REGISTER(regname) pRD->pCurrentContextPointers->regname = (DWORD64 *)(TADDR *)m_MachState.m_Ptrs.p##regname; | |||
There was a problem hiding this comment.
This feels pretty ugly, but uint64_t (& DWORD64) is defined as unsigned long long and uintptr_t (& TADDR) is defined as unsigned long, at least on osx-x64.
filipnavara
commented
Feb 28, 2024
huoyaoyuan
reviewed
Feb 28, 2024
jkotas
reviewed
Feb 28, 2024
jkotas
reviewed
Feb 28, 2024
| @@ -206,7 +206,7 @@ void HelperMethodFrame::UpdateRegDisplay(const PREGDISPLAY pRD, bool updateFloat | |||
|
|
|||
| #endif // TARGET_UNIX | |||
|
|
|||
| #define CALLEE_SAVED_REGISTER(regname) pRD->pCurrentContextPointers->regname = m_MachState.m_Ptrs.p##regname; | |||
| #define CALLEE_SAVED_REGISTER(regname) pRD->pCurrentContextPointers->regname = (DWORD64 *)(TADDR *)m_MachState.m_Ptrs.p##regname; | |||
There was a problem hiding this comment.
Suggested change
| #define CALLEE_SAVED_REGISTER(regname) pRD->pCurrentContextPointers->regname = (DWORD64 *)(TADDR *)m_MachState.m_Ptrs.p##regname; | |
| #define CALLEE_SAVED_REGISTER(regname) pRD->pCurrentContextPointers->regname = (DWORD64 *)m_MachState.m_Ptrs.p##regname; |
Is this enough?
There was a problem hiding this comment.
Nope, doesn’t work. It’s typed as the __DPtr class and it doesn’t have the cast operator to make that work.
There was a problem hiding this comment.
osx-x64 with single cast:
/Users/filipnavara/Projects/runtime/src/coreclr/vm/amd64/cgenamd64.cpp:210:5: error: cannot cast from type 'PTR_TADDR' (aka '__DPtr<unsigned long>') to pointer type 'DWORD64 *' (aka 'unsigned long long *')
ENUM_CALLEE_SAVED_REGISTERS();
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/filipnavara/Projects/runtime/src/coreclr/vm/amd64/cgencpu.h:182:5: note: expanded from macro 'ENUM_CALLEE_SAVED_REGISTERS'
CALLEE_SAVED_REGISTER(R12) \
^~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/filipnavara/Projects/runtime/src/coreclr/vm/amd64/cgenamd64.cpp:209:80: note: expanded from macro 'CALLEE_SAVED_REGISTER'
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Follow up on #97751, which broke win-x86 NAOT build