Halt #372
Merged
Halt #372
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
The two branches are identical and just define the same macro on different architectures. Collapse them to simplify. Yes, Windows is supported on all those architectures.
Windows could be using a GNU compatible compiler (i.e. clang). In such a scenario, assume that __builtin_unreachable() is available (any newer clang or gcc would suffice). However, since we require clang for swift, it makes sense to require clang for Foundation build. The minimal require clang already has __builtin_unreachable supported. On a non-GNU-like compiler, use the MSVC intrinsic `__assume` which gives a proper `__builtin_unreachable` equivalent.
Use another macro to make the two cases more similar. NFC.
| @@ -158,22 +158,17 @@ CF_PRIVATE CFIndex __CFActiveProcessorCount(); | |||
| #endif | |||
|
|
|||
| #if DEPLOYMENT_TARGET_WINDOWS | |||
| #define __builtin_unreachable() do { } while (0) | |||
| #if !defined(__GNUC__) | |||
There was a problem hiding this comment.
Why not use _MSC_VER here as below, instead of looking for !__GNUC__?
There was a problem hiding this comment.
Because you could be using a GNU compatible compiler on Windows (e.g. clang). -windows- other than windows-msvc will define GNU even though the code is being compiled for Windows.
|
@swift-ci please test |
|
The failure seems unrelated to this change. |
|
Ping? |
|
I'm reluctant to merge anything in while we're still trying to figure out the root cause of the CFNumber failure currently hitting CI. |
|
I didn't realize that there were still CI issues. Sorry for the noise (I thought they had been resolved and this was just forgotten). |
Merged
|
I think the CI problem is cleared up now (compiler bug). I'll try this again. |
|
@swift-ci please test |
russbishop
pushed a commit
to russbishop/swift-corelibs-foundation
that referenced
this pull request
May 31, 2016
* Base: collapse two CPP branches The two branches are identical and just define the same macro on different architectures. Collapse them to simplify. Yes, Windows is supported on all those architectures. * Base: tweak __builtin_unreachable on Windows Windows could be using a GNU compatible compiler (i.e. clang). In such a scenario, assume that __builtin_unreachable() is available (any newer clang or gcc would suffice). However, since we require clang for swift, it makes sense to require clang for Foundation build. The minimal require clang already has __builtin_unreachable supported. On a non-GNU-like compiler, use the MSVC intrinsic `__assume` which gives a proper `__builtin_unreachable` equivalent. * Base: spell DebugBreak __builtin_trap Use another macro to make the two cases more similar. NFC.
kateinoigakukun
pushed a commit
to kateinoigakukun/swift-corelibs-foundation
that referenced
this pull request
Oct 11, 2023
[pull] swiftwasm from main
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.
No description provided.