@@ -5302,16 +5302,12 @@ lldb::Format TypeSystemClang::GetFormat(lldb::opaque_compiler_type_t type) {
5302
5302
return lldb::eFormatBytes;
5303
5303
}
5304
5304
5305
- static bool ObjCDeclHasIVars (clang::ObjCInterfaceDecl *class_interface_decl,
5306
- bool check_superclass) {
5305
+ static bool ObjCDeclHasIVars (clang::ObjCInterfaceDecl *class_interface_decl) {
5307
5306
while (class_interface_decl) {
5308
5307
if (class_interface_decl->ivar_size () > 0 )
5309
5308
return true ;
5310
5309
5311
- if (check_superclass)
5312
- class_interface_decl = class_interface_decl->getSuperClass ();
5313
- else
5314
- break ;
5310
+ class_interface_decl = class_interface_decl->getSuperClass ();
5315
5311
}
5316
5312
return false ;
5317
5313
}
@@ -5386,7 +5382,7 @@ TypeSystemClang::GetNumChildren(lldb::opaque_compiler_type_t type,
5386
5382
class_interface_decl->getSuperClass ();
5387
5383
if (superclass_interface_decl) {
5388
5384
if (omit_empty_base_classes) {
5389
- if (ObjCDeclHasIVars (superclass_interface_decl, true ))
5385
+ if (ObjCDeclHasIVars (superclass_interface_decl))
5390
5386
++num_children;
5391
5387
} else
5392
5388
++num_children;
@@ -6840,7 +6836,7 @@ size_t TypeSystemClang::GetIndexOfChildMemberWithName(
6840
6836
if (ivar_decl->getName () == name_sref) {
6841
6837
if ((!omit_empty_base_classes && superclass_interface_decl) ||
6842
6838
(omit_empty_base_classes &&
6843
- ObjCDeclHasIVars (superclass_interface_decl, true )))
6839
+ ObjCDeclHasIVars (superclass_interface_decl)))
6844
6840
++child_idx;
6845
6841
6846
6842
child_indexes.push_back (child_idx);
@@ -6996,7 +6992,7 @@ TypeSystemClang::GetIndexOfChildWithName(lldb::opaque_compiler_type_t type,
6996
6992
if (ivar_decl->getName () == name) {
6997
6993
if ((!omit_empty_base_classes && superclass_interface_decl) ||
6998
6994
(omit_empty_base_classes &&
6999
- ObjCDeclHasIVars (superclass_interface_decl, true )))
6995
+ ObjCDeclHasIVars (superclass_interface_decl)))
7000
6996
++child_idx;
7001
6997
7002
6998
return child_idx;
@@ -8117,14 +8113,6 @@ bool TypeSystemClang::AddObjCClassProperty(
8117
8113
return true ;
8118
8114
}
8119
8115
8120
- bool TypeSystemClang::IsObjCClassTypeAndHasIVars (const CompilerType &type,
8121
- bool check_superclass) {
8122
- clang::ObjCInterfaceDecl *class_interface_decl = GetAsObjCInterfaceDecl (type);
8123
- if (class_interface_decl)
8124
- return ObjCDeclHasIVars (class_interface_decl, check_superclass);
8125
- return false ;
8126
- }
8127
-
8128
8116
clang::ObjCMethodDecl *TypeSystemClang::AddMethodToObjCObjectType (
8129
8117
const CompilerType &type,
8130
8118
const char *name, // the full symbol name as seen in the symbol table
0 commit comments