From 07d9ab9aa5d272cad99617a1f28cdcfd73d86550 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Fri, 23 Dec 2022 13:25:58 +0100 Subject: Revert "[clang] Use a StringRef instead of a raw char pointer to store builtin and call information" There are still remaining issues with GCC 12, see for instance https://lab.llvm.org/buildbot/#/builders/93/builds/12669 This reverts commit 5ce4e92264102de21760c94db9166afe8f71fcf6. --- llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp') diff --git a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp index 74a20a4..7f06ed0 100644 --- a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp +++ b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp @@ -41,12 +41,11 @@ enum { #undef OPTION }; -#define PREFIX(NAME, VALUE) \ - static constexpr std::initializer_list NAME = VALUE; +#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE; #include "Options.inc" #undef PREFIX -static constexpr std::initializer_list InfoTable = { +static constexpr opt::OptTable::Info InfoTable[] = { #define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X7, X8, X9, X10, X11, X12) \ {X1, X2, X10, X11, OPT_##ID, opt::Option::KIND##Class, \ X9, X8, OPT_##GROUP, OPT_##ALIAS, X7, X12}, -- cgit v1.1