Merge pull request swiftlang#10137 from swiftlang/egorzhdan/6.1-lldb-cxxstdlib

ravikandhadai · web-flow · commit e0a6ccb7c569 · 2025-03-07T11:05:02.000-08:00
🍒[lldb][cxx-interop] Populate C++ stdlib options correctly
diff --git a/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp b/lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
@@ -3638,6 +3638,8 @@ void SwiftASTContext::InitializeSearchPathOptions(
   }
   invocation.getSearchPathOptions().setFrameworkSearchPaths(
       invocation_framework_paths);
+
+  invocation.computeCXXStdlibOptions();
 }
 
 ThreadSafeASTContext SwiftASTContext::GetASTContext() {
diff --git a/lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py b/lldb/test/API/lang/swift/cxx_interop/forward/stl-types/TestSwiftForwardInteropSTLTypes.py
@@ -14,6 +14,8 @@ class TestSwiftForwardInteropSTLTypes(TestBase):
     @swiftTest
     def test(self):
         self.build()
+        log = self.getBuildArtifact("types.log")
+        self.runCmd('log enable lldb types -f "%s"' % log)
         
         _, _, _, _= lldbutil.run_to_source_breakpoint(
             self, 'Set breakpoint here', lldb.SBFileSpec('main.swift'))
@@ -57,3 +59,7 @@ def test(self):
             '[2] = 9.19'])
         self.expect('expr vector', substrs=['CxxVector', '[0] = 4.1', '[1] = 3.7',
             '[2] = 9.19'])
+
+        # Make sure lldb picks the correct C++ stdlib.
+        self.filecheck('platform shell cat "%s"' % log, __file__)
+#       CHECK-NOT: but current compilation uses unknown C++ stdlib

Original file line number	Diff line number	Diff line change
`@@ -3638,6 +3638,8 @@ void SwiftASTContext::InitializeSearchPathOptions(`
`3638`	`3638`	`}`
`3639`	`3639`	`invocation.getSearchPathOptions().setFrameworkSearchPaths(`
`3640`	`3640`	`invocation_framework_paths);`
	`3641`	`+`
	`3642`	`+ invocation.computeCXXStdlibOptions();`
`3641`	`3643`	`}`
`3642`	`3644`
`3643`	`3645`	`ThreadSafeASTContext SwiftASTContext::GetASTContext() {`