Skip to content

Commit 856e452

Browse files
committed
fixup! assert valid basename
1 parent fc35758 commit 856e452

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
@@ -637,6 +637,14 @@ TEST_P(DemanglingInfoCorrectnessTestFixutre, Correctness) {
637637

638638
TrackingOutputBuffer OB;
639639
Root->print(OB);
640+
641+
// Filter out cases which would never show up in frames. We only care about function names.
642+
if (Root->getKind() != llvm::itanium_demangle::Node::Kind::KFunctionEncoding
643+
&& Root->getKind() != llvm::itanium_demangle::Node::Kind::KDotSuffix)
644+
return;
645+
646+
ASSERT_TRUE(OB.NameInfo.hasBasename());
647+
640648
auto tracked_name = llvm::StringRef(OB);
641649

642650
auto return_left = tracked_name.slice(0, OB.NameInfo.ScopeRange.first);
@@ -659,10 +667,7 @@ TEST_P(DemanglingInfoCorrectnessTestFixutre, Correctness) {
659667
llvm::join_items("", return_left, scope, basename, template_args, args,
660668
return_right, qualifiers, suffix);
661669

662-
// Special vtable names aren't tracked but won't show up in frames anyway.
663-
if (Root->getKind() != llvm::itanium_demangle::Node::Kind::KSpecialName ||
664-
!llvm::StringRef(mangled).starts_with("_ZTV"))
665-
EXPECT_EQ(reconstructed_name, demangled);
670+
EXPECT_EQ(reconstructed_name, demangled);
666671
}
667672

668673
INSTANTIATE_TEST_SUITE_P(

0 commit comments

Comments
 (0)