diff options
| author | dim <dim@FreeBSD.org> | 2015-09-06 18:36:24 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-06 18:36:24 +0000 |
| commit | 4238dc458ed9a048965af111b979fd51d288f22c (patch) | |
| tree | 3d3ed1e1987dbe6444294b1b4e249814b97b97a5 /tools/libclang | |
| parent | 6416b56f5a3923c6c264b46365e16718ccabf081 (diff) | |
| download | FreeBSD-src-4238dc458ed9a048965af111b979fd51d288f22c.zip FreeBSD-src-4238dc458ed9a048965af111b979fd51d288f22c.tar.gz | |
Import clang 3.7.0 release (r246257).
Diffstat (limited to 'tools/libclang')
| -rw-r--r-- | tools/libclang/CIndex.cpp | 8 | ||||
| -rw-r--r-- | tools/libclang/CIndexer.h | 2 | ||||
| -rw-r--r-- | tools/libclang/CMakeLists.txt | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 6e48bab..8225a6c 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -2884,8 +2884,8 @@ CXIndex clang_createIndex(int excludeDeclarationsFromPCH, llvm::InitializeAllAsmPrinters(); llvm::InitializeAllAsmParsers(); - CIndexer *CIdxr = - new CIndexer(std::make_shared<ObjectFilePCHContainerOperations>()); + CIndexer *CIdxr = new CIndexer(); + if (excludeDeclarationsFromPCH) CIdxr->setOnlyLocalDecls(); if (displayDiagnostics) @@ -2954,8 +2954,8 @@ enum CXErrorCode clang_createTranslationUnit2(CXIndex CIdx, IntrusiveRefCntPtr<DiagnosticsEngine> Diags = CompilerInstance::createDiagnostics(new DiagnosticOptions()); std::unique_ptr<ASTUnit> AU = ASTUnit::LoadFromASTFile( - ast_filename, CXXIdx->getPCHContainerOperations(), Diags, FileSystemOpts, - CXXIdx->getOnlyLocalDecls(), None, + ast_filename, CXXIdx->getPCHContainerOperations()->getRawReader(), Diags, + FileSystemOpts, CXXIdx->getOnlyLocalDecls(), None, /*CaptureDiagnostics=*/true, /*AllowPCHWithCompilerErrors=*/true, /*UserFilesAreVolatile=*/true); diff --git a/tools/libclang/CIndexer.h b/tools/libclang/CIndexer.h index 8a306cd..bf55301 100644 --- a/tools/libclang/CIndexer.h +++ b/tools/libclang/CIndexer.h @@ -44,7 +44,7 @@ class CIndexer { public: CIndexer(std::shared_ptr<PCHContainerOperations> PCHContainerOps = - std::make_shared<RawPCHContainerOperations>()) + std::make_shared<PCHContainerOperations>()) : OnlyLocalDecls(false), DisplayDiagnostics(false), Options(CXGlobalOpt_None), PCHContainerOps(PCHContainerOps) {} diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt index fb29209..06db70e 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt @@ -40,7 +40,6 @@ set(SOURCES set(LIBS clangAST clangBasic - clangCodeGen clangFrontend clangIndex clangLex |
