https://github.com/hjyamauchi created
https://github.com/llvm/llvm-project/pull/84362
MSVC fails when there is ambiguity (multiple options) around implicit type
conversion operators.
Make ConstString's conversion operator to string_view explicit to avoid
ambiguity with one to StringRef and remove an unused local variable that MSVC
also fails on.
>From 34a0f3745913d4ade74ffe4f0d508aaf861fe948 Mon Sep 17 00:00:00 2001
From: Hiroshi Yamauchi <hjyamau...@gmail.com>
Date: Thu, 7 Mar 2024 11:04:47 -0800
Subject: [PATCH] Fix MSVC build issues
MSVC fails when there is ambiguity (multiple options) around implicit
type conversion operators.
Make ConstString's conversion operator to string_view explicit to
avoid ambiguity with one to StringRef and remove an unused local
variable that MSVC also fails on.
---
lldb/include/lldb/Utility/ConstString.h | 4 ++--
lldb/source/Core/Mangled.cpp | 12 +++++++-----
lldb/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp | 1 -
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/lldb/include/lldb/Utility/ConstString.h
b/lldb/include/lldb/Utility/ConstString.h
index 470a554ca04869..f7f7ec7605eba4 100644
--- a/lldb/include/lldb/Utility/ConstString.h
+++ b/lldb/include/lldb/Utility/ConstString.h
@@ -168,8 +168,8 @@ class ConstString {
// Implicitly convert \class ConstString instances to \class StringRef.
operator llvm::StringRef() const { return GetStringRef(); }
- // Implicitly convert \class ConstString instances to \class
std::string_view.
- operator std::string_view() const {
+ // Explicitly convert \class ConstString instances to \class
std::string_view.
+ explicit operator std::string_view() const {
return std::string_view(m_string, GetLength());
}
diff --git a/lldb/source/Core/Mangled.cpp b/lldb/source/Core/Mangled.cpp
index 23ae3913093faf..b167c51fdce247 100644
--- a/lldb/source/Core/Mangled.cpp
+++ b/lldb/source/Core/Mangled.cpp
@@ -125,7 +125,7 @@ void Mangled::SetValue(ConstString name) {
}
// Local helpers for different demangling implementations.
-static char *GetMSVCDemangledStr(std::string_view M) {
+static char *GetMSVCDemangledStr(llvm::StringRef M) {
char *demangled_cstr = llvm::microsoftDemangle(
M, nullptr, nullptr,
llvm::MSDemangleFlags(
@@ -169,27 +169,29 @@ static char *GetItaniumDemangledStr(const char *M) {
return demangled_cstr;
}
-static char *GetRustV0DemangledStr(std::string_view M) {
+static char *GetRustV0DemangledStr(llvm::StringRef M) {
char *demangled_cstr = llvm::rustDemangle(M);
if (Log *log = GetLog(LLDBLog::Demangle)) {
if (demangled_cstr && demangled_cstr[0])
LLDB_LOG(log, "demangled rustv0: {0} -> \"{1}\"", M, demangled_cstr);
else
- LLDB_LOG(log, "demangled rustv0: {0} -> error: failed to demangle", M);
+ LLDB_LOG(log, "demangled rustv0: {0} -> error: failed to demangle",
+ static_cast<std::string_view>(M));
}
return demangled_cstr;
}
-static char *GetDLangDemangledStr(std::string_view M) {
+static char *GetDLangDemangledStr(llvm::StringRef M) {
char *demangled_cstr = llvm::dlangDemangle(M);
if (Log *log = GetLog(LLDBLog::Demangle)) {
if (demangled_cstr && demangled_cstr[0])
LLDB_LOG(log, "demangled dlang: {0} -> \"{1}\"", M, demangled_cstr);
else
- LLDB_LOG(log, "demangled dlang: {0} -> error: failed to demangle", M);
+ LLDB_LOG(log, "demangled dlang: {0} -> error: failed to demangle",
+ static_cast<std::string_view>(M));
}
return demangled_cstr;
diff --git a/lldb/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp
b/lldb/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp
index 6a2ea8c4a41b1c..f237dd63ab1cce 100644
--- a/lldb/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp
+++ b/lldb/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp
@@ -527,7 +527,6 @@ TEST_F(SymbolFilePDBTests, TestTypedefs) {
SymbolFilePDB *symfile =
static_cast<SymbolFilePDB *>(module->GetSymbolFile());
llvm::pdb::IPDBSession &session = symfile->GetPDBSession();
- TypeMap results;
const char *TypedefsToCheck[] = {"ClassTypedef", "NSClassTypedef",
"FuncPointerTypedef",
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
