[lldb] Add Foundation._NSSwiftTimeZone support #7074
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
kastiglione
changed the base branch from
swift/release/5.9
to
dl/swift-implemented-objc-classes
kastiglione
force-pushed
the
dl/lldb-add-foundation._nsswifttimezone-support
branch
from
3b74abb to
cd909e9
Compare
kastiglione
commented
Jul 11, 2023
Comment on lines
110
to
114
| lldb::addr_t valobj_addr = valobj.GetValueAsUnsigned(0); | ||
|
|
||
| if (!valobj_addr) | ||
| return false; | ||
|
|
kastiglione
changed the base branch from
dl/swift-implemented-objc-classes
to
swift/release/5.9
|
@swift-ci test |
|
This depends on #7073. See 89b7e0f90f3829673662e6d7a20a0ec747f936d0 for the changes unique to this PR. |
|
@swift-ci test windows |
jimingham
reviewed
Jul 12, 2023
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCClassDescriptorV2.cpp
Outdated
Show resolved
Hide resolved
kastiglione
force-pushed
the
dl/lldb-add-foundation._nsswifttimezone-support
branch
from
cd909e9 to
89b7e0f
Compare
|
@swift-ci test |
|
@swift-ci test windows |
kastiglione
force-pushed
the
dl/lldb-add-foundation._nsswifttimezone-support
branch
from
89b7e0f to
4d1fa0a
Compare
|
@swift-ci test |
|
@swift-ci test windows |
|
@swift-ci test |
Classes implemented in Swift can be exposed to ObjC. For those classes, the ObjC metadata is incomplete. Specifically, the encoded types of the ivars are incomplete. As one might expect, the Swift metadata _is_ complete. In such cases, the Swift runtime should be consulted when determining the dynamic type of a value. Differential Revision: https://reviews.llvm.org/D152837
kastiglione
force-pushed
the
dl/lldb-add-foundation._nsswifttimezone-support
branch
from
5848a98 to
2168802
Compare
|
@swift-ci test |
|
@swift-ci test windows |
kastiglione
force-pushed
the
dl/lldb-add-foundation._nsswifttimezone-support
branch
from
2168802 to
6875ce8
Compare
|
@swift-ci test |
|
@swift-ci test windows |
1 similar comment
|
@swift-ci test windows |
| }; | ||
|
|
||
| std::optional<SwiftNominalType> GetSwiftClass(ValueObject &valobj, | ||
| AppleObjCRuntime &objc_runtime) { |
There was a problem hiding this comment.
There might be one ore two opportunities for comments in this function to explain the algorithm :-)
| return {}; | ||
|
|
||
| swift::Demangle::Context ctx; | ||
| auto *global = ctx.demangleSymbolAsNode(*swift_symbol); |
There was a problem hiding this comment.
No need to do this right away — but for readability this could be a helper in SwiftDemangle.h?
adrian-prantl
approved these changes
Jul 20, 2023
| if (auto maybe_swift_class = GetSwiftClass(in_value, *objc_runtime)) { | ||
| swift_class = *maybe_swift_class; | ||
| std::string type_name = | ||
| (llvm::Twine(swift_class.module) + "." + swift_class.identifier).str(); |
There was a problem hiding this comment.
Is this shorter?
llvm::raw_string_ostream(type_name)<<swift_class.module<<"."<<swift_class.identifier;
| std::string remangled; | ||
| { | ||
| // Create a mangle tree for __C.dyn_name?. | ||
| // Create a mangle tree for Swift.Optional<$module.$class> |
There was a problem hiding this comment.
This could also be a few helper functions (in a follow-up commit).
|
@swift-ci test windows |
kastiglione
force-pushed
the
dl/lldb-add-foundation._nsswifttimezone-support
branch
from
6875ce8 to
42c2556
Compare
|
@swift-ci test |
|
@swift-ci test windows |
`_NSSwiftTimeZone` is the new Swift implementation of `NSTimeZone`.
kastiglione
force-pushed
the
dl/lldb-add-foundation._nsswifttimezone-support
branch
from
42c2556 to
666003e
Compare
|
@swift-ci test |
|
@swift-ci test windows |
kastiglione
deleted the
dl/lldb-add-foundation._nsswifttimezone-support
branch
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.
_NSSwiftTimeZoneis the new Swift implementation ofNSTimeZone.This is tested by
TestDataFormatterObjCNSDate.py, where the NSTimeZone summary string tests if run on macOS Sonoma, but with this change they pass.See #7073 for the infrastructure changes that this depends on.
rdar://108478831