Move a free function from the Frontend library into the Lex library as
part of HeaderSearch. This function just normalizes filenames for use inside of a synthetic include directive, but it is used in both the Frontend and Serialization libraries so it needs a common home. llvm-svn: 146227
This commit is contained in:
parent
706574a994
commit
b0ffe50da8
|
@ -46,11 +46,6 @@ class Stmt;
|
|||
class TargetInfo;
|
||||
class FrontendOptions;
|
||||
|
||||
/// Normalize \arg File for use in a user defined #include directive (in the
|
||||
/// predefines buffer).
|
||||
std::string NormalizeDashIncludePath(StringRef File,
|
||||
FileManager &FileMgr);
|
||||
|
||||
/// Apply the header search options to get given HeaderSearch object.
|
||||
void ApplyHeaderSearchOptions(HeaderSearch &HS,
|
||||
const HeaderSearchOptions &HSOpts,
|
||||
|
|
|
@ -448,6 +448,9 @@ public:
|
|||
|
||||
size_t getTotalMemory() const;
|
||||
|
||||
static std::string NormalizeDashIncludePath(StringRef File,
|
||||
FileManager &FileMgr);
|
||||
|
||||
private:
|
||||
/// \brief Describes what happened when we tried to load a module map file.
|
||||
enum LoadModuleMapResult {
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include "clang/Frontend/FrontendDiagnostic.h"
|
||||
#include "clang/Frontend/FrontendOptions.h"
|
||||
#include "clang/Frontend/PreprocessorOptions.h"
|
||||
#include "clang/Lex/HeaderSearch.h"
|
||||
#include "clang/Lex/Preprocessor.h"
|
||||
#include "clang/Basic/FileManager.h"
|
||||
#include "clang/Basic/SourceManager.h"
|
||||
|
@ -48,39 +49,19 @@ static void DefineBuiltinMacro(MacroBuilder &Builder, StringRef Macro,
|
|||
}
|
||||
}
|
||||
|
||||
std::string clang::NormalizeDashIncludePath(StringRef File,
|
||||
FileManager &FileMgr) {
|
||||
// Implicit include paths should be resolved relative to the current
|
||||
// working directory first, and then use the regular header search
|
||||
// mechanism. The proper way to handle this is to have the
|
||||
// predefines buffer located at the current working directory, but
|
||||
// it has no file entry. For now, workaround this by using an
|
||||
// absolute path if we find the file here, and otherwise letting
|
||||
// header search handle it.
|
||||
llvm::SmallString<128> Path(File);
|
||||
llvm::sys::fs::make_absolute(Path);
|
||||
bool exists;
|
||||
if (llvm::sys::fs::exists(Path.str(), exists) || !exists)
|
||||
Path = File;
|
||||
else if (exists)
|
||||
FileMgr.getFile(File);
|
||||
|
||||
return Lexer::Stringify(Path.str());
|
||||
}
|
||||
|
||||
/// AddImplicitInclude - Add an implicit #include of the specified file to the
|
||||
/// predefines buffer.
|
||||
static void AddImplicitInclude(MacroBuilder &Builder, StringRef File,
|
||||
FileManager &FileMgr) {
|
||||
Builder.append("#include \"" +
|
||||
Twine(NormalizeDashIncludePath(File, FileMgr)) + "\"");
|
||||
Builder.append(Twine("#include \"") +
|
||||
HeaderSearch::NormalizeDashIncludePath(File, FileMgr) + "\"");
|
||||
}
|
||||
|
||||
static void AddImplicitIncludeMacros(MacroBuilder &Builder,
|
||||
StringRef File,
|
||||
FileManager &FileMgr) {
|
||||
Builder.append("#__include_macros \"" +
|
||||
Twine(NormalizeDashIncludePath(File, FileMgr)) + "\"");
|
||||
Builder.append(Twine("#__include_macros \"") +
|
||||
HeaderSearch::NormalizeDashIncludePath(File, FileMgr) + "\"");
|
||||
// Marker token to stop the __include_macros fetch loop.
|
||||
Builder.append("##"); // ##?
|
||||
}
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
#include "clang/Lex/HeaderSearch.h"
|
||||
#include "clang/Lex/HeaderMap.h"
|
||||
#include "clang/Lex/Lexer.h"
|
||||
#include "clang/Basic/Diagnostic.h"
|
||||
#include "clang/Basic/FileManager.h"
|
||||
#include "clang/Basic/IdentifierTable.h"
|
||||
|
@ -619,6 +620,28 @@ LookupSubframeworkHeader(StringRef Filename,
|
|||
return FE;
|
||||
}
|
||||
|
||||
/// \brief Helper static function to normalize a path for injection into
|
||||
/// a synthetic header.
|
||||
/*static*/ std::string
|
||||
HeaderSearch::NormalizeDashIncludePath(StringRef File, FileManager &FileMgr) {
|
||||
// Implicit include paths should be resolved relative to the current
|
||||
// working directory first, and then use the regular header search
|
||||
// mechanism. The proper way to handle this is to have the
|
||||
// predefines buffer located at the current working directory, but
|
||||
// it has no file entry. For now, workaround this by using an
|
||||
// absolute path if we find the file here, and otherwise letting
|
||||
// header search handle it.
|
||||
llvm::SmallString<128> Path(File);
|
||||
llvm::sys::fs::make_absolute(Path);
|
||||
bool exists;
|
||||
if (llvm::sys::fs::exists(Path.str(), exists) || !exists)
|
||||
Path = File;
|
||||
else if (exists)
|
||||
FileMgr.getFile(File);
|
||||
|
||||
return Lexer::Stringify(Path.str());
|
||||
}
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
// File Info Management.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include "clang/Serialization/SerializationDiagnostic.h"
|
||||
#include "ASTCommon.h"
|
||||
#include "ASTReaderInternals.h"
|
||||
#include "clang/Frontend/Utils.h"
|
||||
#include "clang/Sema/Sema.h"
|
||||
#include "clang/Sema/Scope.h"
|
||||
#include "clang/AST/ASTConsumer.h"
|
||||
|
@ -195,7 +194,8 @@ bool PCHValidator::ReadPredefinesBuffer(const PCHPredefinesBlocks &Buffers,
|
|||
// below.
|
||||
llvm::SmallString<256> PCHInclude;
|
||||
PCHInclude += "#include \"";
|
||||
PCHInclude += NormalizeDashIncludePath(OriginalFileName, FileMgr);
|
||||
PCHInclude += HeaderSearch::NormalizeDashIncludePath(OriginalFileName,
|
||||
FileMgr);
|
||||
PCHInclude += "\"\n";
|
||||
std::pair<StringRef,StringRef> Split =
|
||||
StringRef(PP.getPredefines()).split(PCHInclude.str());
|
||||
|
|
Loading…
Reference in New Issue