From 42f588f39c5ce6f521e3709b8871d1fdd076292f Mon Sep 17 00:00:00 2001 From: Mehdi Amini Date: Thu, 15 Jul 2021 23:52:44 +0000 Subject: Use ManagedStatic and lazy initialization of cl::opt in libSupport to make it free of global initializer We can build it with -Werror=global-constructors now. This helps in situation where libSupport is embedded as a shared library, potential with dlopen/dlclose scenario, and when command-line parsing or other facilities may not be involved. Avoiding the implicit construction of these cl::opt can avoid double-registration issues and other kind of behavior. Reviewed By: lattner, jpienaar Differential Revision: https://reviews.llvm.org/D105959 --- llvm/lib/Support/GraphWriter.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Support/GraphWriter.cpp') diff --git a/llvm/lib/Support/GraphWriter.cpp b/llvm/lib/Support/GraphWriter.cpp index f47a52a..240f597 100644 --- a/llvm/lib/Support/GraphWriter.cpp +++ b/llvm/lib/Support/GraphWriter.cpp @@ -11,6 +11,9 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/GraphWriter.h" + +#include "DebugOptions.h" + #include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" @@ -29,8 +32,21 @@ using namespace llvm; -static cl::opt ViewBackground("view-background", cl::Hidden, - cl::desc("Execute graph viewer in the background. Creates tmp file litter.")); +#ifdef __APPLE__ +namespace { +struct CreateViewBackground { + static void *call() { + return new cl::opt("view-background", cl::Hidden, + cl::desc("Execute graph viewer in the background. " + "Creates tmp file litter.")); + } +}; +} // namespace +static ManagedStatic, CreateViewBackground> ViewBackground; +void llvm::initGraphWriterOptions() { *ViewBackground; } +#else +void llvm::initGraphWriterOptions() {} +#endif std::string llvm::DOT::EscapeString(const std::string &Label) { std::string Str(Label); -- cgit v1.1