Merge commit '094425c7b7f3' from swift/release/6.3 into stable/21.x

Author: medismailben

lldb/source/Target/Target.cpp

@@ -4768,8 +4768,8 @@ bool TargetProperties::GetSwiftUseContextFreePrintObject() const {
   if (exp_values)
     return exp_values
         ->GetPropertyAtIndexAs<bool>(ePropertySwiftUseContextFreePrintObject)
-        .value_or(false);
-  return false;
+        .value_or(true);
+  return true;
 }
 
 void TargetProperties::SetUseDIL(ExecutionContext *exe_ctx, bool b) {

lldb/source/Target/TargetProperties.td

@@ -38,7 +38,7 @@ let Definition = "target_experimental" in {
     DefaultTrue,
     Desc<"Enables caching of task pointers inside the swift tasks plugin">;
   def SwiftUseContextFreePrintObject: Property<"swift-use-context-free-po", "Boolean">,
-    DefaultFalse,
+    DefaultTrue,
     Desc<"If true, use the context-free po implementation for Swift.">;
   def UseDIL : Property<"use-DIL", "Boolean">,
     Global, DefaultTrue,

lldb/test/API/lang/swift/expression/error_reporting/TestSwiftExpressionErrorReporting.py

@@ -68,8 +68,6 @@ def test_missing_type(self):
         target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
             self, 'break here', lldb.SBFileSpec('main.swift'))
 
-        self.runCmd("settings set target.experimental.swift-use-context-free-po true")
-
         options = lldb.SBExpressionOptions()
         value = self.frame().EvaluateExpression("strct", options)
         def check(value):

lldb/test/API/lang/swift/po/pointer_and_mangled_typename/TestSwiftPrintObjectPointerAndTypeName.py

@@ -8,7 +8,6 @@ class TestCase(TestBase):
 
     def setUp(self):
         TestBase.setUp(self)
-        self.runCmd("settings set target.experimental.swift-use-context-free-po true")
 
         self.log = self.getBuildArtifact("expr.log")
         self.runCmd(f"log enable lldb expr -f {self.log}")