[lldb][cxx-interop] Populate C++ stdlib options correctly #10084
+8
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci please test |
|
Is this needed in the swift/release/6.1 branch, too? |
| @@ -2560,6 +2560,7 @@ SwiftASTContext::CreateInstance(lldb::LanguageType language, Module &module, | |||
|
|
|||
| swift_ast_sp->InitializeSearchPathOptions(module_search_paths, | |||
| framework_search_paths); | |||
| swift_ast_sp->GetCompilerInvocation().computeCXXStdlibOptions(); | |||
There was a problem hiding this comment.
What information does this function depend on? Would it make sense to sink this into InitializeSearchPathOptions/ConfigureResourceDirs/SetCompilerInvocationLLDBOverrides?
There was a problem hiding this comment.
Sounds good, I moved this into InitializeSearchPathOptions.
computeCXXStdlibOptions depends on the ClangImporter options and on the SDK/search path being configured.
|
Also, thanks, this is great! :-) |
I think it would be needed, yes. I'll put up a separate PR for the release branch. |
This fixes errors printed by lldb: ``` error: module 'XYZ' was built with libc++, but current compilation uses unknown C++ stdlib ``` rdar://144894619
egorzhdan
force-pushed
the
egorzhdan/20240723-lldb-cxxstdlib
branch
from
1bb5831 to
24bff50
Compare
|
@swift-ci please test |
|
Looks like the test failures are unrelated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes errors printed by lldb:
rdar://144894619