[lldb] Enable auto-detection of Swift/C++ interop #6509
Merged
Conversation
This file contains hidden or 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 test |
| @@ -170,6 +170,14 @@ typedef enum SwiftModuleLoadingMode { | |||
| eSwiftModuleLoadingModeOnlyInterface, // Load via .swiftinterface only | |||
| } SwiftModuleLoadingMode; | |||
|
|
|||
| // BEGIN SWIFT | |||
| enum EnableCxxInteropOpts { | |||
There was a problem hiding this comment.
Should we call this EnableSwiftCxx?
adrian-prantl
approved these changes
Mar 20, 2023
augusto2112
force-pushed
the
autodetect-cxx-interop
branch
from
059e078 to
45ae370
Compare
lldb/source/Core/Module.cpp
Outdated
| // libraries shipped with Swift are written in C++. | ||
| auto name = GetFileSpec().GetFileNameStrippingExtension().GetStringRef(); | ||
| if (name.startswith("libswift")) | ||
| return false; |
There was a problem hiding this comment.
This a per-module function, so this would misfire for libSwiftCore.dSYM, which generally only people manually building their own Swift compiler would even have. Since developers might legitimately name libraries libswift* maybe it's better to accept a false positive inside the standard library for those few people that have debug info for it?
lldb/source/Target/Target.cpp
Outdated
| for (size_t mi = 0; mi != num_images; ++mi) { | ||
| ModuleSP module_sp = GetImages().GetModuleAtIndex(mi); | ||
| if (module_sp->IsSwiftCxxInteropEnabled()) { | ||
| m_is_swift_cxx_interop_enabled = eLazyBoolYes; |
There was a problem hiding this comment.
Ah I see. The problem is that we merge the info from all modules.
adrian-prantl
approved these changes
Mar 31, 2023
augusto2112
force-pushed
the
autodetect-cxx-interop
branch
from
45ae370 to
d0f92f7
Compare
|
@swift-ci test |
|
@swift-ci test macOS |
augusto2112
force-pushed
the
autodetect-cxx-interop
branch
from
d0f92f7 to
0c209bc
Compare
|
@swift-ci test |
1 similar comment
|
@swift-ci test |
augusto2112
force-pushed
the
autodetect-cxx-interop
branch
from
0c209bc to
9eb5615
Compare
|
@swift-ci test |
augusto2112
force-pushed
the
autodetect-cxx-interop
branch
from
9eb5615 to
da00776
Compare
|
@swift-ci test |
augusto2112
force-pushed
the
autodetect-cxx-interop
branch
from
da00776 to
dba0067
Compare
augusto2112
force-pushed
the
autodetect-cxx-interop
branch
from
dba0067 to
716b87c
Compare
Implement SymbolFile::GetCompileOptions, which returns a map from compilation units to compilation arguments associated with that unit. Differential Revision: https://reviews.llvm.org/D147748 (cherry picked from commit 19d969e)
rdar://97610458
augusto2112
force-pushed
the
autodetect-cxx-interop
branch
from
716b87c to
c113ef8
Compare
|
@swift-ci test |
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.
rdar://97610458