Skip to content

Commit 56c9886

Browse files
committed
Hoist GetCompleteType from SwiftASTContext into TypeSystemSwift (NFC)
1 parent 69eb32c commit 56c9886

File tree

5 files changed

+3
-14
lines changed

5 files changed

+3
-14
lines changed

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5330,10 +5330,6 @@ SwiftASTContext::GetAllocationStrategy(opaque_compiler_type_t type) {
53305330
// Type Completion
53315331
//----------------------------------------------------------------------
53325332

5333-
bool SwiftASTContext::GetCompleteType(opaque_compiler_type_t type) {
5334-
return true;
5335-
}
5336-
53375333
ConstString SwiftASTContext::GetTypeName(opaque_compiler_type_t type) {
53385334
std::string type_name;
53395335
if (type) {

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -519,10 +519,6 @@ class SwiftASTContext : public TypeSystemSwift {
519519
const CompilerType &type, NonTriviallyManagedReferenceStrategy &strategy,
520520
CompilerType *underlying_type = nullptr);
521521

522-
// Type Completion
523-
524-
bool GetCompleteType(lldb::opaque_compiler_type_t type) override;
525-
526522
// AST related queries
527523

528524
uint32_t GetPointerByteSize() override;

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwift.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ class TypeSystemSwift : public TypeSystem {
159159
bool IsBeingDefined(lldb::opaque_compiler_type_t type) override {
160160
return false;
161161
}
162+
bool GetCompleteType(lldb::opaque_compiler_type_t type) override {
163+
return true;
164+
}
162165
bool CanPassInRegisters(const CompilerType &type) override {
163166
// FIXME: Implement this. There was an abort() here to figure out which
164167
// tests where hitting this code. At least TestSwiftReturns and

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,10 +1377,6 @@ bool TypeSystemSwiftTypeRef::IsVoidType(opaque_compiler_type_t type) {
13771377
};
13781378
VALIDATE_AND_RETURN(impl, IsVoidType, type, (ReconstructType(type)));
13791379
}
1380-
// Type Completion
1381-
bool TypeSystemSwiftTypeRef::GetCompleteType(opaque_compiler_type_t type) {
1382-
return m_swift_ast_context->GetCompleteType(ReconstructType(type));
1383-
}
13841380
// AST related queries
13851381
uint32_t TypeSystemSwiftTypeRef::GetPointerByteSize() {
13861382
return m_swift_ast_context->GetPointerByteSize();

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ class TypeSystemSwiftTypeRef : public TypeSystemSwift {
101101
bool IsPointerType(lldb::opaque_compiler_type_t type,
102102
CompilerType *pointee_type) override;
103103
bool IsVoidType(lldb::opaque_compiler_type_t type) override;
104-
// Type Completion
105-
bool GetCompleteType(lldb::opaque_compiler_type_t type) override;
106104
// AST related queries
107105
uint32_t GetPointerByteSize() override;
108106
// Accessors

0 commit comments

Comments
 (0)