Merge commit '40653b6d6682' from llvm.org/main into next

From llvm@40653b6

% git show 40653b6
commit 40653b6
Author: Dave Lee <[email protected]>
Date:   Tue Oct 3 16:21:52 2023 -0700

    [lldb] Fix --persistent-result description (llvm#68128)

    The default is not static, it depends on context. For `expression`, the
    default is true, but for `dwim-print`, the default is false.

    rdar://116320377

diff --git a/lldb/source/Commands/Options.td b/lldb/source/Commands/Options.td
index 04830b8..cfdeaab 100644
--- a/lldb/source/Commands/Options.td
+++ b/lldb/source/Commands/Options.td
@@ -390,7 +390,7 @@ let Command = "expression" in {
     Arg<"Boolean">,
     Desc<"Persist expression result in a variable for subsequent use. "
     "Expression results will be labeled with $-prefixed variables, e.g. $0, "
-    "$1, etc. Defaults to true.">;
+    "$1, etc.">;
 }

 let Command = "frame diag" in {

Author: fpetrogalli

lldb/source/Commands/Options.td

@@ -396,7 +396,7 @@ let Command = "expression" in {
     Arg<"Boolean">,
     Desc<"Persist expression result in a variable for subsequent use. "
     "Expression results will be labeled with $-prefixed variables, e.g. $0, "
-    "$1, etc. Defaults to true.">;
+    "$1, etc.">;
   // BEGIN SWIFT
   def bind_generic_types : Option<"bind-generic-types", "\\x31">,
     EnumArg<"BindGenTypeParamValue">, Desc<"Controls whether any "