Skip to content

[lldb] Move reference related functions to TypeSystemSwift #3471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2021
Merged

[lldb] Move reference related functions to TypeSystemSwift #3471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6047,27 +6047,6 @@ SwiftASTContext::GetMemberFunctionAtIndex(opaque_compiler_type_t type,
return TypeMemberFunctionImpl();
}

CompilerType
SwiftASTContext::GetLValueReferenceType(opaque_compiler_type_t type) {
return {};
}

CompilerType
SwiftASTContext::GetRValueReferenceType(opaque_compiler_type_t type) {
return {};
}

CompilerType SwiftASTContext::GetNonReferenceType(opaque_compiler_type_t type) {
VALID_OR_RETURN_CHECK_TYPE(type, CompilerType());

swift::CanType swift_can_type(GetCanonicalSwiftType(type));

swift::LValueType *lvalue = swift_can_type->getAs<swift::LValueType>();
if (lvalue)
return ToCompilerType({lvalue->getObjectType().getPointer()});
return {};
}

CompilerType SwiftASTContext::GetPointeeType(opaque_compiler_type_t type) {
return {};
}
Expand Down
6 changes: 1 addition & 5 deletions lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,11 +737,7 @@ class SwiftASTContext : public TypeSystemSwift {
std::string GetSuperclassName(const CompilerType &superclass_type);
CompilerType
GetFullyUnqualifiedType(lldb::opaque_compiler_type_t type) override;
CompilerType GetNonReferenceType(lldb::opaque_compiler_type_t type) override;
CompilerType
GetLValueReferenceType(lldb::opaque_compiler_type_t type) override;
CompilerType
GetRValueReferenceType(lldb::opaque_compiler_type_t type) override;

uint32_t GetNumDirectBaseClasses(lldb::opaque_compiler_type_t type) override;
CompilerType GetDirectBaseClassAtIndex(lldb::opaque_compiler_type_t type,
size_t idx,
Expand Down
14 changes: 14 additions & 0 deletions lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwift.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,20 @@ class TypeSystemSwift : public TypeSystem {
const char *name, ExecutionContext *exe_ctx,
bool omit_empty_base_classes) override;

CompilerType
GetLValueReferenceType(lldb::opaque_compiler_type_t type) override {
return {};
}

CompilerType
GetRValueReferenceType(lldb::opaque_compiler_type_t type) override {
return {};
}

CompilerType GetNonReferenceType(lldb::opaque_compiler_type_t type) override {
return {};
}

/// \}
protected:
/// Used in the logs.
Expand Down
19 changes: 0 additions & 19 deletions lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3534,25 +3534,6 @@ TypeSystemSwiftTypeRef::GetFullyUnqualifiedType(opaque_compiler_type_t type) {
return swift_ast_context->GetFullyUnqualifiedType(ReconstructType(type));
return {};
}
CompilerType
TypeSystemSwiftTypeRef::GetNonReferenceType(opaque_compiler_type_t type) {
if (auto *swift_ast_context = GetSwiftASTContext())
return swift_ast_context->GetNonReferenceType(ReconstructType(type));
return {};
}
CompilerType
TypeSystemSwiftTypeRef::GetLValueReferenceType(opaque_compiler_type_t type) {
auto impl = []() { return CompilerType(); };
VALIDATE_AND_RETURN(impl, GetLValueReferenceType, type,
(ReconstructType(type)), (ReconstructType(type)));
}
CompilerType
TypeSystemSwiftTypeRef::GetRValueReferenceType(opaque_compiler_type_t type) {
auto impl = []() { return CompilerType(); };

VALIDATE_AND_RETURN(impl, GetRValueReferenceType, type,
(ReconstructType(type)), (ReconstructType(type)));
}
uint32_t
TypeSystemSwiftTypeRef::GetNumDirectBaseClasses(opaque_compiler_type_t type) {
if (auto *swift_ast_context = GetSwiftASTContext())
Expand Down
5 changes: 0 additions & 5 deletions lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,6 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
CompilerType GetTypedefedType(lldb::opaque_compiler_type_t type) override;
CompilerType
GetFullyUnqualifiedType(lldb::opaque_compiler_type_t type) override;
CompilerType GetNonReferenceType(lldb::opaque_compiler_type_t type) override;
CompilerType
GetLValueReferenceType(lldb::opaque_compiler_type_t type) override;
CompilerType
GetRValueReferenceType(lldb::opaque_compiler_type_t type) override;
uint32_t GetNumDirectBaseClasses(lldb::opaque_compiler_type_t type) override;
CompilerType GetDirectBaseClassAtIndex(lldb::opaque_compiler_type_t type,
size_t idx,
Expand Down