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/tools/llvm-strings/llvm-strings.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'llvm/tools/llvm-strings/llvm-strings.cpp') diff --git a/llvm/tools/llvm-strings/llvm-strings.cpp b/llvm/tools/llvm-strings/llvm-strings.cpp index afaa00b..918ca5f 100644 --- a/llvm/tools/llvm-strings/llvm-strings.cpp +++ b/llvm/tools/llvm-strings/llvm-strings.cpp @@ -39,12 +39,11 @@ enum ID { #undef OPTION }; -#define PREFIX(NAME, VALUE) \ - static constexpr std::initializer_list NAME = VALUE; +#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE; #include "Opts.inc" #undef PREFIX -static constexpr std::initializer_list InfoTable = { +static constexpr opt::OptTable::Info InfoTable[] = { #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \ HELPTEXT, METAVAR, VALUES) \ { \ -- cgit v1.1