Skip to content

[AST] Do not limit the number of results from FindGlobalVariables #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuilpd merged 1 commit into from
Feb 27, 2025
Merged

[AST] Do not limit the number of results from FindGlobalVariables #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lldb/source/ValueObject/DILAST.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,8 @@ LookupStaticIdentifier(lldb::TargetSP target_sp,
// later.
VariableList variable_list;
ConstString name(name_ref);
target_sp->GetImages().FindGlobalVariables(name, 1, variable_list);
target_sp->GetImages().FindGlobalVariables(
name, std::numeric_limits<uint32_t>::max(), variable_list);
if (!variable_list.Empty()) {
ExecutionContextScope *exe_scope = target_sp->GetProcessSP().get();
if (exe_scope == nullptr)
Expand Down
22 changes: 11 additions & 11 deletions lldb/unittests/DIL/DILTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1832,10 +1832,10 @@ TEST_F(EvalTest, TestStaticConstDeclaredInline) {
EXPECT_THAT(Eval("outer::Vars::inline_static"), IsEqual("4.5"));
EXPECT_THAT(Eval("outer::Vars::static_constexpr"), IsEqual("5"));

EXPECT_THAT(Eval("::Vars::inline_static"), XFail(IsEqual("7.5")));
EXPECT_THAT(Eval("::Vars::static_constexpr"), XFail(IsEqual("8")));
EXPECT_THAT(Eval("Vars::inline_static"), XFail(IsEqual("7.5")));
EXPECT_THAT(Eval("Vars::static_constexpr"), XFail(IsEqual("8")));
EXPECT_THAT(Eval("::Vars::inline_static"), IsEqual("7.5"));
EXPECT_THAT(Eval("::Vars::static_constexpr"), IsEqual("8"));
EXPECT_THAT(Eval("Vars::inline_static"), IsEqual("7.5"));
EXPECT_THAT(Eval("Vars::static_constexpr"), IsEqual("8"));
}

#ifndef __EMSCRIPTEN__
Expand All @@ -1859,16 +1859,16 @@ TEST_F(EvalTest, TestStaticConstDeclaredOutsideTheClass) {
EXPECT_THAT(Eval("outer::inner::Vars::static_const"), IsEqual("3"));
EXPECT_THAT(Eval("::outer::Vars::static_const"), IsEqual("6"));
EXPECT_THAT(Eval("outer::Vars::static_const"), IsEqual("6"));
EXPECT_THAT(Eval("::Vars::static_const"), XFail(IsEqual("9")));
EXPECT_THAT(Eval("Vars::static_const"), XFail(IsEqual("9")));
EXPECT_THAT(Eval("::Vars::static_const"), IsEqual("9"));
EXPECT_THAT(Eval("Vars::static_const"), IsEqual("9"));

EXPECT_THAT(Eval("::outer::inner::Vars::Nested::static_const"),
IsEqual("10"));
EXPECT_THAT(Eval("outer::inner::Vars::Nested::static_const"), IsEqual("10"));
EXPECT_THAT(Eval("::outer::Vars::Nested::static_const"), IsEqual("20"));
EXPECT_THAT(Eval("outer::Vars::Nested::static_const"), IsEqual("20"));
EXPECT_THAT(Eval("::Vars::Nested::static_const"), XFail(IsEqual("30")));
EXPECT_THAT(Eval("Vars::Nested::static_const"), XFail(IsEqual("30")));
EXPECT_THAT(Eval("::Vars::Nested::static_const"), IsEqual("30"));
EXPECT_THAT(Eval("Vars::Nested::static_const"), IsEqual("30"));
}

#ifndef __EMSCRIPTEN__
Expand Down Expand Up @@ -2070,8 +2070,8 @@ TEST_F(EvalTest, TestTemplateTypes) {
EXPECT_THAT(
Eval("ns::T_1<ns::T_1<int> >::cx"),
IsError("use of undeclared identifier 'ns::T_1<ns::T_1<int> >::cx'"));
EXPECT_THAT(Eval("T_1<int>::cx"), XFail(IsEqual("24")));
EXPECT_THAT(Eval("T_1<double>::cx"), XFail(IsEqual("42")));
EXPECT_THAT(Eval("T_1<int>::cx"), IsEqual("24"));
EXPECT_THAT(Eval("T_1<double>::cx"), IsEqual("42"));
EXPECT_THAT(Eval("ns::T_1<int>::cx"), IsEqual("64"));

for (std::string arg : {"int", "int*", "int**", "int&", "int*&"}) {
Expand Down Expand Up @@ -2115,7 +2115,7 @@ TEST_F(EvalTest, TestTemplateCpp11) {
EXPECT_THAT(Eval("T_1<2>>1"),
IsError("<expr:1:7>: Unexpected token: <'>' (greater)>"));
// And here it's a template.
EXPECT_THAT(Eval("T_1<int>::cx + 1"), XFail(IsEqual("25")));
EXPECT_THAT(Eval("T_1<int>::cx + 1"), IsEqual("25"));
}

TEST_F(EvalTest, TestTemplateWithNumericArguments) {
Expand Down