This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
Use _TARGET_64BIT_ macro #16660
Merged
Use _TARGET_64BIT_ macro #16660
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
echesakov
added
the
* NO MERGE *
|
@jkotas PTAL |
jkotas
approved these changes
Mar 1, 2018
src/vm/peimagelayout.cpp
Outdated
| @@ -591,7 +591,7 @@ PEImageLayout::EnumMemoryRegions(CLRDataEnumMemoryFlags flags) | |||
| } | |||
| #endif //DACCESS_COMPILE | |||
|
|
|||
| #if defined(_WIN64) && !defined(DACCESS_COMPILE) | |||
| #if defined(_TARGET_64BIT_) && !defined(DACCESS_COMPILE) | |||
|
|
|||
There was a problem hiding this comment.
ConvertILOnlyPE32ToPE64 and ConvertILOnlyPE32ToPE64Worker is deadcode in .NET Core. It would be better to delete it
src/vm/ceeload.cpp
Outdated
| @@ -10035,9 +10035,9 @@ void Module::RestoreMethodTablePointerRaw(MethodTable ** ppMT, | |||
|
|
|||
| if (CORCOMPILE_IS_POINTER_TAGGED(fixup)) | |||
| { | |||
| #ifdef _WIN64 | |||
| #ifdef _TARGET_64BIT_ | |||
There was a problem hiding this comment.
This does not look quite right to me. I think that there is also a problem with SIZE_T in CORCOMPILE_UNTAG_TOKEN macro.
Maybe best to postpone this to the "interesting changes" batch.
echesakov
added
enhancement
|
@dotnet-bot test OSX10.12 x64 Checked Innerloop Build and Test please |
24 tasks
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.
Use
_TARGET_64BIT_instead of ambiguous_WIN64andBIT64Related issue: #16513