Include assert.h manually in SourceLoc.h. #60226
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
|
cc @egorzhdan |
egorzhdan
approved these changes
Jul 26, 2022
include/swift/Basic/SourceLoc.h
Outdated
| @@ -17,6 +17,8 @@ | |||
| #ifndef SWIFT_BASIC_SOURCELOC_H | |||
| #define SWIFT_BASIC_SOURCELOC_H | |||
|
|
|||
| #include <assert.h> | |||
There was a problem hiding this comment.
Nit: can you move this a few lines below to where #include <functional> is to make sure the #include<>s are sorted?
There was a problem hiding this comment.
I've moved it down, is that the location you were after?
(I only put it up there because I thought the standard headers come first, I'm not sure if there's a header order standard for the project.)
There was a problem hiding this comment.
Yeap, thanks.
I don't think Swift has its own #include conventions, and the LLVM conventions say that the system includes go last.
3405691582
force-pushed
the
AssertHeaderBootstrapping
branch
from
3600eb3 to
e6dc9ea
Compare
On the BSDs when building with bootstrapping and therefore modules enabled, this will result in a "declaration here is not visible" error. This is _possibly_ because the assert implementation is not reexported from LLVM, maybe due to libc differences. Regardless, this fixes the problem and should be relatively inocuous to unconditionally include.
3405691582
force-pushed
the
AssertHeaderBootstrapping
branch
from
e6dc9ea to
c5e9e20
Compare
|
@swift-ci please smoke test |
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.
On the BSDs when building with bootstrapping and therefore modules enabled,
this will result in a "declaration here is not visible" error. This is
possibly because the assert implementation is not reexported from LLVM,
maybe due to libc differences. Regardless, this fixes the problem and
should be relatively inocuous to unconditionally include.