Merge pull request #6615 from augusto2112/skip-std

[lldb] Skip importing module "std" in favor of CxxStdlib

Author: augusto2112

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -8373,9 +8373,11 @@ bool SwiftASTContext::GetCompileUnitImportsImpl(
     // When building the Swift stdlib with debug info these will
     // show up in "Swift.o", but we already imported them and
     // manually importing them will fail.
+    // Also skip the "std" module, as the C++ standard library will be
+    // imported as "CxxStdlib", which should also be imported.
     if (module.path.size() &&
         llvm::StringSwitch<bool>(module.path.front().GetStringRef())
-            .Cases("Swift", "SwiftShims", "Builtin", true)
+            .Cases("Swift", "SwiftShims", "Builtin", "std", true)
             .Default(false))
       continue;
 

lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py

@@ -19,27 +19,37 @@ def test(self):
 
         self.expect('v map', substrs=['CxxMap', 'first = 1, second = 3', 
             'first = 2, second = 2', 'first = 3, second = 3'])
-
-        # This should work (rdar://106374745), check all 'expr' cases after it's fixed.
-        self.expect('expr map', substrs=['error while processing module import: failed to '
-            'get module "std" from AST context'], error=True)
+        self.expect('expr map', substrs=['CxxMap', 'first = 1, second = 3', 
+            'first = 2, second = 2', 'first = 3, second = 3'])
 
         self.expect('v optional', substrs=['CxxOptional', 'optional', 'Has Value=true',
             'Value = "In optional!"'])
+        self.expect('expr optional', substrs=['CxxOptional', 'Has Value=true',
+            'Value = "In optional!"'])
 
         self.expect('v emptyOptional', substrs=['CxxOptional', 'emptyOptional', 
             'Has Value=false'])
+        self.expect('expr emptyOptional', substrs=['CxxOptional', 'Has Value=false'])
 
         self.expect('v set', substrs=['CxxSet', 'size=3', '3.7', '4.2', '9.19'])
+        self.expect('expr set', substrs=['CxxSet', 'size=3', '3.7', '4.2', '9.19'])
 
         self.expect('v string', substrs=['string', 'Hello from C++!'])
+        self.expect('expr string', substrs=['Hello from C++!'])
 
         self.expect('v unorderedMap', substrs=['CxxUnorderedMap', 
             '(first = 3, second = "three")', '(first = 2, second = "two")',
             '(first = 1, second = "one")'], ordered=False)
+        self.expect('expr unorderedMap', substrs=['CxxUnorderedMap', 
+            '(first = 3, second = "three")', '(first = 2, second = "two")',
+            '(first = 1, second = "one")'], ordered=False)
 
         self.expect('v unorderedSet', substrs=['CxxUnorderedSet',
             'first', 'second', 'third'], ordered=False)
+        self.expect('expr unorderedSet', substrs=['CxxUnorderedSet',
+            'first', 'second', 'third'], ordered=False)
 
         self.expect('v vector', substrs=['CxxVector', '[0] = 4.1', '[1] = 3.7',
             '[2] = 9.19'])
+        self.expect('expr vector', substrs=['CxxVector', '[0] = 4.1', '[1] = 3.7',
+            '[2] = 9.19'])