diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-10-22 23:59:45 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-10-22 23:59:45 +0000 |
| commit | 4ec429d1be4ede3d02712714f20470b2c87f748c (patch) | |
| tree | 24d2be68ba7088343c0f9ba970121527865c1b20 /lib/Frontend/CompilerInvocation.cpp | |
| parent | 38295beb73db5f90bfcf31625fb81dbc3b96290a (diff) | |
Handle implicitly-included PCH files the same way as
implicitly-included PTH files during initialization, delaying the
mapping down to the "original source file" until after later in the
initialization process.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@166452 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/CompilerInvocation.cpp')
| -rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 1de547d9b4..83248454aa 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -2224,16 +2224,7 @@ static void ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args, OPT_include_pth), ie = Args.filtered_end(); it != ie; ++it) { const Arg *A = *it; - // PCH is handled specially, we need to extra the original include path. - if (A->getOption().matches(OPT_include_pch)) { - std::string OriginalFile = - ASTReader::getOriginalSourceFile(A->getValue(Args), FileMgr, Diags); - if (OriginalFile.empty()) - continue; - - Opts.Includes.push_back(OriginalFile); - } else - Opts.Includes.push_back(A->getValue(Args)); + Opts.Includes.push_back(A->getValue(Args)); } for (arg_iterator it = Args.filtered_begin(OPT_chain_include), |