Merge commit 'd077c2d6a423' from swift/release/6.2 into stable/20240723

Author: git apple-llvm automerger

lldb/source/Target/TargetProperties.td

@@ -123,7 +123,7 @@ let Definition = "target" in {
     DefaultUnsignedValue<256>,
     Desc<"Maximum number of children to expand in any level of depth.">;
   def MaxChildrenDepth: Property<"max-children-depth", "UInt64">,
-    DefaultUnsignedValue<6>,
+    DefaultUnsignedValue<4>,
     Desc<"Maximum depth to expand children.">;
   def MaxSummaryLength: Property<"max-string-summary-length", "UInt64">,
     DefaultUnsignedValue<1024>,

lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py

@@ -357,13 +357,13 @@ def cleanup():
         self.runCmd("type format delete int")
 
         # First, check the following:
-        #   1. Verify the default max-children-depth (6) is applied
+        #   1. Verify the default max-children-depth (4) is applied
         #   2. Ensure the one-time warning is printed
         warning = "*** Some of the displayed variables have a greater depth"
         self.expect(
             "frame variable quite_nested",
             matching=True,
-            substrs=["six ={...}", warning],
+            substrs=["four ={...}", warning],
         )
         self.expect(
             "frame variable quite_nested",

lldb/test/API/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py

@@ -120,6 +120,8 @@ def cleanup():
                 '@"2 elements"',
             ],
         )
+
+        self.runCmd("settings set target.max-children-depth 6")
         self.expect(
             "frame variable mutabledict --ptr-depth 3",
             substrs=[

lldb/test/Shell/SymbolFile/PDB/Inputs/UdtLayoutTest.script

@@ -1,3 +1,4 @@
+settings set target.max-children-depth 6
 breakpoint set --file UdtLayoutTest.cpp --line 60
 run
 target variable