jgorbe created this revision.
jgorbe added a project: LLDB.
Herald added a subscriber: JDevlieghere.
Herald added a project: All.
jgorbe requested review of this revision.
When adding a new synthetic child provider, we check for an existing
conflicting filter in the same category (and vice versa). This is done
by trying to match the new type name against registered formatters.
However, the new type name we're registered can also be a regex
(`type synth add -x`), and in this case the conflict check is just
wrong: it will try to match the new regex as if it was a type name,
against previously registered regexes.
See https://github.com/llvm/llvm-project/issues/57947 for a longer
explanation with concrete examples of incorrect behavior.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D134570
Files:
lldb/source/Commands/CommandObjectType.cpp
Index: lldb/source/Commands/CommandObjectType.cpp
===================================================================
--- lldb/source/Commands/CommandObjectType.cpp
+++ lldb/source/Commands/CommandObjectType.cpp
@@ -2335,12 +2335,17 @@
type = eRegexSynth;
}
- if (category->AnyMatches(type_name, eFormatCategoryItemFilter, false)) {
- if (error)
- error->SetErrorStringWithFormat("cannot add synthetic for type %s when "
- "filter is defined in same category!",
- type_name.AsCString());
- return false;
+ // Only check for conflicting filters in the same category if `type_name` is
+ // an actual type name. Matching a regex string against registered regexes
+ // doesn't work.
+ if (type == eRegularSynth) {
+ if (category->AnyMatches(type_name, eFormatCategoryItemFilter, false)) {
+ if (error)
+ error->SetErrorStringWithFormat("cannot add synthetic for type %s when
"
+ "filter is defined in same category!",
+ type_name.AsCString());
+ return false;
+ }
}
if (type == eRegexSynth) {
@@ -2458,13 +2463,18 @@
type = eRegexFilter;
}
- if (category->AnyMatches(type_name, eFormatCategoryItemSynth, false)) {
- if (error)
- error->SetErrorStringWithFormat("cannot add filter for type %s when "
- "synthetic is defined in same "
- "category!",
- type_name.AsCString());
- return false;
+ // Only check for conflicting synthetic child providers in the same
category
+ // if `type_name` is an actual type name. Matching a regex string against
+ // registered regexes doesn't work.
+ if (type == eRegularFilter) {
+ if (category->AnyMatches(type_name, eFormatCategoryItemSynth, false)) {
+ if (error)
+ error->SetErrorStringWithFormat("cannot add filter for type %s when "
+ "synthetic is defined in same "
+ "category!",
+ type_name.AsCString());
+ return false;
+ }
}
if (type == eRegexFilter) {
Index: lldb/source/Commands/CommandObjectType.cpp
===================================================================
--- lldb/source/Commands/CommandObjectType.cpp
+++ lldb/source/Commands/CommandObjectType.cpp
@@ -2335,12 +2335,17 @@
type = eRegexSynth;
}
- if (category->AnyMatches(type_name, eFormatCategoryItemFilter, false)) {
- if (error)
- error->SetErrorStringWithFormat("cannot add synthetic for type %s when "
- "filter is defined in same category!",
- type_name.AsCString());
- return false;
+ // Only check for conflicting filters in the same category if `type_name` is
+ // an actual type name. Matching a regex string against registered regexes
+ // doesn't work.
+ if (type == eRegularSynth) {
+ if (category->AnyMatches(type_name, eFormatCategoryItemFilter, false)) {
+ if (error)
+ error->SetErrorStringWithFormat("cannot add synthetic for type %s when "
+ "filter is defined in same category!",
+ type_name.AsCString());
+ return false;
+ }
}
if (type == eRegexSynth) {
@@ -2458,13 +2463,18 @@
type = eRegexFilter;
}
- if (category->AnyMatches(type_name, eFormatCategoryItemSynth, false)) {
- if (error)
- error->SetErrorStringWithFormat("cannot add filter for type %s when "
- "synthetic is defined in same "
- "category!",
- type_name.AsCString());
- return false;
+ // Only check for conflicting synthetic child providers in the same category
+ // if `type_name` is an actual type name. Matching a regex string against
+ // registered regexes doesn't work.
+ if (type == eRegularFilter) {
+ if (category->AnyMatches(type_name, eFormatCategoryItemSynth, false)) {
+ if (error)
+ error->SetErrorStringWithFormat("cannot add filter for type %s when "
+ "synthetic is defined in same "
+ "category!",
+ type_name.AsCString());
+ return false;
+ }
}
if (type == eRegexFilter) {
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
