From 519fc96c475680de2cc49e7811dbbfadb912cbcc Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 23 Oct 2019 17:52:09 +0000 Subject: Vendor import of stripped clang trunk r375505, the last commit before the upstream Subversion repository was made read-only, and the LLVM project migrated to GitHub: https://llvm.org/svn/llvm-project/cfe/trunk@375505 --- lib/FrontendTool/ExecuteCompilerInvocation.cpp | 99 +++++++++++++------------- 1 file changed, 49 insertions(+), 50 deletions(-) (limited to 'lib/FrontendTool/ExecuteCompilerInvocation.cpp') diff --git a/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/lib/FrontendTool/ExecuteCompilerInvocation.cpp index 69e773658c5cd..9bf70b793d9b8 100644 --- a/lib/FrontendTool/ExecuteCompilerInvocation.cpp +++ b/lib/FrontendTool/ExecuteCompilerInvocation.cpp @@ -41,38 +41,36 @@ CreateFrontendBaseAction(CompilerInstance &CI) { (void)Action; switch (CI.getFrontendOpts().ProgramAction) { - case ASTDeclList: return llvm::make_unique(); - case ASTDump: return llvm::make_unique(); - case ASTPrint: return llvm::make_unique(); - case ASTView: return llvm::make_unique(); + case ASTDeclList: return std::make_unique(); + case ASTDump: return std::make_unique(); + case ASTPrint: return std::make_unique(); + case ASTView: return std::make_unique(); case DumpCompilerOptions: - return llvm::make_unique(); - case DumpRawTokens: return llvm::make_unique(); - case DumpTokens: return llvm::make_unique(); - case EmitAssembly: return llvm::make_unique(); - case EmitBC: return llvm::make_unique(); - case EmitHTML: return llvm::make_unique(); - case EmitLLVM: return llvm::make_unique(); - case EmitLLVMOnly: return llvm::make_unique(); - case EmitCodeGenOnly: return llvm::make_unique(); - case EmitObj: return llvm::make_unique(); - case FixIt: return llvm::make_unique(); + return std::make_unique(); + case DumpRawTokens: return std::make_unique(); + case DumpTokens: return std::make_unique(); + case EmitAssembly: return std::make_unique(); + case EmitBC: return std::make_unique(); + case EmitHTML: return std::make_unique(); + case EmitLLVM: return std::make_unique(); + case EmitLLVMOnly: return std::make_unique(); + case EmitCodeGenOnly: return std::make_unique(); + case EmitObj: return std::make_unique(); + case FixIt: return std::make_unique(); case GenerateModule: - return llvm::make_unique(); + return std::make_unique(); case GenerateModuleInterface: - return llvm::make_unique(); + return std::make_unique(); case GenerateHeaderModule: - return llvm::make_unique(); - case GeneratePCH: return llvm::make_unique(); - case GenerateInterfaceYAMLExpV1: - return llvm::make_unique(); - case GenerateInterfaceTBEExpV1: - return llvm::make_unique(); - case InitOnly: return llvm::make_unique(); - case ParseSyntaxOnly: return llvm::make_unique(); - case ModuleFileInfo: return llvm::make_unique(); - case VerifyPCH: return llvm::make_unique(); - case TemplightDump: return llvm::make_unique(); + return std::make_unique(); + case GeneratePCH: return std::make_unique(); + case GenerateInterfaceIfsExpV1: + return std::make_unique(); + case InitOnly: return std::make_unique(); + case ParseSyntaxOnly: return std::make_unique(); + case ModuleFileInfo: return std::make_unique(); + case VerifyPCH: return std::make_unique(); + case TemplightDump: return std::make_unique(); case PluginAction: { for (FrontendPluginRegistry::iterator it = @@ -93,35 +91,35 @@ CreateFrontendBaseAction(CompilerInstance &CI) { return nullptr; } - case PrintPreamble: return llvm::make_unique(); + case PrintPreamble: return std::make_unique(); case PrintPreprocessedInput: { if (CI.getPreprocessorOutputOpts().RewriteIncludes || CI.getPreprocessorOutputOpts().RewriteImports) - return llvm::make_unique(); - return llvm::make_unique(); + return std::make_unique(); + return std::make_unique(); } - case RewriteMacros: return llvm::make_unique(); - case RewriteTest: return llvm::make_unique(); + case RewriteMacros: return std::make_unique(); + case RewriteTest: return std::make_unique(); #if CLANG_ENABLE_OBJC_REWRITER - case RewriteObjC: return llvm::make_unique(); + case RewriteObjC: return std::make_unique(); #else case RewriteObjC: Action = "RewriteObjC"; break; #endif #if CLANG_ENABLE_ARCMT case MigrateSource: - return llvm::make_unique(); + return std::make_unique(); #else case MigrateSource: Action = "MigrateSource"; break; #endif #if CLANG_ENABLE_STATIC_ANALYZER - case RunAnalysis: return llvm::make_unique(); + case RunAnalysis: return std::make_unique(); #else case RunAnalysis: Action = "RunAnalysis"; break; #endif - case RunPreprocessorOnly: return llvm::make_unique(); + case RunPreprocessorOnly: return std::make_unique(); case PrintDependencyDirectivesSourceMinimizerOutput: - return llvm::make_unique(); + return std::make_unique(); } #if !CLANG_ENABLE_ARCMT || !CLANG_ENABLE_STATIC_ANALYZER \ @@ -143,7 +141,7 @@ CreateFrontendAction(CompilerInstance &CI) { const FrontendOptions &FEOpts = CI.getFrontendOpts(); if (FEOpts.FixAndRecompile) { - Act = llvm::make_unique(std::move(Act)); + Act = std::make_unique(std::move(Act)); } #if CLANG_ENABLE_ARCMT @@ -154,13 +152,13 @@ CreateFrontendAction(CompilerInstance &CI) { case FrontendOptions::ARCMT_None: break; case FrontendOptions::ARCMT_Check: - Act = llvm::make_unique(std::move(Act)); + Act = std::make_unique(std::move(Act)); break; case FrontendOptions::ARCMT_Modify: - Act = llvm::make_unique(std::move(Act)); + Act = std::make_unique(std::move(Act)); break; case FrontendOptions::ARCMT_Migrate: - Act = llvm::make_unique(std::move(Act), + Act = std::make_unique(std::move(Act), FEOpts.MTMigrateDir, FEOpts.ARCMTMigrateReportOut, FEOpts.ARCMTMigrateEmitARCErrors); @@ -168,7 +166,7 @@ CreateFrontendAction(CompilerInstance &CI) { } if (FEOpts.ObjCMTAction != FrontendOptions::ObjCMT_None) { - Act = llvm::make_unique(std::move(Act), + Act = std::make_unique(std::move(Act), FEOpts.MTMigrateDir, FEOpts.ObjCMTAction); } @@ -178,7 +176,7 @@ CreateFrontendAction(CompilerInstance &CI) { // If there are any AST files to merge, create a frontend action // adaptor to perform the merge. if (!FEOpts.ASTMergeFiles.empty()) - Act = llvm::make_unique(std::move(Act), + Act = std::make_unique(std::move(Act), FEOpts.ASTMergeFiles); return Act; @@ -187,11 +185,11 @@ CreateFrontendAction(CompilerInstance &CI) { bool ExecuteCompilerInvocation(CompilerInstance *Clang) { // Honor -help. if (Clang->getFrontendOpts().ShowHelp) { - std::unique_ptr Opts = driver::createDriverOptTable(); - Opts->PrintHelp(llvm::outs(), "clang -cc1 [options] file...", - "LLVM 'Clang' Compiler: http://clang.llvm.org", - /*Include=*/driver::options::CC1Option, - /*Exclude=*/0, /*ShowAllAliases=*/false); + driver::getDriverOptTable().PrintHelp( + llvm::outs(), "clang -cc1 [options] file...", + "LLVM 'Clang' Compiler: http://clang.llvm.org", + /*Include=*/driver::options::CC1Option, + /*Exclude=*/0, /*ShowAllAliases=*/false); return true; } @@ -231,7 +229,7 @@ bool ExecuteCompilerInvocation(CompilerInstance *Clang) { // This should happen AFTER plugins have been loaded! if (!Clang->getFrontendOpts().LLVMArgs.empty()) { unsigned NumArgs = Clang->getFrontendOpts().LLVMArgs.size(); - auto Args = llvm::make_unique(NumArgs + 2); + auto Args = std::make_unique(NumArgs + 2); Args[0] = "clang (LLVM option parsing)"; for (unsigned i = 0; i != NumArgs; ++i) Args[i + 1] = Clang->getFrontendOpts().LLVMArgs[i].c_str(); @@ -272,6 +270,7 @@ bool ExecuteCompilerInvocation(CompilerInstance *Clang) { AnOpts, Clang->getDiagnostics(), Clang->getLangOpts()); + return true; } // Honor -analyzer-config-help. -- cgit v1.2.3