[Lldb-commits] [lldb] a902015 - [lldb] Fix grammar in error message emitted by IRExecutionUnit

Jonas Devlieghere via lldb-commits lldb-commits at lists.llvm.org
Thu Aug 24 14:11:35 PDT 2023


Author: Jonas Devlieghere
Date: 2023-08-24T14:11:30-07:00
New Revision: a902015f543097720fed4d2c04e34daa0fdfbda7

URL: https://github.com/llvm/llvm-project/commit/a902015f543097720fed4d2c04e34daa0fdfbda7
DIFF: https://github.com/llvm/llvm-project/commit/a902015f543097720fed4d2c04e34daa0fdfbda7.diff

LOG: [lldb] Fix grammar in error message emitted by IRExecutionUnit

The error message "Couldn't lookup symbols" emitted from IRExecutionUnit
is grammatically incorrect. "Lookup" is noun when spelled without a
space. Update the error message to use the verb "look up" instead.

Added: 
    

Modified: 
    cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py
    lldb/source/Expression/IRExecutionUnit.cpp
    lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
    lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
    lldb/test/API/lang/cpp/const_static_integral_member_int128/TestConstStaticIntegralMemberInt128.py
    lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
    lldb/test/API/lang/cpp/unique-types4/TestUniqueTypes4.py

Removed: 
    


################################################################################
diff  --git a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py
index b13e7435ba75a4..d601648e3748cf 100644
--- a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py
+++ b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py
@@ -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",
             ]

diff  --git a/lldb/source/Expression/IRExecutionUnit.cpp b/lldb/source/Expression/IRExecutionUnit.cpp
index 5a4ba04bff04ea..ac9cea7e731f09 100644
--- a/lldb/source/Expression/IRExecutionUnit.cpp
+++ b/lldb/source/Expression/IRExecutionUnit.cpp
@@ -419,7 +419,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;
 

diff  --git a/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py b/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
index 94d0978b199c62..913d964578918c 100644
--- a/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/empty-module/TestEmptyStdModule.py
@@ -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
         )

diff  --git a/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py b/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
index 7ec3ff12c6f8ee..530191e8a37ba1 100644
--- a/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
+++ b/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
@@ -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.

diff  --git a/lldb/test/API/lang/cpp/const_static_integral_member_int128/TestConstStaticIntegralMemberInt128.py b/lldb/test/API/lang/cpp/const_static_integral_member_int128/TestConstStaticIntegralMemberInt128.py
index 183be54a0307f3..72a2c629c90453 100644
--- a/lldb/test/API/lang/cpp/const_static_integral_member_int128/TestConstStaticIntegralMemberInt128.py
+++ b/lldb/test/API/lang/cpp/const_static_integral_member_int128/TestConstStaticIntegralMemberInt128.py
@@ -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:"]
         )

diff  --git a/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py b/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
index 4c50de0cd75026..6724bfc8ed78e0 100644
--- a/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
+++ b/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
@@ -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.

diff  --git a/lldb/test/API/lang/cpp/unique-types4/TestUniqueTypes4.py b/lldb/test/API/lang/cpp/unique-types4/TestUniqueTypes4.py
index 0e26dab7df1719..d9ac07fd00da5c 100644
--- a/lldb/test/API/lang/cpp/unique-types4/TestUniqueTypes4.py
+++ b/lldb/test/API/lang/cpp/unique-types4/TestUniqueTypes4.py
@@ -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,
         )
 


        


More information about the lldb-commits mailing list