[lldb] Update Measurement data formatter (#9127)

rdar://121940851

Author: kastiglione

lldb/source/Plugins/Language/Swift/FoundationValueTypes.cpp

@@ -144,45 +144,49 @@ bool lldb_private::formatters::swift::IndexPath_SummaryProvider(
 
 bool lldb_private::formatters::swift::Measurement_SummaryProvider(
     ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options) {
-  static ConstString g_value("value");
-  static ConstString g_unit("unit");
-  static ConstString g__symbol("_symbol");
+  ValueObjectSP value_sp, symbol_sp;
 
-  ValueObjectSP value_sp(valobj.GetChildAtNamePath({g_value}));
-  if (!value_sp)
-    return false;
+  value_sp = valobj.GetChildMemberWithName("value");
+  if (value_sp) {
+    // Measurement structure prior to macOS 14.
+    ValueObjectSP unit_sp(valobj.GetChildMemberWithName("unit"));
+    if (!unit_sp)
+      return false;
 
-  ValueObjectSP unit_sp(valobj.GetChildAtNamePath({g_unit}));
-  if (!unit_sp)
-    return false;
+    ProcessSP process_sp(valobj.GetProcessSP());
+    if (!process_sp)
+      return false;
 
-  ProcessSP process_sp(valobj.GetProcessSP());
-  if (!process_sp)
-    return false;
+    ObjCLanguageRuntime *objc_runtime = ObjCLanguageRuntime::Get(*process_sp);
+    if (!objc_runtime)
+      return false;
 
-  ObjCLanguageRuntime *objc_runtime =
-      ObjCLanguageRuntime::Get(*process_sp);
-  if (!objc_runtime)
-    return false;
+    auto descriptor_sp(objc_runtime->GetClassDescriptor(*unit_sp));
+    if (!descriptor_sp)
+      return false;
 
-  auto descriptor_sp(objc_runtime->GetClassDescriptor(*unit_sp));
-  if (!descriptor_sp)
-    return false;
+    if (descriptor_sp->GetNumIVars() == 0)
+      return false;
 
-  if (descriptor_sp->GetNumIVars() == 0)
-    return false;
+    auto ivar = descriptor_sp->GetIVarAtIndex(0);
+    if (!ivar.m_type.IsValid())
+      return false;
 
-  auto ivar = descriptor_sp->GetIVarAtIndex(0);
-  if (!ivar.m_type.IsValid())
-    return false;
+    symbol_sp =
+        unit_sp->GetSyntheticChildAtOffset(ivar.m_offset, ivar.m_type, true);
+    if (!symbol_sp)
+      return false;
 
-  ValueObjectSP symbol_sp(
-      unit_sp->GetSyntheticChildAtOffset(ivar.m_offset, ivar.m_type, true));
-  if (!symbol_sp)
-    return false;
+    symbol_sp = symbol_sp->GetQualifiedRepresentationIfAvailable(
+        lldb::eDynamicDontRunTarget, true);
+  } else {
+    // Measurement structure as of macOS 14+.
+    value_sp = valobj.GetChildMemberWithName("_doubleValue");
+    symbol_sp = valobj.GetChildAtNamePath({"unit", "_symbol"});
+  }
 
-  symbol_sp = symbol_sp->GetQualifiedRepresentationIfAvailable(
-      lldb::eDynamicDontRunTarget, true);
+  if (!value_sp || !symbol_sp)
+    return false;
 
   DataExtractor data_extractor;
   Status error;

lldb/test/API/lang/swift/foundation_value_types/measurement/TestSwiftFoundationTypeMeasurement.py

@@ -9,11 +9,38 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 #
 # ------------------------------------------------------------------------------
-import lldbsuite.test.lldbinline as lldbinline
+import lldb
 from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
 
-lldbinline.MakeInlineTest(__file__, globals(),
-                          decorators=[swiftTest,skipUnlessDarwin,
-                expectedFailureAll(bugnumber="rdar://60396797",
-                                   setting=('symbols.use-swift-clangimporter', 'false'))
-])
+
+class TestCase(TestBase):
+    @swiftTest
+    @skipUnlessDarwin
+    @expectedFailureAll(
+        bugnumber="rdar://60396797",
+        setting=("symbols.use-swift-clangimporter", "false"),
+    )
+    def test_measurement(self):
+        self.build()
+        lldbutil.run_to_source_breakpoint(
+            self, "break here", lldb.SBFileSpec("main.swift")
+        )
+        self.expect("expr -- measurement", substrs=["1.25 m"])
+
+    @swiftTest
+    @skipUnlessDarwin
+    def test_measurement_without_swift_ast_context(self):
+        self.build()
+        lldbutil.run_to_source_breakpoint(
+            self, "break here", lldb.SBFileSpec("main.swift")
+        )
+
+        # This setting is to test that measurements can be printed using
+        # TypeSystemSwiftTypeRef only. If the SwiftASTContext fallback were
+        # enabled, it can have the unwatned effect of suppressing failures
+        # within the TypeRef type system.
+        self.runCmd("settings set symbols.swift-enable-ast-context false")
+
+        self.expect("frame variable measurement", substrs=["1.25 m"])

lldb/test/API/lang/swift/foundation_value_types/measurement/main.swift

@@ -13,8 +13,7 @@ import Foundation
 
 func main() {
   var measurement = Measurement(value: 1.25, unit: Unit(symbol: "m"))
-  print("done!") //% self.expect("frame variable measurement", substrs=['1.25 m'])
-   //% self.expect("expression -d run -- measurement", substrs=['1.25 m'])
+  print("break here")
 }
 
 main()