Skip to content

Commit 5a1c3d2

Browse files
tromeynikic
authored andcommitted
Fix the build after the rebase
The rebase onto a later git master lldb required a change to RustASTContext.
1 parent a52ff6a commit 5a1c3d2

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

lldb/include/lldb/Symbol/RustASTContext.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ class RustASTContext : public TypeSystem {
268268
lldb::Format GetFormat(lldb::opaque_compiler_type_t type) override;
269269

270270
uint32_t GetNumChildren(lldb::opaque_compiler_type_t type,
271-
bool omit_empty_base_classes) override;
271+
bool omit_empty_base_classes,
272+
const ExecutionContext *exe_ctx) override;
272273

273274
lldb::BasicType
274275
GetBasicTypeEnumeration(lldb::opaque_compiler_type_t type) override;

lldb/source/Symbol/RustASTContext.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,22 +1407,23 @@ size_t RustASTContext::GetTypeBitAlign(lldb::opaque_compiler_type_t type) {
14071407
}
14081408

14091409
uint32_t RustASTContext::GetNumChildren(lldb::opaque_compiler_type_t type,
1410-
bool omit_empty_base_classes) {
1410+
bool omit_empty_base_classes,
1411+
const ExecutionContext *exe_ctx) {
14111412
if (!type)
14121413
return 0;
14131414

14141415
RustType *t = static_cast<RustType *>(type);
14151416
uint32_t result = 0;
14161417
if (RustPointer *ptr = t->AsPointer()) {
1417-
result = ptr->PointeeType().GetNumChildren(omit_empty_base_classes);
1418+
result = ptr->PointeeType().GetNumChildren(omit_empty_base_classes, exe_ctx);
14181419
// If the pointee is not an aggregate, return 1 because the
14191420
// pointer has a child. Not totally sure this makes sense.
14201421
if (result == 0)
14211422
result = 1;
14221423
} else if (RustArray *array = t->AsArray()) {
14231424
result = array->Length();
14241425
} else if (RustTypedef *typ = t->AsTypedef()) {
1425-
result = typ->UnderlyingType().GetNumChildren(omit_empty_base_classes);
1426+
result = typ->UnderlyingType().GetNumChildren(omit_empty_base_classes, exe_ctx);
14261427
} else if (RustAggregateBase *agg = t->AsAggregate()) {
14271428
result = agg->FieldCount();
14281429
}

0 commit comments

Comments
 (0)