https://github.com/kastiglione updated https://github.com/llvm/llvm-project/pull/175847
>From 0ce3b0e13a4f8d8d06c2dc04e7cfcbe38eabd2f6 Mon Sep 17 00:00:00 2001 From: Dave Lee <[email protected]> Date: Tue, 13 Jan 2026 13:43:35 -0800 Subject: [PATCH 1/2] [lldb] Change po fallback messaging When an object description expression fails, instead of emitting an error, mark it as a warning instead. Additionally, send the more low level details of the failure to the `expr` log, and show a more user friendly message: > `po` was unsuccessful, running `p` instead rdar://165190497 --- lldb/source/DataFormatters/ValueObjectPrinter.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lldb/source/DataFormatters/ValueObjectPrinter.cpp b/lldb/source/DataFormatters/ValueObjectPrinter.cpp index e20051140806b..bdad8c0cc2343 100644 --- a/lldb/source/DataFormatters/ValueObjectPrinter.cpp +++ b/lldb/source/DataFormatters/ValueObjectPrinter.cpp @@ -12,6 +12,7 @@ #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Target/Language.h" #include "lldb/Target/Target.h" +#include "lldb/Utility/Log.h" #include "lldb/Utility/Stream.h" #include "lldb/ValueObject/ValueObject.h" #include "llvm/Support/Error.h" @@ -100,8 +101,10 @@ llvm::Error ValueObjectPrinter::PrintValueObject() { llvm::Expected<std::string> object_desc_or_err = GetMostSpecializedValue().GetObjectDescription(); if (!object_desc_or_err) { - auto error_msg = toString(object_desc_or_err.takeError()); - *m_stream << "error: " << error_msg << maybeNewline(error_msg); + *m_stream << "warning: `po` was unsuccessful, running `p` instead"; + LLDB_LOG_ERROR(GetLog(LLDBLog::Expressions), + object_desc_or_err.takeError(), + "Object description fallback due to error: {0}"); // Print the value object directly. m_options.DisableObjectDescription(); >From 245664b5dfb5b1ad093e4a98779f31972daaaebb Mon Sep 17 00:00:00 2001 From: Dave Lee <[email protected]> Date: Tue, 13 Jan 2026 14:30:28 -0800 Subject: [PATCH 2/2] Update tests --- .../TestObjCFailingDescription.py | 18 ++++++++++++++-- .../TestObjCStructDescription.py | 21 +++++++++++++++++-- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/lldb/test/API/lang/objc/failing-description/TestObjCFailingDescription.py b/lldb/test/API/lang/objc/failing-description/TestObjCFailingDescription.py index a06ff577e7f7d..134c40c6d070e 100644 --- a/lldb/test/API/lang/objc/failing-description/TestObjCFailingDescription.py +++ b/lldb/test/API/lang/objc/failing-description/TestObjCFailingDescription.py @@ -8,10 +8,24 @@ class TestCase(TestBase): def test(self): self.build() lldbutil.run_to_source_breakpoint(self, "break here", lldb.SBFileSpec("main.m")) + + log = self.getBuildArtifact("expr.log") + self.runCmd(f"log enable lldb expr -f {log}") + self.expect( - "expr -O -- bad", substrs=["error:", "expression interrupted", "(Bad *) 0x"] + "expr -O -- bad", + substrs=["`po` was unsuccessful, running `p` instead", "(Bad *) 0x"], + ) + self.filecheck( + f"platform shell cat {log}", __file__, f"-check-prefix=CHECK-EXPR" ) + # CHECK-EXPR: Object description fallback due to error: could not evaluate print object function: expression interrupted + self.expect( "dwim-print -O -- bad", - substrs=["error:", "expression interrupted", "_lookHere = NO"], + substrs=["`po` was unsuccessful, running `p` instead", "_lookHere = NO"], + ) + self.filecheck( + f"platform shell cat {log}", __file__, f"-check-prefix=CHECK-DWIM-PRINT" ) + # CHECK-DWIM-PRINT: Object description fallback due to error: could not evaluate print object function: expression interrupted diff --git a/lldb/test/API/lang/objc/struct-description/TestObjCStructDescription.py b/lldb/test/API/lang/objc/struct-description/TestObjCStructDescription.py index d152b2690c663..b03797fdef6e3 100644 --- a/lldb/test/API/lang/objc/struct-description/TestObjCStructDescription.py +++ b/lldb/test/API/lang/objc/struct-description/TestObjCStructDescription.py @@ -8,11 +8,28 @@ class TestCase(TestBase): def test(self): self.build() lldbutil.run_to_source_breakpoint(self, "break here", lldb.SBFileSpec("main.m")) + + log = self.getBuildArtifact("expr.log") + self.runCmd(f"log enable lldb expr -f {log}") + self.expect( "vo pair", - substrs=["error:", "not a pointer type", "(Pair) pair = (f = 2, e = 3)"], + substrs=[ + "warning: `po` was unsuccessful, running `p` instead", + "(Pair) pair = (f = 2, e = 3)", + ], ) + self.filecheck(f"platform shell cat {log}", __file__, f"-check-prefix=CHECK-VO") + # CHECK-VO: Object description fallback due to error: not a pointer type + self.expect( "expr -O -- pair", - substrs=["error:", "not a pointer type", "(Pair) (f = 2, e = 3)"], + substrs=[ + "warning: `po` was unsuccessful, running `p` instead", + "(Pair) (f = 2, e = 3)", + ], + ) + self.filecheck( + f"platform shell cat {log}", __file__, f"-check-prefix=CHECK-EXPR" ) + # CHECK-EXPR: Object description fallback due to error: not a pointer type _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
