Actually test spans

Author: kastiglione

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

@@ -466,11 +466,12 @@ std::unique_ptr<SwiftUnsafeType> SwiftUnsafeType::Create(ValueObject &valobj) {
 
   llvm::StringRef valobj_type_name(type.GetTypeName().GetCString());
   valobj_type_name.consume_front("Swift.");
-  if (valobj_type_name.consume_front("Span"))
+  bool is_unsafe = valobj_type_name.consume_front("Unsafe");
+  valobj_type_name.consume_front("Mutable");
+
+  if (!is_unsafe && valobj_type_name.consume_front("Span"))
     return std::make_unique<SwiftSpan>(valobj);
 
-  valobj_type_name.consume_front("Unsafe");
-  valobj_type_name.consume_front("Mutable");
   bool is_raw = valobj_type_name.consume_front("Raw");
   bool is_buffer_ptr = valobj_type_name.consume_front("Buffer");
   UnsafePointerKind kind =

lldb/test/API/lang/swift/span/Makefile

@@ -1,3 +1,3 @@
 SWIFT_SOURCES := main.swift
-SWIFTFLAGS_EXTRAS := -parse-as-library
+SWIFTFLAGS_EXTRAS := -parse-as-library -Xfrontend -disable-availability-checking
 include Makefile.rules

lldb/test/API/lang/swift/span/TestSwiftSpan.py

@@ -13,10 +13,6 @@ def test(self):
             self, "break here", lldb.SBFileSpec("main.swift")
         )
 
-        self.expect("frame var ints", substrs=["2 values", "[0] = 6", "[1] = 7"])
-        self.expect(
-            "frame var strings", substrs=["2 values", '[0] = "six"', '[1] = "seven"']
-        )
-        self.expect(
-            "frame var things", substrs=["1 value", "[0] = (id = 67, odd = true)"]
-        )
+        self.expect("frame var ints_span", substrs=["[0] = 6", "[1] = 7"])
+        self.expect("frame var strings_span", substrs=['[0] = "six"', '[1] = "seven"'])
+        self.expect("frame var things_span", substrs=["[0] = (id = 67, odd = true)"])

lldb/test/API/lang/swift/span/main.swift

@@ -11,8 +11,11 @@ struct Thing {
 @main struct Entry {
     static func main() {
         let ints = [6, 7]
+        let ints_span = ints.span
         let strings = ["six", "seven"]
+        let strings_span = strings.span
         let things = [Thing(67)]
+        let things_span = things.span
         print("break here")
     }
 }