Author: rsmith Date: Wed Jun 8 19:53:41 2016 New Revision: 272233 URL: http://llvm.org/viewvc/llvm-project?rev=272233&view=rev Log: Update to match LLVM r272232.
Modified: cfe/trunk/tools/arcmt-test/arcmt-test.cpp cfe/trunk/tools/c-index-test/c-index-test.c cfe/trunk/tools/c-index-test/core_main.cpp cfe/trunk/tools/clang-check/ClangCheck.cpp cfe/trunk/tools/clang-format/ClangFormat.cpp cfe/trunk/tools/driver/cc1_main.cpp cfe/trunk/tools/driver/cc1as_main.cpp cfe/trunk/tools/driver/driver.cpp cfe/trunk/tools/libclang/CIndex.cpp cfe/trunk/utils/TableGen/TableGen.cpp Modified: cfe/trunk/tools/arcmt-test/arcmt-test.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/arcmt-test/arcmt-test.cpp?rev=272233&r1=272232&r2=272233&view=diff ============================================================================== --- cfe/trunk/tools/arcmt-test/arcmt-test.cpp (original) +++ cfe/trunk/tools/arcmt-test/arcmt-test.cpp Wed Jun 8 19:53:41 2016 @@ -341,7 +341,7 @@ static void printSourceRange(CharSourceR int main(int argc, const char **argv) { void *MainAddr = (void*) (intptr_t) GetExecutablePath; - llvm::sys::PrintStackTraceOnErrorSignal(); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); std::string resourcesPath = CompilerInvocation::GetResourcesPath(argv[0], MainAddr); Modified: cfe/trunk/tools/c-index-test/c-index-test.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/c-index-test.c?rev=272233&r1=272232&r2=272233&view=diff ============================================================================== --- cfe/trunk/tools/c-index-test/c-index-test.c (original) +++ cfe/trunk/tools/c-index-test/c-index-test.c Wed Jun 8 19:53:41 2016 @@ -4440,11 +4440,8 @@ int main(int argc, const char **argv) { client_data.argc = argc; client_data.argv = argv; - if (argc > 1 && strcmp(argv[1], "core") == 0) { + if (argc > 1 && strcmp(argv[1], "core") == 0) client_data.main_func = indextest_core_main; - --client_data.argc; - ++client_data.argv; - } if (getenv("CINDEXTEST_NOTHREADS")) return client_data.main_func(client_data.argc, client_data.argv); Modified: cfe/trunk/tools/c-index-test/core_main.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/core_main.cpp?rev=272233&r1=272232&r2=272233&view=diff ============================================================================== --- cfe/trunk/tools/c-index-test/core_main.cpp (original) +++ cfe/trunk/tools/c-index-test/core_main.cpp Wed Jun 8 19:53:41 2016 @@ -196,9 +196,13 @@ static void printSymbolNameAndUSR(const //===----------------------------------------------------------------------===// int indextest_core_main(int argc, const char **argv) { - sys::PrintStackTraceOnErrorSignal(); + sys::PrintStackTraceOnErrorSignal(argv[0]); PrettyStackTraceProgram X(argc, argv); + assert(argv[1] == StringRef("core")); + ++argv; + --argc; + std::vector<const char *> CompArgs; const char **DoubleDash = std::find(argv, argv + argc, StringRef("--")); if (DoubleDash != argv + argc) { Modified: cfe/trunk/tools/clang-check/ClangCheck.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-check/ClangCheck.cpp?rev=272233&r1=272232&r2=272233&view=diff ============================================================================== --- cfe/trunk/tools/clang-check/ClangCheck.cpp (original) +++ cfe/trunk/tools/clang-check/ClangCheck.cpp Wed Jun 8 19:53:41 2016 @@ -150,7 +150,7 @@ public: } // namespace int main(int argc, const char **argv) { - llvm::sys::PrintStackTraceOnErrorSignal(); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); // Initialize targets for clang module support. llvm::InitializeAllTargets(); Modified: cfe/trunk/tools/clang-format/ClangFormat.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format/ClangFormat.cpp?rev=272233&r1=272232&r2=272233&view=diff ============================================================================== --- cfe/trunk/tools/clang-format/ClangFormat.cpp (original) +++ cfe/trunk/tools/clang-format/ClangFormat.cpp Wed Jun 8 19:53:41 2016 @@ -315,7 +315,7 @@ static void PrintVersion() { } int main(int argc, const char **argv) { - llvm::sys::PrintStackTraceOnErrorSignal(); + llvm::sys::PrintStackTraceOnErrorSignal(argv[0]); cl::HideUnrelatedOptions(ClangFormatCategory); Modified: cfe/trunk/tools/driver/cc1_main.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1_main.cpp?rev=272233&r1=272232&r2=272233&view=diff ============================================================================== --- cfe/trunk/tools/driver/cc1_main.cpp (original) +++ cfe/trunk/tools/driver/cc1_main.cpp Wed Jun 8 19:53:41 2016 @@ -132,9 +132,5 @@ int cc1_main(ArrayRef<const char *> Argv return !Success; } - // Managed static deconstruction. Useful for making things like - // -time-passes usable. - llvm::llvm_shutdown(); - return !Success; } Modified: cfe/trunk/tools/driver/cc1as_main.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1as_main.cpp?rev=272233&r1=272232&r2=272233&view=diff ============================================================================== --- cfe/trunk/tools/driver/cc1as_main.cpp (original) +++ cfe/trunk/tools/driver/cc1as_main.cpp Wed Jun 8 19:53:41 2016 @@ -43,10 +43,8 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/FormattedStream.h" #include "llvm/Support/Host.h" -#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" -#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Signals.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/TargetRegistry.h" @@ -450,11 +448,6 @@ static void LLVMErrorHandler(void *UserD } int cc1as_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) { - // Print a stack trace if we signal out. - sys::PrintStackTraceOnErrorSignal(); - PrettyStackTraceProgram X(Argv.size(), Argv.data()); - llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. - // Initialize targets and assembly printers/parsers. InitializeAllTargetInfos(); InitializeAllTargetMCs(); Modified: cfe/trunk/tools/driver/driver.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=272233&r1=272232&r2=272233&view=diff ============================================================================== --- cfe/trunk/tools/driver/driver.cpp (original) +++ cfe/trunk/tools/driver/driver.cpp Wed Jun 8 19:53:41 2016 @@ -308,8 +308,9 @@ static int ExecuteCC1Tool(ArrayRef<const } int main(int argc_, const char **argv_) { - llvm::sys::PrintStackTraceOnErrorSignal(); + llvm::sys::PrintStackTraceOnErrorSignal(argv_[0]); llvm::PrettyStackTraceProgram X(argc_, argv_); + llvm::llvm_shutdown_obj Y; // Call llvm_shutdown() on exit. if (llvm::sys::Process::FixupStandardFileDescriptors()) return 1; @@ -497,8 +498,6 @@ int main(int argc_, const char **argv_) // results now. This happens in -disable-free mode. llvm::TimerGroup::printAll(llvm::errs()); - llvm::llvm_shutdown(); - #ifdef LLVM_ON_WIN32 // Exit status should not be negative on Win32, unless abnormal termination. // Once abnormal termiation was caught, negative status should not be Modified: cfe/trunk/tools/libclang/CIndex.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=272233&r1=272232&r2=272233&view=diff ============================================================================== --- cfe/trunk/tools/libclang/CIndex.cpp (original) +++ cfe/trunk/tools/libclang/CIndex.cpp Wed Jun 8 19:53:41 2016 @@ -5870,7 +5870,8 @@ CXSourceRange clang_getCursorReferenceNa } void clang_enableStackTraces(void) { - llvm::sys::PrintStackTraceOnErrorSignal(); + // FIXME: Provide an argv0 here so we can find llvm-symbolizer. + llvm::sys::PrintStackTraceOnErrorSignal(StringRef()); } void clang_executeOnThread(void (*fn)(void*), void *user_data, Modified: cfe/trunk/utils/TableGen/TableGen.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/TableGen/TableGen.cpp?rev=272233&r1=272232&r2=272233&view=diff ============================================================================== --- cfe/trunk/utils/TableGen/TableGen.cpp (original) +++ cfe/trunk/utils/TableGen/TableGen.cpp Wed Jun 8 19:53:41 2016 @@ -241,7 +241,7 @@ bool ClangTableGenMain(raw_ostream &OS, } int main(int argc, char **argv) { - sys::PrintStackTraceOnErrorSignal(); + sys::PrintStackTraceOnErrorSignal(argv[0]); PrettyStackTraceProgram X(argc, argv); cl::ParseCommandLineOptions(argc, argv); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits