summaryrefslogtreecommitdiff
path: root/lldb/tools
diff options
context:
space:
mode:
authorserge-sans-paille <sguelton@mozilla.com>2022-12-23 13:25:58 +0100
committerserge-sans-paille <sguelton@mozilla.com>2022-12-23 13:29:21 +0100
commit07d9ab9aa5d272cad99617a1f28cdcfd73d86550 (patch)
treeb2d253d91ae1cf866b5960d3c6b072ff582167fd /lldb/tools
parent22bf4a7e89c07255856366f2710974642e482920 (diff)
downloadllvm-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 'lldb/tools')
-rw-r--r--lldb/tools/driver/Driver.cpp2
-rw-r--r--lldb/tools/lldb-server/lldb-gdbserver.cpp2
-rw-r--r--lldb/tools/lldb-vscode/lldb-vscode.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/lldb/tools/driver/Driver.cpp b/lldb/tools/driver/Driver.cpp
index 76b0d7bf60a5..73152f350395 100644
--- a/lldb/tools/driver/Driver.cpp
+++ b/lldb/tools/driver/Driver.cpp
@@ -59,7 +59,7 @@ enum ID {
#undef OPTION
};
-#define PREFIX(NAME, VALUE) constexpr llvm::StringLiteral NAME[] = VALUE;
+#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
#include "Options.inc"
#undef PREFIX
diff --git a/lldb/tools/lldb-server/lldb-gdbserver.cpp b/lldb/tools/lldb-server/lldb-gdbserver.cpp
index 8565c39efe9b..4dd8a37ef3da 100644
--- a/lldb/tools/lldb-server/lldb-gdbserver.cpp
+++ b/lldb/tools/lldb-server/lldb-gdbserver.cpp
@@ -278,7 +278,7 @@ enum ID {
#undef OPTION
};
-#define PREFIX(NAME, VALUE) constexpr llvm::StringLiteral NAME[] = VALUE;
+#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
#include "LLGSOptions.inc"
#undef PREFIX
diff --git a/lldb/tools/lldb-vscode/lldb-vscode.cpp b/lldb/tools/lldb-vscode/lldb-vscode.cpp
index b2b7ea4e1d82..a80d4a90e39b 100644
--- a/lldb/tools/lldb-vscode/lldb-vscode.cpp
+++ b/lldb/tools/lldb-vscode/lldb-vscode.cpp
@@ -79,7 +79,7 @@ enum ID {
#undef OPTION
};
-#define PREFIX(NAME, VALUE) constexpr llvm::StringLiteral NAME[] = VALUE;
+#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
#include "Options.inc"
#undef PREFIX