diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp @@ -69,9 +69,17 @@ static bool isStdTemplate(ConstString type_name, llvm::StringRef type) { llvm::StringRef name = type_name.GetStringRef(); - // The type name may or may not be prefixed with `std::` or `std::__1::`. - if (name.consume_front("std::")) - name.consume_front("__1::"); + // The type name may be prefixed with `std::::`. + if (name.consume_front("std::")) { + // Delete past the inline namespace: [a-zA-Z0-9_]+:: + auto ident_end = + name.find_if_not([](char c) { return std::isalnum(c) || c == '_'; }); + if (ident_end != llvm::StringRef::npos && ident_end >= 1) { + auto temp = name.drop_front(ident_end); + if (temp.consume_front("::")) + name = temp; + } + } return name.consume_front(type) && name.startswith("<"); }