Skip to content

Commit 2398045

Browse files
authored
[AST] Do not limit the number of results from FindGlobalVariables (#20)
1 parent b2815f5 commit 2398045

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

lldb/source/ValueObject/DILAST.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,8 @@ LookupStaticIdentifier(lldb::TargetSP target_sp,
305305
// later.
306306
VariableList variable_list;
307307
ConstString name(name_ref);
308-
target_sp->GetImages().FindGlobalVariables(name, 1, variable_list);
308+
target_sp->GetImages().FindGlobalVariables(
309+
name, std::numeric_limits<uint32_t>::max(), variable_list);
309310
if (!variable_list.Empty()) {
310311
ExecutionContextScope *exe_scope = target_sp->GetProcessSP().get();
311312
if (exe_scope == nullptr)

lldb/unittests/DIL/DILTests.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1831,10 +1831,10 @@ TEST_F(EvalTest, TestStaticConstDeclaredInline) {
18311831
EXPECT_THAT(Eval("outer::Vars::inline_static"), IsEqual("4.5"));
18321832
EXPECT_THAT(Eval("outer::Vars::static_constexpr"), IsEqual("5"));
18331833

1834-
EXPECT_THAT(Eval("::Vars::inline_static"), XFail(IsEqual("7.5")));
1835-
EXPECT_THAT(Eval("::Vars::static_constexpr"), XFail(IsEqual("8")));
1836-
EXPECT_THAT(Eval("Vars::inline_static"), XFail(IsEqual("7.5")));
1837-
EXPECT_THAT(Eval("Vars::static_constexpr"), XFail(IsEqual("8")));
1834+
EXPECT_THAT(Eval("::Vars::inline_static"), IsEqual("7.5"));
1835+
EXPECT_THAT(Eval("::Vars::static_constexpr"), IsEqual("8"));
1836+
EXPECT_THAT(Eval("Vars::inline_static"), IsEqual("7.5"));
1837+
EXPECT_THAT(Eval("Vars::static_constexpr"), IsEqual("8"));
18381838
}
18391839

18401840
#ifndef __EMSCRIPTEN__
@@ -1858,16 +1858,16 @@ TEST_F(EvalTest, TestStaticConstDeclaredOutsideTheClass) {
18581858
EXPECT_THAT(Eval("outer::inner::Vars::static_const"), IsEqual("3"));
18591859
EXPECT_THAT(Eval("::outer::Vars::static_const"), IsEqual("6"));
18601860
EXPECT_THAT(Eval("outer::Vars::static_const"), IsEqual("6"));
1861-
EXPECT_THAT(Eval("::Vars::static_const"), XFail(IsEqual("9")));
1862-
EXPECT_THAT(Eval("Vars::static_const"), XFail(IsEqual("9")));
1861+
EXPECT_THAT(Eval("::Vars::static_const"), IsEqual("9"));
1862+
EXPECT_THAT(Eval("Vars::static_const"), IsEqual("9"));
18631863

18641864
EXPECT_THAT(Eval("::outer::inner::Vars::Nested::static_const"),
18651865
IsEqual("10"));
18661866
EXPECT_THAT(Eval("outer::inner::Vars::Nested::static_const"), IsEqual("10"));
18671867
EXPECT_THAT(Eval("::outer::Vars::Nested::static_const"), IsEqual("20"));
18681868
EXPECT_THAT(Eval("outer::Vars::Nested::static_const"), IsEqual("20"));
1869-
EXPECT_THAT(Eval("::Vars::Nested::static_const"), XFail(IsEqual("30")));
1870-
EXPECT_THAT(Eval("Vars::Nested::static_const"), XFail(IsEqual("30")));
1869+
EXPECT_THAT(Eval("::Vars::Nested::static_const"), IsEqual("30"));
1870+
EXPECT_THAT(Eval("Vars::Nested::static_const"), IsEqual("30"));
18711871
}
18721872

18731873
#ifndef __EMSCRIPTEN__
@@ -2069,8 +2069,8 @@ TEST_F(EvalTest, TestTemplateTypes) {
20692069
EXPECT_THAT(
20702070
Eval("ns::T_1<ns::T_1<int> >::cx"),
20712071
IsError("use of undeclared identifier 'ns::T_1<ns::T_1<int> >::cx'"));
2072-
EXPECT_THAT(Eval("T_1<int>::cx"), XFail(IsEqual("24")));
2073-
EXPECT_THAT(Eval("T_1<double>::cx"), XFail(IsEqual("42")));
2072+
EXPECT_THAT(Eval("T_1<int>::cx"), IsEqual("24"));
2073+
EXPECT_THAT(Eval("T_1<double>::cx"), IsEqual("42"));
20742074
EXPECT_THAT(Eval("ns::T_1<int>::cx"), IsEqual("64"));
20752075

20762076
for (std::string arg : {"int", "int*", "int**", "int&", "int*&"}) {
@@ -2114,7 +2114,7 @@ TEST_F(EvalTest, TestTemplateCpp11) {
21142114
EXPECT_THAT(Eval("T_1<2>>1"),
21152115
IsError("<expr:1:7>: Unexpected token: <'>' (greater)>"));
21162116
// And here it's a template.
2117-
EXPECT_THAT(Eval("T_1<int>::cx + 1"), XFail(IsEqual("25")));
2117+
EXPECT_THAT(Eval("T_1<int>::cx + 1"), IsEqual("25"));
21182118
}
21192119

21202120
TEST_F(EvalTest, TestTemplateWithNumericArguments) {

0 commit comments

Comments
 (0)