maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CodeGen] Add support for IncompleteArrayType in Obj-C ivars. 

Fixes an assertion failure when ivar is a struct containing incomplete
array. Also completes support for direct flexible array members.

rdar://problem/21054495

Reviewers: rjmccall, theraven

Reviewed By: rjmccall

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D38774

llvm-svn: 316723
This commit is contained in:
Volodymyr Sapsai 2017-10-27 00:56:23 +00:00
parent 145090f124
commit 636ed47428
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5084,6 +5084,11 @@ void IvarLayoutBuilder::visitField(const FieldDecl *field,
// Drill down into arrays.
uint64_t numElts = 1;
if (auto arrayType = CGM.getContext().getAsIncompleteArrayType(fieldType)) {
numElts = 0;
fieldType = arrayType->getElementType();
}
// Unlike incomplete arrays, constant arrays can be nested.
while (auto arrayType = CGM.getContext().getAsConstantArrayType(fieldType)) {
numElts *= arrayType->getSize().getZExtValue();
fieldType = arrayType->getElementType();

28
clang/test/CodeGenObjC/ivar-layout-flexible-array.m Normal file
View File

@ -0,0 +1,28 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin -Wno-objc-root-class -fobjc-arc -emit-llvm -o - %s | FileCheck %s
// rdar://problem/21054495
@interface FlexibleArrayMember {
char flexible_array[][4][2];
}
@end
@implementation FlexibleArrayMember
@end
// CHECK: @OBJC_METH_VAR_NAME_{{.*}} = private unnamed_addr constant {{.*}} c"flexible_array\00"
// CHECK-NEXT: @OBJC_METH_VAR_TYPE_{{.*}} = private unnamed_addr constant {{.*}} c"^[4[2c]]\00"
typedef char FlexibleArray[];
struct Packet {
int size;
FlexibleArray data;
};
@interface VariableSizeIvar {
struct Packet flexible_struct;
}
@end
@implementation VariableSizeIvar
@end
// CHECK: @OBJC_METH_VAR_NAME_{{.*}} = private unnamed_addr constant {{.*}} c"flexible_struct\00"
// CHECK-NEXT: @OBJC_METH_VAR_TYPE_{{.*}} = private unnamed_addr constant {{.*}} c"{Packet=\22size\22i\22data\22[0c]}\00"