This repository has been archived by the owner on Apr 2, 2020. It is now read-only.
Make RemapClangImporterOptions more robust. #1302
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
|
@swift-ci test and merge |
allevato
reviewed
Feb 15, 2019
source/Symbol/SwiftASTContext.cpp
Outdated
|
|
||
| if (!remap_next) { | ||
| /* previous argument was -iquote */; | ||
| } else if (arg == "-I" || arg == "-F" || arg == "-iquote") { |
There was a problem hiding this comment.
Clang allows -iquote to be used in joined form as well (e.g., -iquotefoo/bar is legal): https://github.com/llvm/llvm-project/blob/fcbec02/clang/include/clang/Driver/Options.td#L1951-L1952
Does that case need to be handled here as well? It's ugly, but we actually use it in our Swift Bazel rules to remove some excess <space>-Xcc<space>s in our command lines.
adrian-prantl
force-pushed
the
48078809
branch
from
8a9dce3
to
e7ab461
Compare
Due to a bug absolute path remapping would be applied to -iquote *options* rather than their arguments. The fixed code only whitelists a few search path options that it actually understands. This patch also adds support for -iquote/some/path. rdar://problem/48078809
adrian-prantl
force-pushed
the
48078809
branch
from
e7ab461
to
425060e
Compare
|
@swift-ci test |
|
@adrian-prantl Is it possible to merge this into the Swift 5.0 branch? |
|
@DavidGoldman it is! -> #1305 |
|
Thanks, is it in an Xcode 10.2 beta? |
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.
Due to a bug absolute path remapping would be applied to -iquote
options rather than their arguments. The fixed code only whitelists
a few search path options that it actually understands.
rdar://problem/48078809