Simplify 64-bit platform conditions #115083
Merged
Conversation
This file contains hidden or 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
ghost
added
the
area-CodeGen-coreclr
dotnet-policy-service
bot
added
the
community-contribution
|
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch |
Open
3 tasks
huoyaoyuan
reviewed
Apr 27, 2025
jkotas
reviewed
Apr 27, 2025
jkotas
reviewed
Apr 27, 2025
jkotas
reviewed
Apr 27, 2025
jkotas
reviewed
Apr 28, 2025
jkotas
reviewed
Apr 28, 2025
janvorli
reviewed
Apr 28, 2025
jkotas
reviewed
Apr 28, 2025
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
jkotas
reviewed
Apr 28, 2025
jkotas
reviewed
Apr 28, 2025
jkotas
reviewed
Apr 28, 2025
jkotas
reviewed
Apr 28, 2025
jkotas
reviewed
Apr 28, 2025
jkotas
reviewed
Apr 28, 2025
|
Also, runtime/src/coreclr/debug/daccess/fntableaccess.h Lines 33 to 39 in 54dbfa7 #if defined(TARGET_64BIT) && defined(TARGET_WINDOWS) too.
|
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
jkotas
reviewed
Apr 28, 2025
jkotas
reviewed
Apr 28, 2025
jkotas
reviewed
Apr 28, 2025
src/coreclr/vm/dynamicmethod.cpp
Outdated
| @@ -448,7 +443,7 @@ HeapList* HostCodeHeap::InitializeHeapList(CodeHeapRequestInfo *pInfo) | |||
| else | |||
| #endif // FEATURE_INTERPRETER | |||
| { | |||
| #if defined(TARGET_AMD64) || defined(TARGET_ARM64) || defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64) | |||
| #if defined(TARGET_64BIT) && defined(TARGET_WINDOWS) | |||
There was a problem hiding this comment.
if (pInfo->IsInterpreted()) block needs to be moved inside this ifdef to fix the build break
jkotas
reviewed
Apr 29, 2025
src/coreclr/vm/jitinterface.cpp
Outdated
|
|
||
| #elif defined(TARGET_AMD64) | ||
|
|
||
| #if defined(TARGET_64BIT) && defined(TARGET_WINDOWS) |
There was a problem hiding this comment.
Suggested change
| #if defined(TARGET_64BIT) && defined(TARGET_WINDOWS) | |
| #if !defined(TARGET_X86) && defined(TARGET_WINDOWS) |
This would be more logical ifdef for this one.
Also, reservePersonalityRoutineSpace above can be wrapped with the same ifdef now that we are not filling in the personality routine on non-Windows.
jkotas
reviewed
Apr 29, 2025
jkotas
reviewed
Apr 29, 2025
jkotas
reviewed
Apr 29, 2025
jkotas
reviewed
Apr 29, 2025
jkotas
reviewed
Apr 29, 2025
jkotas
reviewed
Apr 29, 2025
| // Note that the count of unwind codes (2 bytes each) is stored as a UBYTE | ||
| // So the largest size could be 510 bytes, plus the header and language | ||
| // specific stuff. This can't overflow. | ||
|
|
||
| _ASSERTE(FitsInU4(unwindSize + sizeof(ULONG))); | ||
| unwindSize = (ULONG)(ALIGN_UP(unwindSize, sizeof(ULONG))); |
There was a problem hiding this comment.
There are asserts elsewhere that insist on the unwind info to be 4-byte aligned. I am not sure why it is needed on Amd64. It is not a big deal to preserve the alignment.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
A few conditions which no longer need the full list of architectures.