From 0099133e00f710c8b5079bb36c17a6196ce62bde Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Thu, 19 Sep 2024 14:37:13 -0700 Subject: [PATCH] Emit a types log instead of an lldbassert() in SwiftDWARFImporterDelegate --- .../Swift/SwiftDWARFImporterForClangTypes.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lldb/source/Plugins/TypeSystem/Swift/SwiftDWARFImporterForClangTypes.cpp b/lldb/source/Plugins/TypeSystem/Swift/SwiftDWARFImporterForClangTypes.cpp index 8576d3e2c4589..eff472a836f0b 100644 --- a/lldb/source/Plugins/TypeSystem/Swift/SwiftDWARFImporterForClangTypes.cpp +++ b/lldb/source/Plugins/TypeSystem/Swift/SwiftDWARFImporterForClangTypes.cpp @@ -176,12 +176,14 @@ SwiftDWARFImporterDelegate::SwiftDWARFImporterDelegate(SwiftASTContext &ts) void SwiftDWARFImporterDelegate::lookupValue( StringRef name, std::optional kind, StringRef inModule, llvm::SmallVectorImpl &results) { - bool suspicious = !name.size() || name[0] > 128; - lldbassert(!suspicious && "SwiftDWARFImporterDelegate asked to look up bogus type name"); - if (suspicious) - return; LLDB_LOG(GetLog(LLDBLog::Types), "{0}::lookupValue(\"{1}\")", m_description, name.str()); + if (!name.size() || name[0] < 0) { + LLDB_LOG(GetLog(LLDBLog::Types), + "SwiftDWARFImporterDelegate was asked to look up a type with a " + "non-ASCII or empty type name"); + return; + } auto clang_importer = m_swift_ast_ctx.GetClangImporter(); if (!clang_importer) { LLDB_LOG(GetLog(LLDBLog::Types), "no clangimporter");