Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-22 15:31:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[objc_direct] do not add direct properties to the serialization array

Browse Source 
If we do, then the property_list_t length is wrong
and class_getProperty gets very sad.

Signed-off-by: Pierre Habouzit <phabouzit@apple.com>
Radar-Id: rdar://problem/58804805
Differential Revision: https://reviews.llvm.org/D73219
This commit is contained in:
Pierre Habouzit 2020-01-22 12:08:19 -08:00
parent 7596d3c50c
commit 52311d0483
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/CodeGen/CGObjCMac.cpp
View File

@ -3291,6 +3291,8 @@ llvm::Constant *CGObjCCommonMac::EmitPropertyList(Twine Name,
for (auto *PD : ClassExt->properties()) {
if (IsClassProperty != PD->isClassProperty())
continue;
if (PD->isDirectProperty())
continue;
PropertySet.insert(PD->getIdentifier());
Properties.push_back(PD);
}
@ -3302,6 +3304,8 @@ llvm::Constant *CGObjCCommonMac::EmitPropertyList(Twine Name,
// class extension.
if (!PropertySet.insert(PD->getIdentifier()).second)
continue;
if (PD->isDirectProperty())
continue;
Properties.push_back(PD);
}
@ -3327,8 +3331,6 @@ llvm::Constant *CGObjCCommonMac::EmitPropertyList(Twine Name,
values.addInt(ObjCTypes.IntTy, Properties.size());
auto propertiesArray = values.beginArray(ObjCTypes.PropertyTy);
for (auto PD : Properties) {
if (PD->isDirectProperty())
continue;
auto property = propertiesArray.beginStruct(ObjCTypes.PropertyTy);
property.add(GetPropertyName(PD->getIdentifier()));
property.add(GetPropertyTypeString(PD, Container));

23
clang/test/CodeGenObjC/direct-properties.m Normal file
View File

@ -0,0 +1,23 @@
// RUN: %clang_cc1 -emit-llvm -fobjc-arc -triple x86_64-apple-darwin10 %s -o - | FileCheck %s
__attribute__((objc_root_class))
@interface A
@property(direct, readonly) int i;
@end
__attribute__((objc_root_class))
@interface B
@property(direct, readonly) int i;
@property(readonly) int j;
@end
// CHECK-NOT: @"__OBJC_$_PROP_LIST_A"
@implementation A
@synthesize i = _i;
@end
// CHECK: @"_OBJC_$_PROP_LIST_B" = internal global { i32, i32, [1 x %struct._prop_t] } { i32 16, i32 1
@implementation B
@synthesize i = _i;
@synthesize j = _j;
@end