Author: Nico Weber Date: 2019-11-25T21:06:56-05:00 New Revision: 6f773205cd05e47912096d7c4091f03c28255ab2
URL: https://github.com/llvm/llvm-project/commit/6f773205cd05e47912096d7c4091f03c28255ab2 DIFF: https://github.com/llvm/llvm-project/commit/6f773205cd05e47912096d7c4091f03c28255ab2.diff LOG: Revert "Use InitLLVM to setup a pretty stack printer" This reverts commit 3f76260dc0674cc0acb25f550a0f0c594cf537ea. Breaks at least these tests on Windows: Clang :: Driver/clang-offload-bundler.c Clang :: Driver/clang-offload-wrapper.c Added: Modified: clang-tools-extra/clang-change-namespace/tool/ClangChangeNamespace.cpp clang-tools-extra/clang-doc/tool/ClangDocMain.cpp clang-tools-extra/clang-move/tool/ClangMove.cpp clang-tools-extra/clang-query/tool/ClangQuery.cpp clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp clang-tools-extra/clangd/indexer/IndexerMain.cpp clang-tools-extra/clangd/tool/ClangdMain.cpp clang-tools-extra/tool-template/ToolTemplate.cpp clang/tools/arcmt-test/arcmt-test.cpp clang/tools/c-index-test/core_main.cpp clang/tools/clang-check/ClangCheck.cpp clang/tools/clang-extdef-mapping/ClangExtDefMapGen.cpp clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp clang/tools/clang-refactor/ClangRefactor.cpp clang/utils/TableGen/TableGen.cpp llvm/utils/KillTheDoctor/KillTheDoctor.cpp llvm/utils/TableGen/TableGen.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clang-change-namespace/tool/ClangChangeNamespace.cpp b/clang-tools-extra/clang-change-namespace/tool/ClangChangeNamespace.cpp index a567d7f82dea..a97be99b0bd8 100644 --- a/clang-tools-extra/clang-change-namespace/tool/ClangChangeNamespace.cpp +++ b/clang-tools-extra/clang-change-namespace/tool/ClangChangeNamespace.cpp @@ -37,7 +37,6 @@ #include "clang/Tooling/Refactoring.h" #include "clang/Tooling/Tooling.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/Signals.h" #include "llvm/Support/YAMLTraits.h" @@ -99,7 +98,7 @@ llvm::ErrorOr<std::vector<std::string>> GetWhiteListedSymbolPatterns() { } // anonymous namespace int main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); tooling::CommonOptionsParser OptionsParser(argc, argv, ChangeNamespaceCategory); const auto &Files = OptionsParser.getSourcePathList(); diff --git a/clang-tools-extra/clang-doc/tool/ClangDocMain.cpp b/clang-tools-extra/clang-doc/tool/ClangDocMain.cpp index d27a012b78ff..38b781ed39f4 100644 --- a/clang-tools-extra/clang-doc/tool/ClangDocMain.cpp +++ b/clang-tools-extra/clang-doc/tool/ClangDocMain.cpp @@ -36,7 +36,6 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/Error.h" #include "llvm/Support/FileSystem.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/Mutex.h" #include "llvm/Support/Path.h" #include "llvm/Support/Process.h" @@ -180,7 +179,7 @@ llvm::Expected<llvm::SmallString<128>> getInfoOutputFile(StringRef Root, } int main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); std::error_code OK; ExecutorName.setInitialValue("all-TUs"); diff --git a/clang-tools-extra/clang-move/tool/ClangMove.cpp b/clang-tools-extra/clang-move/tool/ClangMove.cpp index fdf83ab4604b..2df7df7fe3a7 100644 --- a/clang-tools-extra/clang-move/tool/ClangMove.cpp +++ b/clang-tools-extra/clang-move/tool/ClangMove.cpp @@ -15,7 +15,6 @@ #include "clang/Tooling/Tooling.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/Path.h" #include "llvm/Support/Process.h" #include "llvm/Support/Signals.h" @@ -95,7 +94,7 @@ cl::opt<bool> DumpDecls( } // namespace int main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); tooling::CommonOptionsParser OptionsParser(argc, argv, ClangMoveCategory); if (OldDependOnNew && NewDependOnOld) { diff --git a/clang-tools-extra/clang-query/tool/ClangQuery.cpp b/clang-tools-extra/clang-query/tool/ClangQuery.cpp index 56a1e25e1447..80e1c602796c 100644 --- a/clang-tools-extra/clang-query/tool/ClangQuery.cpp +++ b/clang-tools-extra/clang-query/tool/ClangQuery.cpp @@ -33,7 +33,6 @@ #include "clang/Tooling/Tooling.h" #include "llvm/LineEditor/LineEditor.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Signals.h" #include <fstream> @@ -82,7 +81,7 @@ bool runCommandsInFile(const char *ExeName, std::string const &FileName, } int main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); CommonOptionsParser OptionsParser(argc, argv, ClangQueryCategory); diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp index ad6182def20d..df83de856238 100644 --- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp +++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp @@ -18,7 +18,6 @@ #include "../ClangTidyForceLinker.h" #include "../GlobList.h" #include "clang/Tooling/CommonOptionsParser.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/Process.h" #include "llvm/Support/Signals.h" #include "llvm/Support/TargetSelect.h" @@ -328,7 +327,7 @@ getVfsFromFile(const std::string &OverlayFile, } static int clangTidyMain(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); CommonOptionsParser OptionsParser(argc, argv, ClangTidyCategory, cl::ZeroOrMore); llvm::IntrusiveRefCntPtr<vfs::OverlayFileSystem> BaseFS( diff --git a/clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp b/clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp index a026f25a0818..81e435fb64d0 100644 --- a/clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp +++ b/clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp @@ -19,7 +19,6 @@ #include "llvm/ADT/StringSwitch.h" #include "llvm/LineEditor/LineEditor.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/Signals.h" namespace clang { @@ -276,9 +275,9 @@ std::unique_ptr<SymbolIndex> openIndex(llvm::StringRef Index) { int main(int argc, const char *argv[]) { using namespace clang::clangd; - llvm::InitLLVM X(argc, argv); llvm::cl::ParseCommandLineOptions(argc, argv, Overview); llvm::cl::ResetCommandLineParser(); // We reuse it for REPL commands. + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); std::unique_ptr<SymbolIndex> Index; reportTime("Dex build", [&]() { diff --git a/clang-tools-extra/clangd/indexer/IndexerMain.cpp b/clang-tools-extra/clangd/indexer/IndexerMain.cpp index 1bff91f1a2d3..dac038308d9e 100644 --- a/clang-tools-extra/clangd/indexer/IndexerMain.cpp +++ b/clang-tools-extra/clangd/indexer/IndexerMain.cpp @@ -21,7 +21,6 @@ #include "clang/Tooling/Execution.h" #include "clang/Tooling/Tooling.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/Signals.h" namespace clang { @@ -93,7 +92,7 @@ class IndexActionFactory : public tooling::FrontendActionFactory { } // namespace clang int main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); const char *Overview = R"( Creates an index of symbol information etc in a whole project. diff --git a/clang-tools-extra/clangd/tool/ClangdMain.cpp b/clang-tools-extra/clangd/tool/ClangdMain.cpp index b8df361d4d2f..2639df31dbe8 100644 --- a/clang-tools-extra/clangd/tool/ClangdMain.cpp +++ b/clang-tools-extra/clangd/tool/ClangdMain.cpp @@ -21,7 +21,6 @@ #include "llvm/ADT/StringRef.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileSystem.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/Path.h" #include "llvm/Support/Process.h" #include "llvm/Support/Program.h" @@ -434,8 +433,8 @@ int main(int argc, char *argv[]) { using namespace clang; using namespace clang::clangd; - llvm::InitLLVM X(argc, argv); llvm::InitializeAllTargetInfos(); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); llvm::cl::SetVersionPrinter([](llvm::raw_ostream &OS) { OS << clang::getClangToolFullVersion("clangd") << "\n"; }); diff --git a/clang-tools-extra/tool-template/ToolTemplate.cpp b/clang-tools-extra/tool-template/ToolTemplate.cpp index f9949d79a3f9..3220eb33ac40 100644 --- a/clang-tools-extra/tool-template/ToolTemplate.cpp +++ b/clang-tools-extra/tool-template/ToolTemplate.cpp @@ -44,7 +44,6 @@ #include "clang/Tooling/Refactoring/AtomicChange.h" #include "clang/Tooling/Tooling.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Signals.h" @@ -89,7 +88,7 @@ static cl::extrahelp CommonHelp(CommonOptionsParser::HelpMessage); static cl::OptionCategory ToolTemplateCategory("tool-template options"); int main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); auto Executor = clang::tooling::createExecutorFromCommandLineArgs( argc, argv, ToolTemplateCategory); diff --git a/clang/tools/arcmt-test/arcmt-test.cpp b/clang/tools/arcmt-test/arcmt-test.cpp index 5c79321967f1..c4ba12d4f7cf 100644 --- a/clang/tools/arcmt-test/arcmt-test.cpp +++ b/clang/tools/arcmt-test/arcmt-test.cpp @@ -15,7 +15,6 @@ #include "clang/Lex/Preprocessor.h" #include "clang/Lex/PreprocessorOptions.h" #include "llvm/Support/FileSystem.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" #include "llvm/Support/Signals.h" @@ -341,8 +340,8 @@ static void printSourceRange(CharSourceRange range, ASTContext &Ctx, //===----------------------------------------------------------------------===// int main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); void *MainAddr = (void*) (intptr_t) GetExecutablePath; + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); std::string resourcesPath = CompilerInvocation::GetResourcesPath(argv[0], MainAddr); diff --git a/clang/tools/c-index-test/core_main.cpp b/clang/tools/c-index-test/core_main.cpp index 6a8877b113e6..faf8b668b4e3 100644 --- a/clang/tools/c-index-test/core_main.cpp +++ b/clang/tools/c-index-test/core_main.cpp @@ -13,17 +13,16 @@ #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/CompilerInvocation.h" #include "clang/Frontend/FrontendAction.h" -#include "clang/Index/IndexDataConsumer.h" #include "clang/Index/IndexingAction.h" +#include "clang/Index/IndexDataConsumer.h" #include "clang/Index/USRGeneration.h" #include "clang/Lex/Preprocessor.h" #include "clang/Serialization/ASTReader.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileSystem.h" -#include "llvm/Support/InitLLVM.h" -#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Signals.h" #include "llvm/Support/raw_ostream.h" +#include "llvm/Support/PrettyStackTrace.h" using namespace clang; using namespace clang::index; @@ -321,7 +320,8 @@ static void printSymbolNameAndUSR(const clang::Module *Mod, raw_ostream &OS) { //===----------------------------------------------------------------------===// int indextest_core_main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + sys::PrintStackTraceOnErrorSignal(argv[0]); + PrettyStackTraceProgram X(argc, argv); void *MainAddr = (void*) (intptr_t) indextest_core_main; std::string Executable = llvm::sys::fs::getMainExecutable(argv[0], MainAddr); diff --git a/clang/tools/clang-check/ClangCheck.cpp b/clang/tools/clang-check/ClangCheck.cpp index 466dac942254..2f59e2b82d34 100644 --- a/clang/tools/clang-check/ClangCheck.cpp +++ b/clang/tools/clang-check/ClangCheck.cpp @@ -27,7 +27,6 @@ #include "clang/Tooling/Tooling.h" #include "llvm/ADT/STLExtras.h" #include "llvm/Option/OptTable.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/Path.h" #include "llvm/Support/Signals.h" #include "llvm/Support/TargetSelect.h" @@ -152,7 +151,7 @@ class ClangCheckActionFactory { } // namespace int main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); // Initialize targets for clang module support. llvm::InitializeAllTargets(); diff --git a/clang/tools/clang-extdef-mapping/ClangExtDefMapGen.cpp b/clang/tools/clang-extdef-mapping/ClangExtDefMapGen.cpp index 8776deeb2c5c..0047aa4724f7 100644 --- a/clang/tools/clang-extdef-mapping/ClangExtDefMapGen.cpp +++ b/clang/tools/clang-extdef-mapping/ClangExtDefMapGen.cpp @@ -20,7 +20,6 @@ #include "clang/Tooling/CommonOptionsParser.h" #include "clang/Tooling/Tooling.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/Signals.h" #include <sstream> #include <string> @@ -114,7 +113,8 @@ static cl::extrahelp CommonHelp(CommonOptionsParser::HelpMessage); int main(int argc, const char **argv) { // Print a stack trace if we signal out. - llvm::InitLLVM X(argc, argv); + sys::PrintStackTraceOnErrorSignal(argv[0], false); + PrettyStackTraceProgram X(argc, argv); const char *Overview = "\nThis tool collects the USR name and location " "of external definitions in the source files " diff --git a/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp b/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp index 27d5cc4535ad..a75d2a630cf4 100644 --- a/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp +++ b/clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp @@ -30,7 +30,6 @@ #include "llvm/Support/Error.h" #include "llvm/Support/ErrorOr.h" #include "llvm/Support/FileSystem.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" #include "llvm/Support/Program.h" @@ -817,7 +816,7 @@ static void PrintVersion(raw_ostream &OS) { } int main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + sys::PrintStackTraceOnErrorSignal(argv[0]); cl::HideUnrelatedOptions(ClangOffloadBundlerCategory); cl::SetVersionPrinter(PrintVersion); diff --git a/clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp b/clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp index f232eafec683..c3863422adf6 100644 --- a/clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp +++ b/clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp @@ -27,7 +27,6 @@ #include "llvm/Support/Errc.h" #include "llvm/Support/Error.h" #include "llvm/Support/ErrorOr.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Signals.h" #include "llvm/Support/ToolOutputFile.h" @@ -304,7 +303,7 @@ class BinaryWrapper { } // anonymous namespace int main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + sys::PrintStackTraceOnErrorSignal(argv[0]); cl::HideUnrelatedOptions(ClangOffloadWrapperCategory); cl::SetVersionPrinter([](raw_ostream &OS) { diff --git a/clang/tools/clang-refactor/ClangRefactor.cpp b/clang/tools/clang-refactor/ClangRefactor.cpp index 2314317b7db2..8b44c7fa6ede 100644 --- a/clang/tools/clang-refactor/ClangRefactor.cpp +++ b/clang/tools/clang-refactor/ClangRefactor.cpp @@ -24,7 +24,6 @@ #include "clang/Tooling/Tooling.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileSystem.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/Signals.h" #include "llvm/Support/raw_ostream.h" #include <string> @@ -609,7 +608,7 @@ class ClangRefactorTool { } // end anonymous namespace int main(int argc, const char **argv) { - llvm::InitLLVM X(argc, argv); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); ClangRefactorTool RefactorTool; diff --git a/clang/utils/TableGen/TableGen.cpp b/clang/utils/TableGen/TableGen.cpp index 3b9c8336bb64..c988a580f298 100644 --- a/clang/utils/TableGen/TableGen.cpp +++ b/clang/utils/TableGen/TableGen.cpp @@ -10,10 +10,9 @@ // //===----------------------------------------------------------------------===// -#include "ClangASTEmitters.h" #include "TableGenBackends.h" // Declares all backends. +#include "ClangASTEmitters.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Signals.h" #include "llvm/TableGen/Error.h" @@ -350,7 +349,8 @@ bool ClangTableGenMain(raw_ostream &OS, RecordKeeper &Records) { } int main(int argc, char **argv) { - llvm::InitLLVM X(argc, argv); + sys::PrintStackTraceOnErrorSignal(argv[0]); + PrettyStackTraceProgram X(argc, argv); cl::ParseCommandLineOptions(argc, argv); llvm_shutdown_obj Y; diff --git a/llvm/utils/KillTheDoctor/KillTheDoctor.cpp b/llvm/utils/KillTheDoctor/KillTheDoctor.cpp index c5501f9688d9..358ef165cf63 100644 --- a/llvm/utils/KillTheDoctor/KillTheDoctor.cpp +++ b/llvm/utils/KillTheDoctor/KillTheDoctor.cpp @@ -36,7 +36,6 @@ #include "llvm/ADT/StringRef.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/Path.h" #include "llvm/Support/PrettyStackTrace.h" @@ -296,7 +295,8 @@ static StringRef ExceptionCodeToString(DWORD ExceptionCode) { int main(int argc, char **argv) { // Print a stack trace if we signal out. - llvm::InitLLVM X(argc, argv); + sys::PrintStackTraceOnErrorSignal(argv[0]); + PrettyStackTraceProgram X(argc, argv); llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. ToolName = argv[0]; diff --git a/llvm/utils/TableGen/TableGen.cpp b/llvm/utils/TableGen/TableGen.cpp index e7f96c26fcce..086560e7b265 100644 --- a/llvm/utils/TableGen/TableGen.cpp +++ b/llvm/utils/TableGen/TableGen.cpp @@ -12,7 +12,6 @@ #include "TableGenBackends.h" // Declares all backends. #include "llvm/Support/CommandLine.h" -#include "llvm/Support/InitLLVM.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Signals.h" @@ -267,7 +266,8 @@ bool LLVMTableGenMain(raw_ostream &OS, RecordKeeper &Records) { } int main(int argc, char **argv) { - llvm::InitLLVM X(argc, argv); + sys::PrintStackTraceOnErrorSignal(argv[0]); + PrettyStackTraceProgram X(argc, argv); cl::ParseCommandLineOptions(argc, argv); llvm_shutdown_obj Y; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
