Michael137 updated this revision to Diff 493938.
Michael137 added a comment.
- Add test-case for nested inline namespaces
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143068/new/
https://reviews.llvm.org/D143068
Files:
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
lldb/test/API/commands/expression/inline-namespace/main.cpp
Index: lldb/test/API/commands/expression/inline-namespace/main.cpp
===================================================================
--- lldb/test/API/commands/expression/inline-namespace/main.cpp
+++ lldb/test/API/commands/expression/inline-namespace/main.cpp
@@ -1,10 +1,28 @@
namespace A {
inline namespace B {
int f() { return 3; }
+ int global_var = 0;
+
+ namespace C {
+ int global_var = 1;
+ }
+
+ inline namespace D {
+ int nested_var = 2;
+ }
};
+
+ namespace E {
+ inline namespace F {
+ int other_var = 3;
+ }
+ } // namespace E
+
+ int global_var = 4;
}
int main(int argc, char **argv) {
// Set break point at this line.
- return A::f();
+ return A::f() + A::B::global_var + A::C::global_var + A::E::F::other_var +
+ A::B::D::nested_var;
}
Index: lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
===================================================================
--- lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
+++ lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
@@ -23,3 +23,35 @@
# But we should still find the function when we pretend the inline
# namespace is not inline.
self.expect_expr("A::B::f()", result_type="int", result_value="3")
+
+ self.expect_expr("A::B::global_var", result_type="int",
result_value="0")
+ # FIXME: should be ambiguous lookup but ClangExpressionDeclMap takes
+ # first global variable that the lookup found, which in this
case
+ # is A::B::global_var
+ self.expect_expr("A::global_var", result_type="int", result_value="0")
+
+ self.expect_expr("A::B::C::global_var", result_type="int",
result_value="1")
+ self.expect_expr("A::C::global_var", result_type="int",
result_value="1")
+
+ self.expect_expr("A::B::D::nested_var", result_type="int",
result_value="2")
+ self.expect_expr("A::D::nested_var", result_type="int",
result_value="2")
+ self.expect_expr("A::B::nested_var", result_type="int",
result_value="2")
+ self.expect_expr("A::nested_var", result_type="int", result_value="2")
+
+ self.expect_expr("A::E::F::other_var", result_type="int",
result_value="3")
+ self.expect_expr("A::E::other_var", result_type="int",
result_value="3")
+
+ self.expect("expr A::E::global_var", error=True, substrs=["no member
named 'global_var' in namespace 'A::E'"])
+ self.expect("expr A::E::F::global_var", error=True, substrs=["no
member named 'global_var' in namespace 'A::E::F'"])
+
+ self.expect("expr A::other_var", error=True, substrs=["no member named
'other_var' in namespace 'A'"])
+ self.expect("expr A::B::other_var", error=True, substrs=["no member
named 'other_var' in namespace 'A::B'"])
+ self.expect("expr B::other_var", error=True, substrs=["no member named
'other_var' in namespace 'A::B'"])
+
+ # 'frame variable' can correctly distinguish between A::B::global_var
and A::global_var
+ gvars = self.target().FindGlobalVariables("A::global_var", 10)
+ self.assertEqual(len(gvars), 1)
+ self.assertEqual(gvars[0].GetValueAsSigned(), 4)
+
+ self.expect("frame variable A::global_var", substrs=["(int)
A::global_var = 4"])
+ self.expect("frame variable A::B::global_var", substrs=["(int)
A::B::global_var = 0"])
Index: lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -2223,7 +2223,8 @@
CompilerDeclContext actual_parent_decl_ctx =
dwarf_ast->GetDeclContextContainingUIDFromDWARF(die);
if (!actual_parent_decl_ctx ||
- actual_parent_decl_ctx != parent_decl_ctx)
+ (actual_parent_decl_ctx != parent_decl_ctx &&
+ !parent_decl_ctx.IsContainedInLookup(actual_parent_decl_ctx)))
return true;
}
}
Index: lldb/test/API/commands/expression/inline-namespace/main.cpp
===================================================================
--- lldb/test/API/commands/expression/inline-namespace/main.cpp
+++ lldb/test/API/commands/expression/inline-namespace/main.cpp
@@ -1,10 +1,28 @@
namespace A {
inline namespace B {
int f() { return 3; }
+ int global_var = 0;
+
+ namespace C {
+ int global_var = 1;
+ }
+
+ inline namespace D {
+ int nested_var = 2;
+ }
};
+
+ namespace E {
+ inline namespace F {
+ int other_var = 3;
+ }
+ } // namespace E
+
+ int global_var = 4;
}
int main(int argc, char **argv) {
// Set break point at this line.
- return A::f();
+ return A::f() + A::B::global_var + A::C::global_var + A::E::F::other_var +
+ A::B::D::nested_var;
}
Index: lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
===================================================================
--- lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
+++ lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
@@ -23,3 +23,35 @@
# But we should still find the function when we pretend the inline
# namespace is not inline.
self.expect_expr("A::B::f()", result_type="int", result_value="3")
+
+ self.expect_expr("A::B::global_var", result_type="int", result_value="0")
+ # FIXME: should be ambiguous lookup but ClangExpressionDeclMap takes
+ # first global variable that the lookup found, which in this case
+ # is A::B::global_var
+ self.expect_expr("A::global_var", result_type="int", result_value="0")
+
+ self.expect_expr("A::B::C::global_var", result_type="int", result_value="1")
+ self.expect_expr("A::C::global_var", result_type="int", result_value="1")
+
+ self.expect_expr("A::B::D::nested_var", result_type="int", result_value="2")
+ self.expect_expr("A::D::nested_var", result_type="int", result_value="2")
+ self.expect_expr("A::B::nested_var", result_type="int", result_value="2")
+ self.expect_expr("A::nested_var", result_type="int", result_value="2")
+
+ self.expect_expr("A::E::F::other_var", result_type="int", result_value="3")
+ self.expect_expr("A::E::other_var", result_type="int", result_value="3")
+
+ self.expect("expr A::E::global_var", error=True, substrs=["no member named 'global_var' in namespace 'A::E'"])
+ self.expect("expr A::E::F::global_var", error=True, substrs=["no member named 'global_var' in namespace 'A::E::F'"])
+
+ self.expect("expr A::other_var", error=True, substrs=["no member named 'other_var' in namespace 'A'"])
+ self.expect("expr A::B::other_var", error=True, substrs=["no member named 'other_var' in namespace 'A::B'"])
+ self.expect("expr B::other_var", error=True, substrs=["no member named 'other_var' in namespace 'A::B'"])
+
+ # 'frame variable' can correctly distinguish between A::B::global_var and A::global_var
+ gvars = self.target().FindGlobalVariables("A::global_var", 10)
+ self.assertEqual(len(gvars), 1)
+ self.assertEqual(gvars[0].GetValueAsSigned(), 4)
+
+ self.expect("frame variable A::global_var", substrs=["(int) A::global_var = 4"])
+ self.expect("frame variable A::B::global_var", substrs=["(int) A::B::global_var = 0"])
Index: lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -2223,7 +2223,8 @@
CompilerDeclContext actual_parent_decl_ctx =
dwarf_ast->GetDeclContextContainingUIDFromDWARF(die);
if (!actual_parent_decl_ctx ||
- actual_parent_decl_ctx != parent_decl_ctx)
+ (actual_parent_decl_ctx != parent_decl_ctx &&
+ !parent_decl_ctx.IsContainedInLookup(actual_parent_decl_ctx)))
return true;
}
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
