[lldb] Try Clang fallback in TSSwiftTypeRef::GetNumFields #6671
Conversation
|
@swift-ci test Linux |
|
@swift-ci test Windows |
|
@swift-ci test |
kastiglione
changed the title
kastiglione
force-pushed
the
dl/lldb-try-clang-fallback-tssswifttyperef-getnumfields
branch
from
aafc6cc to
02d5ada
Compare
|
@swift-ci test |
|
@swift-ci test windows |
| // Imported ObjC types are treated as having no fields. | ||
| return 0; | ||
| default: | ||
| return clang_type.GetNumFields(); |
There was a problem hiding this comment.
I suppose the validation macro should tell us if these assumptions are wrong?
There was a problem hiding this comment.
Yes, they did their job when I wrote this. At first I tried returning 0 for all clang types, but that broke some tests and allowed me to tweak this logic.
There was a problem hiding this comment.
We already talked about this offline, but in case anyone else is reading this — it would be good to understand why this doesn't already work via the GetSwiftRuntimeTypeInfo -> LLDBTypeInfoProvider code path.
There was a problem hiding this comment.
@adrian-prantl The typeref for imported objc classes is ObjCClassTypeRef, ex:
(swift::reflection::ObjCClassTypeRef *) tr = 0x00006000029d5a10 {
swift::reflection::TypeRef = (Kind = ObjCClass)
Name = "NSApplication"
}
However, the TypeInfoProvider is currently used from NominalTypeRef and BoundGenericTypeRef.
See visitAnyNominalTypeRef https://github.com/apple/swift/blob/022311e438e7703c46e400ba01882ccb5a1236ca/stdlib/public/RemoteInspection/TypeLowering.cpp#L2302-L2379.
kastiglione
changed the title
|
@swift-ci test |
|
@adrian-prantl I've refactored this a bit, and handle the case where a type is known to be imported, but has no type info (such as for private/internal types). |
|
@swift-ci test windows |
| } | ||
| } else if (is_imported) { | ||
| // A known imported type, but where clang has no info. Return early to | ||
| // avoid loading Swift ASTContexts, only to return the same zero value. |
|
@swift-ci test |
|
@swift-ci test windows |
1 similar comment
|
@swift-ci test windows |
kastiglione
deleted the
dl/lldb-try-clang-fallback-tssswifttyperef-getnumfields
branch
For Clang types, avoid loading Swift ASTContexts in `TypeSystemSwiftTypeRef::GetNumFields`. This new logic checks if a type is an imported Clang type. If it's imported, but no type info is available (ex private/internal types), then zero is returned. If a Clang type is available, then, depending on the type class, return the Clang type's `GetNumFields`. Note that there's logic to avoid calling `GetNumFields` on ObjC types. This is to match the current behavior. (cherry picked from commit 80c77db)
) For Clang types, avoid loading Swift ASTContexts in `TypeSystemSwiftTypeRef::GetNumFields`. This new logic checks if a type is an imported Clang type. If it's imported, but no type info is available (ex private/internal types), then zero is returned. If a Clang type is available, then, depending on the type class, return the Clang type's `GetNumFields`. Note that there's logic to avoid calling `GetNumFields` on ObjC types. This is to match the current behavior. (cherry picked from commit 80c77db)
For Clang types, avoid loading Swift ASTContexts in
TypeSystemSwiftTypeRef::GetNumFields.This new logic checks if a type is an imported Clang type. If it's imported, but no type info is available (ex private/internal types), then zero is returned. If a Clang type is available, then, depending on the type class, return the Clang type's
GetNumFields.Note that there's logic to avoid calling
GetNumFieldson ObjC types. This is to match the current behavior.