diff options
author | serge-sans-paille <sguelton@mozilla.com> | 2022-12-23 13:25:58 +0100 |
---|---|---|
committer | serge-sans-paille <sguelton@mozilla.com> | 2022-12-23 13:29:21 +0100 |
commit | 07d9ab9aa5d272cad99617a1f28cdcfd73d86550 (patch) | |
tree | b2d253d91ae1cf866b5960d3c6b072ff582167fd /lld/COFF | |
parent | 22bf4a7e89c07255856366f2710974642e482920 (diff) | |
download | llvm-07d9ab9aa5d272cad99617a1f28cdcfd73d86550.tar.gz |
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.
Diffstat (limited to 'lld/COFF')
-rw-r--r-- | lld/COFF/DriverUtils.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp index 9a8d88c38c37..26802f8beeb0 100644 --- a/lld/COFF/DriverUtils.cpp +++ b/lld/COFF/DriverUtils.cpp @@ -772,13 +772,12 @@ MemoryBufferRef convertResToCOFF(ArrayRef<MemoryBufferRef> mbs, // Create OptTable // Create prefix string literals used in Options.td -#define PREFIX(NAME, VALUE) \ - static constexpr std::initializer_list<llvm::StringLiteral> NAME = VALUE; +#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE; #include "Options.inc" #undef PREFIX // Create table mapping all options defined in Options.td -static constexpr std::initializer_list<llvm::opt::OptTable::Info> infoTable = { +static constexpr llvm::opt::OptTable::Info infoTable[] = { #define OPTION(X1, X2, ID, KIND, GROUP, ALIAS, X7, X8, X9, X10, X11, X12) \ {X1, X2, X10, X11, OPT_##ID, llvm::opt::Option::KIND##Class, \ X9, X8, OPT_##GROUP, OPT_##ALIAS, X7, X12}, |