Skip to content

Commit 6f77320

Browse files
niconico
committed
Revert "Use InitLLVM to setup a pretty stack printer"
This reverts commit 3f76260. Breaks at least these tests on Windows: Clang :: Driver/clang-offload-bundler.c Clang :: Driver/clang-offload-wrapper.c
1 parent 3f76260 commit 6f77320

File tree

19 files changed

+27
-41
lines changed

19 files changed

+27
-41
lines changed

‎clang-tools-extra/clang-change-namespace/tool/ClangChangeNamespace.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "clang/Tooling/Refactoring.h"
3838
#include "clang/Tooling/Tooling.h"
3939
#include "llvm/Support/CommandLine.h"
40-
#include "llvm/Support/InitLLVM.h"
4140
#include "llvm/Support/Signals.h"
4241
#include "llvm/Support/YAMLTraits.h"
4342

@@ -99,7 +98,7 @@ llvm::ErrorOr<std::vector<std::string>> GetWhiteListedSymbolPatterns() {
9998
} // anonymous namespace
10099

101100
int main(int argc, const char **argv) {
102-
llvm::InitLLVM X(argc, argv);
101+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
103102
tooling::CommonOptionsParser OptionsParser(argc, argv,
104103
ChangeNamespaceCategory);
105104
const auto &Files = OptionsParser.getSourcePathList();

‎clang-tools-extra/clang-doc/tool/ClangDocMain.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "llvm/Support/CommandLine.h"
3737
#include "llvm/Support/Error.h"
3838
#include "llvm/Support/FileSystem.h"
39-
#include "llvm/Support/InitLLVM.h"
4039
#include "llvm/Support/Mutex.h"
4140
#include "llvm/Support/Path.h"
4241
#include "llvm/Support/Process.h"
@@ -180,7 +179,7 @@ llvm::Expected<llvm::SmallString<128>> getInfoOutputFile(StringRef Root,
180179
}
181180

182181
int main(int argc, const char **argv) {
183-
llvm::InitLLVM X(argc, argv);
182+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
184183
std::error_code OK;
185184

186185
ExecutorName.setInitialValue("all-TUs");

‎clang-tools-extra/clang-move/tool/ClangMove.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "clang/Tooling/Tooling.h"
1616
#include "llvm/ADT/StringRef.h"
1717
#include "llvm/Support/CommandLine.h"
18-
#include "llvm/Support/InitLLVM.h"
1918
#include "llvm/Support/Path.h"
2019
#include "llvm/Support/Process.h"
2120
#include "llvm/Support/Signals.h"
@@ -95,7 +94,7 @@ cl::opt<bool> DumpDecls(
9594
} // namespace
9695

9796
int main(int argc, const char **argv) {
98-
llvm::InitLLVM X(argc, argv);
97+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
9998
tooling::CommonOptionsParser OptionsParser(argc, argv, ClangMoveCategory);
10099

101100
if (OldDependOnNew && NewDependOnOld) {

‎clang-tools-extra/clang-query/tool/ClangQuery.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "clang/Tooling/Tooling.h"
3434
#include "llvm/LineEditor/LineEditor.h"
3535
#include "llvm/Support/CommandLine.h"
36-
#include "llvm/Support/InitLLVM.h"
3736
#include "llvm/Support/MemoryBuffer.h"
3837
#include "llvm/Support/Signals.h"
3938
#include <fstream>
@@ -82,7 +81,7 @@ bool runCommandsInFile(const char *ExeName, std::string const &FileName,
8281
}
8382

8483
int main(int argc, const char **argv) {
85-
llvm::InitLLVM X(argc, argv);
84+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
8685

8786
CommonOptionsParser OptionsParser(argc, argv, ClangQueryCategory);
8887

‎clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "../ClangTidyForceLinker.h"
1919
#include "../GlobList.h"
2020
#include "clang/Tooling/CommonOptionsParser.h"
21-
#include "llvm/Support/InitLLVM.h"
2221
#include "llvm/Support/Process.h"
2322
#include "llvm/Support/Signals.h"
2423
#include "llvm/Support/TargetSelect.h"
@@ -328,7 +327,7 @@ getVfsFromFile(const std::string &OverlayFile,
328327
}
329328

330329
static int clangTidyMain(int argc, const char **argv) {
331-
llvm::InitLLVM X(argc, argv);
330+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
332331
CommonOptionsParser OptionsParser(argc, argv, ClangTidyCategory,
333332
cl::ZeroOrMore);
334333
llvm::IntrusiveRefCntPtr<vfs::OverlayFileSystem> BaseFS(

‎clang-tools-extra/clangd/index/dex/dexp/Dexp.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "llvm/ADT/StringSwitch.h"
2020
#include "llvm/LineEditor/LineEditor.h"
2121
#include "llvm/Support/CommandLine.h"
22-
#include "llvm/Support/InitLLVM.h"
2322
#include "llvm/Support/Signals.h"
2423

2524
namespace clang {
@@ -276,9 +275,9 @@ std::unique_ptr<SymbolIndex> openIndex(llvm::StringRef Index) {
276275
int main(int argc, const char *argv[]) {
277276
using namespace clang::clangd;
278277

279-
llvm::InitLLVM X(argc, argv);
280278
llvm::cl::ParseCommandLineOptions(argc, argv, Overview);
281279
llvm::cl::ResetCommandLineParser(); // We reuse it for REPL commands.
280+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
282281

283282
std::unique_ptr<SymbolIndex> Index;
284283
reportTime("Dex build", [&]() {

‎clang-tools-extra/clangd/indexer/IndexerMain.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "clang/Tooling/Execution.h"
2222
#include "clang/Tooling/Tooling.h"
2323
#include "llvm/Support/CommandLine.h"
24-
#include "llvm/Support/InitLLVM.h"
2524
#include "llvm/Support/Signals.h"
2625

2726
namespace clang {
@@ -93,7 +92,7 @@ class IndexActionFactory : public tooling::FrontendActionFactory {
9392
} // namespace clang
9493

9594
int main(int argc, const char **argv) {
96-
llvm::InitLLVM X(argc, argv);
95+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
9796

9897
const char *Overview = R"(
9998
Creates an index of symbol information etc in a whole project.

‎clang-tools-extra/clangd/tool/ClangdMain.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "llvm/ADT/StringRef.h"
2222
#include "llvm/Support/CommandLine.h"
2323
#include "llvm/Support/FileSystem.h"
24-
#include "llvm/Support/InitLLVM.h"
2524
#include "llvm/Support/Path.h"
2625
#include "llvm/Support/Process.h"
2726
#include "llvm/Support/Program.h"
@@ -434,8 +433,8 @@ int main(int argc, char *argv[]) {
434433
using namespace clang;
435434
using namespace clang::clangd;
436435

437-
llvm::InitLLVM X(argc, argv);
438436
llvm::InitializeAllTargetInfos();
437+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
439438
llvm::cl::SetVersionPrinter([](llvm::raw_ostream &OS) {
440439
OS << clang::getClangToolFullVersion("clangd") << "\n";
441440
});

‎clang-tools-extra/tool-template/ToolTemplate.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#include "clang/Tooling/Refactoring/AtomicChange.h"
4545
#include "clang/Tooling/Tooling.h"
4646
#include "llvm/Support/CommandLine.h"
47-
#include "llvm/Support/InitLLVM.h"
4847
#include "llvm/Support/MemoryBuffer.h"
4948
#include "llvm/Support/Signals.h"
5049

@@ -89,7 +88,7 @@ static cl::extrahelp CommonHelp(CommonOptionsParser::HelpMessage);
8988
static cl::OptionCategory ToolTemplateCategory("tool-template options");
9089

9190
int main(int argc, const char **argv) {
92-
llvm::InitLLVM X(argc, argv);
91+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
9392

9493
auto Executor = clang::tooling::createExecutorFromCommandLineArgs(
9594
argc, argv, ToolTemplateCategory);

‎clang/tools/arcmt-test/arcmt-test.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "clang/Lex/Preprocessor.h"
1616
#include "clang/Lex/PreprocessorOptions.h"
1717
#include "llvm/Support/FileSystem.h"
18-
#include "llvm/Support/InitLLVM.h"
1918
#include "llvm/Support/MemoryBuffer.h"
2019
#include "llvm/Support/Path.h"
2120
#include "llvm/Support/Signals.h"
@@ -341,8 +340,8 @@ static void printSourceRange(CharSourceRange range, ASTContext &Ctx,
341340
//===----------------------------------------------------------------------===//
342341

343342
int main(int argc, const char **argv) {
344-
llvm::InitLLVM X(argc, argv);
345343
void *MainAddr = (void*) (intptr_t) GetExecutablePath;
344+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
346345

347346
std::string
348347
resourcesPath = CompilerInvocation::GetResourcesPath(argv[0], MainAddr);

‎clang/tools/c-index-test/core_main.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@
1313
#include "clang/Frontend/CompilerInstance.h"
1414
#include "clang/Frontend/CompilerInvocation.h"
1515
#include "clang/Frontend/FrontendAction.h"
16-
#include "clang/Index/IndexDataConsumer.h"
1716
#include "clang/Index/IndexingAction.h"
17+
#include "clang/Index/IndexDataConsumer.h"
1818
#include "clang/Index/USRGeneration.h"
1919
#include "clang/Lex/Preprocessor.h"
2020
#include "clang/Serialization/ASTReader.h"
2121
#include "llvm/Support/CommandLine.h"
2222
#include "llvm/Support/FileSystem.h"
23-
#include "llvm/Support/InitLLVM.h"
24-
#include "llvm/Support/PrettyStackTrace.h"
2523
#include "llvm/Support/Signals.h"
2624
#include "llvm/Support/raw_ostream.h"
25+
#include "llvm/Support/PrettyStackTrace.h"
2726

2827
using namespace clang;
2928
using namespace clang::index;
@@ -321,7 +320,8 @@ static void printSymbolNameAndUSR(const clang::Module *Mod, raw_ostream &OS) {
321320
//===----------------------------------------------------------------------===//
322321

323322
int indextest_core_main(int argc, const char **argv) {
324-
llvm::InitLLVM X(argc, argv);
323+
sys::PrintStackTraceOnErrorSignal(argv[0]);
324+
PrettyStackTraceProgram X(argc, argv);
325325
void *MainAddr = (void*) (intptr_t) indextest_core_main;
326326
std::string Executable = llvm::sys::fs::getMainExecutable(argv[0], MainAddr);
327327

‎clang/tools/clang-check/ClangCheck.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "clang/Tooling/Tooling.h"
2828
#include "llvm/ADT/STLExtras.h"
2929
#include "llvm/Option/OptTable.h"
30-
#include "llvm/Support/InitLLVM.h"
3130
#include "llvm/Support/Path.h"
3231
#include "llvm/Support/Signals.h"
3332
#include "llvm/Support/TargetSelect.h"
@@ -152,7 +151,7 @@ class ClangCheckActionFactory {
152151
} // namespace
153152

154153
int main(int argc, const char **argv) {
155-
llvm::InitLLVM X(argc, argv);
154+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
156155

157156
// Initialize targets for clang module support.
158157
llvm::InitializeAllTargets();

‎clang/tools/clang-extdef-mapping/ClangExtDefMapGen.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "clang/Tooling/CommonOptionsParser.h"
2121
#include "clang/Tooling/Tooling.h"
2222
#include "llvm/Support/CommandLine.h"
23-
#include "llvm/Support/InitLLVM.h"
2423
#include "llvm/Support/Signals.h"
2524
#include <sstream>
2625
#include <string>
@@ -114,7 +113,8 @@ static cl::extrahelp CommonHelp(CommonOptionsParser::HelpMessage);
114113

115114
int main(int argc, const char **argv) {
116115
// Print a stack trace if we signal out.
117-
llvm::InitLLVM X(argc, argv);
116+
sys::PrintStackTraceOnErrorSignal(argv[0], false);
117+
PrettyStackTraceProgram X(argc, argv);
118118

119119
const char *Overview = "\nThis tool collects the USR name and location "
120120
"of external definitions in the source files "

‎clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "llvm/Support/Error.h"
3131
#include "llvm/Support/ErrorOr.h"
3232
#include "llvm/Support/FileSystem.h"
33-
#include "llvm/Support/InitLLVM.h"
3433
#include "llvm/Support/MemoryBuffer.h"
3534
#include "llvm/Support/Path.h"
3635
#include "llvm/Support/Program.h"
@@ -817,7 +816,7 @@ static void PrintVersion(raw_ostream &OS) {
817816
}
818817

819818
int main(int argc, const char **argv) {
820-
llvm::InitLLVM X(argc, argv);
819+
sys::PrintStackTraceOnErrorSignal(argv[0]);
821820

822821
cl::HideUnrelatedOptions(ClangOffloadBundlerCategory);
823822
cl::SetVersionPrinter(PrintVersion);

‎clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "llvm/Support/Errc.h"
2828
#include "llvm/Support/Error.h"
2929
#include "llvm/Support/ErrorOr.h"
30-
#include "llvm/Support/InitLLVM.h"
3130
#include "llvm/Support/MemoryBuffer.h"
3231
#include "llvm/Support/Signals.h"
3332
#include "llvm/Support/ToolOutputFile.h"
@@ -304,7 +303,7 @@ class BinaryWrapper {
304303
} // anonymous namespace
305304

306305
int main(int argc, const char **argv) {
307-
llvm::InitLLVM X(argc, argv);
306+
sys::PrintStackTraceOnErrorSignal(argv[0]);
308307

309308
cl::HideUnrelatedOptions(ClangOffloadWrapperCategory);
310309
cl::SetVersionPrinter([](raw_ostream &OS) {

‎clang/tools/clang-refactor/ClangRefactor.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "clang/Tooling/Tooling.h"
2525
#include "llvm/Support/CommandLine.h"
2626
#include "llvm/Support/FileSystem.h"
27-
#include "llvm/Support/InitLLVM.h"
2827
#include "llvm/Support/Signals.h"
2928
#include "llvm/Support/raw_ostream.h"
3029
#include <string>
@@ -609,7 +608,7 @@ class ClangRefactorTool {
609608
} // end anonymous namespace
610609

611610
int main(int argc, const char **argv) {
612-
llvm::InitLLVM X(argc, argv);
611+
llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
613612

614613
ClangRefactorTool RefactorTool;
615614

‎clang/utils/TableGen/TableGen.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#include "ClangASTEmitters.h"
1413
#include "TableGenBackends.h" // Declares all backends.
14+
#include "ClangASTEmitters.h"
1515
#include "llvm/Support/CommandLine.h"
16-
#include "llvm/Support/InitLLVM.h"
1716
#include "llvm/Support/PrettyStackTrace.h"
1817
#include "llvm/Support/Signals.h"
1918
#include "llvm/TableGen/Error.h"
@@ -350,7 +349,8 @@ bool ClangTableGenMain(raw_ostream &OS, RecordKeeper &Records) {
350349
}
351350

352351
int main(int argc, char **argv) {
353-
llvm::InitLLVM X(argc, argv);
352+
sys::PrintStackTraceOnErrorSignal(argv[0]);
353+
PrettyStackTraceProgram X(argc, argv);
354354
cl::ParseCommandLineOptions(argc, argv);
355355

356356
llvm_shutdown_obj Y;

‎llvm/utils/KillTheDoctor/KillTheDoctor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "llvm/ADT/StringRef.h"
3737
#include "llvm/ADT/Twine.h"
3838
#include "llvm/Support/CommandLine.h"
39-
#include "llvm/Support/InitLLVM.h"
4039
#include "llvm/Support/ManagedStatic.h"
4140
#include "llvm/Support/Path.h"
4241
#include "llvm/Support/PrettyStackTrace.h"
@@ -296,7 +295,8 @@ static StringRef ExceptionCodeToString(DWORD ExceptionCode) {
296295

297296
int main(int argc, char **argv) {
298297
// Print a stack trace if we signal out.
299-
llvm::InitLLVM X(argc, argv);
298+
sys::PrintStackTraceOnErrorSignal(argv[0]);
299+
PrettyStackTraceProgram X(argc, argv);
300300
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
301301

302302
ToolName = argv[0];

‎llvm/utils/TableGen/TableGen.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include "TableGenBackends.h" // Declares all backends.
1414
#include "llvm/Support/CommandLine.h"
15-
#include "llvm/Support/InitLLVM.h"
1615
#include "llvm/Support/ManagedStatic.h"
1716
#include "llvm/Support/PrettyStackTrace.h"
1817
#include "llvm/Support/Signals.h"
@@ -267,7 +266,8 @@ bool LLVMTableGenMain(raw_ostream &OS, RecordKeeper &Records) {
267266
}
268267

269268
int main(int argc, char **argv) {
270-
llvm::InitLLVM X(argc, argv);
269+
sys::PrintStackTraceOnErrorSignal(argv[0]);
270+
PrettyStackTraceProgram X(argc, argv);
271271
cl::ParseCommandLineOptions(argc, argv);
272272

273273
llvm_shutdown_obj Y;

0 commit comments

Comments
 (0)