Skip to content

[lldb] Fix grammar in error message emitted by IRExecutionUnit #7455

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.

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
merged 1 commit into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ def evaluate_expression(self, expression, frame_idx=0) -> ValueIR:
"use of undeclared identifier",
"no member named",
"Couldn't lookup symbols",
"Couldn't look up symbols",
"reference to local variable",
"invalid use of 'this' outside of a non-static member function",
]
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Expression/IRExecutionUnit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ void IRExecutionUnit::GetRunnableInfo(Status &error, lldb::addr_t &func_addr,
if (m_failed_lookups.size()) {
StreamString ss;

ss.PutCString("Couldn't lookup symbols:\n");
ss.PutCString("Couldn't look up symbols:\n");

bool emitNewLine = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ def test(self):
# Try to access our mock std::vector. This should fail but not crash LLDB as the
# std::vector template should be missing from the std module.
self.expect(
"expr (size_t)v.size()", substrs=["Couldn't lookup symbols"], error=True
"expr (size_t)v.size()", substrs=["Couldn't look up symbols"], error=True
)
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def test(self):
self.expect(
"expr const int *i = &A::int_val; *i",
error=True,
substrs=["Couldn't lookup symbols:"],
substrs=["Couldn't look up symbols:"],
)

# This should work on all platforms.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ def test_int128(self):
# for them and just treats them as normal variables (which will lead
# to linker errors as they are not defined anywhere).
self.expect(
"expr A::int128_max", error=True, substrs=["Couldn't lookup symbols:"]
"expr A::int128_max", error=True, substrs=["Couldn't look up symbols:"]
)
self.expect(
"expr A::uint128_max", error=True, substrs=["Couldn't lookup symbols:"]
"expr A::uint128_max", error=True, substrs=["Couldn't look up symbols:"]
)
self.expect(
"expr A::int128_min", error=True, substrs=["Couldn't lookup symbols:"]
"expr A::int128_min", error=True, substrs=["Couldn't look up symbols:"]
)
self.expect(
"expr A::uint128_min", error=True, substrs=["Couldn't lookup symbols:"]
"expr A::uint128_min", error=True, substrs=["Couldn't look up symbols:"]
)
6 changes: 3 additions & 3 deletions lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ def test_constructors(self):
self.expect(
"expr ClassWithDefaultedCtor().foo()",
error=True,
substrs=["Couldn't lookup symbols:"],
substrs=["Couldn't look up symbols:"],
)

# FIXME: Calling deleted constructors should fail before linking.
self.expect(
"expr ClassWithDeletedCtor(1).value",
error=True,
substrs=["Couldn't lookup symbols:"],
substrs=["Couldn't look up symbols:"],
)
self.expect(
"expr ClassWithDeletedDefaultCtor().value",
error=True,
substrs=["Couldn't lookup symbols:"],
substrs=["Couldn't look up symbols:"],
)

@skipIfWindows # Can't find operator new.
Expand Down
4 changes: 2 additions & 2 deletions lldb/test/API/lang/cpp/unique-types4/TestUniqueTypes4.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ def do_test(self, debug_flags):
)
self.expect(
"expression ns::FooDouble::value",
substrs=["Couldn't lookup symbols"],
substrs=["Couldn't look up symbols"],
error=True,
)
self.expect(
"expression ns::FooInt::value",
substrs=["Couldn't lookup symbols"],
substrs=["Couldn't look up symbols"],
error=True,
)

Expand Down