Merge commit 'db02b99c038a' from swift/release/6.1 into stable/20240723

Author: git apple-llvm automerger

lldb/source/API/SBValue.cpp

@@ -380,8 +380,10 @@ const char *SBValue::GetObjectDescription() {
     return nullptr;
 
   llvm::Expected<std::string> str = value_sp->GetObjectDescription();
-  if (!str)
-    return ConstString("error: " + toString(str.takeError())).AsCString();
+  if (!str) {
+    llvm::consumeError(str.takeError());
+    return nullptr;
+  }
   return ConstString(*str).AsCString();
 }
 

lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py

@@ -195,6 +195,10 @@ def test_error_type(self):
         value = frame.EvaluateExpression('#error("I am error.")')
         error = value.GetError()
         self.assertEqual(error.GetType(), lldb.eErrorTypeExpression)
+        value = frame.FindVariable("f")
+        self.assertTrue(value.IsValid())
+        desc = value.GetObjectDescription()
+        self.assertEqual(desc, None)
 
     def test_command_expr_sbdata(self):
         """Test the structured diagnostics data"""

lldb/test/API/lang/swift/po/uninitialized/main.swift

@@ -15,7 +15,7 @@ class POClass {
 
 func main() {
   var object: POClass
-  object = POClass() //% self.assertTrue(self.frame().FindVariable('object').GetObjectDescription() == 'error: <uninitialized>', 'po correctly detects uninitialized instances')
+  object = POClass() //% self.assertEqual(self.frame().FindVariable('object').GetObjectDescription(), None, 'po correctly detects uninitialized instances'); self.expect("po object", substrs=["<uninitialized>"])
   print("yay I am done") //% self.assertTrue('POClass:' in self.frame().FindVariable('object').GetObjectDescription())
 }