Skip to content

Commit 0fd7b5b

Browse files
committed
fixup! assert valid basename
1 parent dcbaa3b commit 0fd7b5b

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

lldb/unittests/Core/MangledTest.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,14 @@ TEST_P(DemanglingInfoCorrectnessTestFixutre, Correctness) {
634634

635635
TrackingOutputBuffer OB;
636636
Root->print(OB);
637+
638+
// Filter out cases which would never show up in frames. We only care about function names.
639+
if (Root->getKind() != llvm::itanium_demangle::Node::Kind::KFunctionEncoding
640+
&& Root->getKind() != llvm::itanium_demangle::Node::Kind::KDotSuffix)
641+
return;
642+
643+
ASSERT_TRUE(OB.NameInfo.hasBasename());
644+
637645
auto tracked_name = llvm::StringRef(OB);
638646

639647
auto return_left = tracked_name.slice(0, OB.NameInfo.ScopeRange.first);
@@ -656,10 +664,7 @@ TEST_P(DemanglingInfoCorrectnessTestFixutre, Correctness) {
656664
llvm::join_items("", return_left, scope, basename, template_args, args,
657665
return_right, qualifiers, suffix);
658666

659-
// Special vtable names aren't tracked but won't show up in frames anyway.
660-
if (Root->getKind() != llvm::itanium_demangle::Node::Kind::KSpecialName ||
661-
!llvm::StringRef(mangled).starts_with("_ZTV"))
662-
EXPECT_EQ(reconstructed_name, demangled);
667+
EXPECT_EQ(reconstructed_name, demangled);
663668
}
664669

665670
INSTANTIATE_TEST_SUITE_P(

0 commit comments

Comments
 (0)