File tree Expand file tree Collapse file tree 4 files changed +9
-15
lines changed Expand file tree Collapse file tree 4 files changed +9
-15
lines changed Original file line number Diff line number Diff line change @@ -259,7 +259,7 @@ _dynamicCastClassMetatype(const ClassMetadata *sourceType,
259
259
if (sourceType == targetType) {
260
260
return sourceType;
261
261
}
262
- sourceType = _swift_getSuperclass ( sourceType) ;
262
+ sourceType = sourceType-> SuperClass ;
263
263
} while (sourceType);
264
264
265
265
return nullptr ;
Original file line number Diff line number Diff line change @@ -116,11 +116,6 @@ namespace swift {
116
116
LLVM_LIBRARY_VISIBILITY
117
117
const ClassMetadata *_swift_getClass (const void *object);
118
118
119
- static inline
120
- const ClassMetadata *_swift_getSuperclass (const ClassMetadata *theClass) {
121
- return theClass->SuperClass ;
122
- }
123
-
124
119
LLVM_LIBRARY_VISIBILITY
125
120
bool usesNativeSwiftReferenceCounting (const ClassMetadata *theClass);
126
121
Original file line number Diff line number Diff line change @@ -761,14 +761,14 @@ void swift_ClassMirror_subscript(String *outString,
761
761
intptr_t swift_ObjCMirror_count(HeapObject *owner,
762
762
const OpaqueValue *value,
763
763
const Metadata *type) {
764
- auto isa = (Class )type;
764
+ auto isa = (const ClassMetadata * )type;
765
765
766
766
unsigned count = 0 ;
767
767
// ObjC makes no guarantees about the state of ivars, so we can't safely
768
768
// introspect them in the general case.
769
769
770
770
// The superobject counts as a child.
771
- if (_swift_getSuperclass (( const ClassMetadata*) isa) )
771
+ if (isa-> SuperClass )
772
772
count += 1 ;
773
773
774
774
swift_release (owner);
@@ -790,7 +790,7 @@ void swift_ObjCMirror_subscript(String *outString,
790
790
auto isa = (Class )type;
791
791
792
792
// If there's a superclass, it becomes the first child.
793
- if (auto sup = ( Class ) _swift_getSuperclass (( const ClassMetadata*) isa)) {
793
+ if (auto sup = class_getSuperclass ( isa)) {
794
794
if (i == 0 ) {
795
795
const char *supName = class_getName (sup);
796
796
new (outString) String (supName, strlen (supName));
Original file line number Diff line number Diff line change @@ -198,15 +198,14 @@ - (Class)class {
198
198
return _swift_getObjCClassOfAllocated (self);
199
199
}
200
200
+ (Class )superclass {
201
- return class_const_cast ( _swift_getSuperclass ((const ClassMetadata*) self)) ;
201
+ return ( Class ) ((const ClassMetadata*) self)-> SuperClass ;
202
202
}
203
203
- (Class )superclass {
204
- return
205
- class_const_cast (_swift_getSuperclass (_swift_getClassOfAllocated (self)));
204
+ return (Class )_swift_getClassOfAllocated (self)->SuperClass ;
206
205
}
207
206
208
207
+ (BOOL )isMemberOfClass : (Class )cls {
209
- return cls == _swift_getObjCClassOfAllocated (self);
208
+ return cls == _swift_getObjCClassOfAllocated (self);
210
209
}
211
210
212
211
- (BOOL )isMemberOfClass : (Class )cls {
@@ -293,7 +292,7 @@ - (void)dealloc {
293
292
294
293
- (BOOL )isKindOfClass : (Class )someClass {
295
294
for (auto cls = _swift_getClassOfAllocated (self); cls != nullptr ;
296
- cls = _swift_getSuperclass ( cls) )
295
+ cls = cls-> SuperClass )
297
296
if (cls == (const ClassMetadata*) someClass)
298
297
return YES ;
299
298
@@ -302,7 +301,7 @@ - (BOOL)isKindOfClass:(Class)someClass {
302
301
303
302
+ (BOOL )isSubclassOfClass : (Class )someClass {
304
303
for (auto cls = (const ClassMetadata*) self; cls != nullptr ;
305
- cls = _swift_getSuperclass ( cls) )
304
+ cls = cls-> SuperClass )
306
305
if (cls == (const ClassMetadata*) someClass)
307
306
return YES ;
308
307
You can’t perform that action at this time.
0 commit comments