|
@@ -50,9 +50,10 @@ static llvm::cl::opt<bool>
|
|
|
Direct("direct", llvm::cl::Optional,
|
|
|
llvm::cl::desc("Use the parsed declarations without indirection"));
|
|
|
|
|
|
-static llvm::cl::opt<bool>
|
|
|
- UseOrigins("use-origins", llvm::cl::Optional,
|
|
|
- llvm::cl::desc("Use DeclContext origin information for more accurate lookups"));
|
|
|
+static llvm::cl::opt<bool> UseOrigins(
|
|
|
+ "use-origins", llvm::cl::Optional,
|
|
|
+ llvm::cl::desc(
|
|
|
+ "Use DeclContext origin information for more accurate lookups"));
|
|
|
|
|
|
static llvm::cl::list<std::string>
|
|
|
ClangArgs("Xcc", llvm::cl::ZeroOrMore,
|
|
@@ -225,7 +226,7 @@ std::unique_ptr<CodeGenerator> BuildCodeGen(CompilerInstance &CI,
|
|
|
CI.getDiagnostics(), ModuleName, CI.getHeaderSearchOpts(),
|
|
|
CI.getPreprocessorOpts(), CI.getCodeGenOpts(), LLVMCtx));
|
|
|
}
|
|
|
-} // end namespace
|
|
|
+} // namespace init_convenience
|
|
|
|
|
|
namespace {
|
|
|
|
|
@@ -261,8 +262,8 @@ void AddExternalSource(CIAndOrigins &CI,
|
|
|
{CI.getASTContext(), CI.getFileManager()});
|
|
|
llvm::SmallVector<ExternalASTMerger::ImporterSource, 3> Sources;
|
|
|
for (CIAndOrigins &Import : Imports)
|
|
|
- Sources.push_back(
|
|
|
- {Import.getASTContext(), Import.getFileManager(), Import.getOriginMap()});
|
|
|
+ Sources.push_back({Import.getASTContext(), Import.getFileManager(),
|
|
|
+ Import.getOriginMap()});
|
|
|
auto ES = llvm::make_unique<ExternalASTMerger>(Target, Sources);
|
|
|
CI.getASTContext().setExternalSource(ES.release());
|
|
|
CI.getASTContext().getTranslationUnitDecl()->setHasExternalVisibleStorage();
|
|
@@ -334,8 +335,8 @@ llvm::Expected<CIAndOrigins> Parse(const std::string &Path,
|
|
|
void Forget(CIAndOrigins &CI, llvm::MutableArrayRef<CIAndOrigins> Imports) {
|
|
|
llvm::SmallVector<ExternalASTMerger::ImporterSource, 3> Sources;
|
|
|
for (CIAndOrigins &Import : Imports)
|
|
|
- Sources.push_back(
|
|
|
- {Import.getASTContext(), Import.getFileManager(), Import.getOriginMap()});
|
|
|
+ Sources.push_back({Import.getASTContext(), Import.getFileManager(),
|
|
|
+ Import.getOriginMap()});
|
|
|
ExternalASTSource *Source = CI.CI->getASTContext().getExternalSource();
|
|
|
auto *Merger = static_cast<ExternalASTMerger *>(Source);
|
|
|
Merger->RemoveSources(Sources);
|