Merge pull request #9720 from swiftlang/dl/lldb-Update-Swift-String-summary-formatter-for-new-bridged-case

[lldb] Update Swift String summary formatter for new bridged case

Author: adrian-prantl

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

@@ -257,6 +257,8 @@ static bool makeStringGutsSummary(
   │ Immortal, Small     ║  1  │ASCII│  1  │  0  │
   ├─────────────────────╫─────┼─────┼─────┼─────┤
   │ Immortal, Large     ║  1  │  0  │  0  │  0  │
+  ├─────────────────────╫─────┼─────┼─────┼─────┤
+  │ Immortal, Bridged   ║  1  │  1  │  0  │  0  │
   ╞═════════════════════╬═════╪═════╪═════╪═════╡
   │ Native              ║  0  │  0  │  0  │  0  │
   ├─────────────────────╫─────┼─────┼─────┼─────┤
@@ -373,7 +375,7 @@ static bool makeStringGutsSummary(
   if ((discriminator & 0b0111'0000) == 0)
     return error("unexpected discriminator");
 
-  if ((discriminator & 0b1110'0000) == 0b0100'0000) { // 010xxxxx: Bridged
+  if ((discriminator & 0b0110'0000) == 0b0100'0000) { // x10xxxxx: Bridged
     TypeSystemClangSP clang_ts_sp =
         ScratchTypeSystemClang::GetForTarget(process->GetTarget());
     if (!clang_ts_sp)

lldb/test/API/lang/swift/variables/bridged_string/TestSwiftBridgedStringVariables.py

@@ -37,11 +37,13 @@ def test_swift_bridged_string_variables(self):
         s4 = self.frame().FindVariable("s4")
         s5 = self.frame().FindVariable("s5")
         s6 = self.frame().FindVariable("s6")
+        s7 = self.frame().FindVariable("s7")
 
         lldbutil.check_variable(self, s1, summary='"Hello world"')
         lldbutil.check_variable(self, s2, summary='"ΞΕΛΛΘ"')
         lldbutil.check_variable(self, s3, summary='"Hello world"')
         lldbutil.check_variable(self, s4, summary='"ΞΕΛΛΘ"')
         lldbutil.check_variable(self, s5, use_dynamic=True, summary='"abc"')
         lldbutil.check_variable(self, s6, summary='"abc"')
+        lldbutil.check_variable(self, s7, summary='"kCFRunLoopDefaultMode"')
 

lldb/test/API/lang/swift/variables/bridged_string/main.swift

@@ -19,6 +19,7 @@ func main()
 	let s4 = s2 as NSString
 	let s5 = "abc" as NSString
 	let s6 = String(s5)
+	let s7 = CFRunLoopMode.defaultMode!.rawValue as String
 	print(s1) // Set breakpoint here
         withExtendedLifetime((s2, s3, s4, s5, s6)) {}
 }