diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2012-12-11 19:58:01 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2012-12-11 19:58:01 +0000 |
| commit | 34db84fdb092f89ea3678a0792074a5b9253829a (patch) | |
| tree | 7b6d659f93caa4f7238e2c3ec2eb5ee6f316d61d | |
| parent | 86f6cf6800fa7ea3669e057c56f3487c4da3ef46 (diff) | |
objective-C blocks: Check for record type when deciding if
byref variable requires extended layout info. to prevent
a crash involving arrays declared __block. // rdar://12787751
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@169908 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/AST/ASTContext.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGenObjC/block-byref-variable-layout.m | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 44f13b6906..f3fa13584d 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -4413,7 +4413,7 @@ bool ASTContext::getByrefLifetime(QualType Ty, return false; HasByrefExtendedLayout = false; - if (Ty->isAggregateType()) { + if (Ty->isRecordType()) { HasByrefExtendedLayout = true; LifeTime = Qualifiers::OCL_None; } diff --git a/test/CodeGenObjC/block-byref-variable-layout.m b/test/CodeGenObjC/block-byref-variable-layout.m index 6030661af4..9c8f6743be 100644 --- a/test/CodeGenObjC/block-byref-variable-layout.m +++ b/test/CodeGenObjC/block-byref-variable-layout.m @@ -40,3 +40,10 @@ int main() { }; c(); } + +// rdar://12787751 +typedef char mds_path_t[1024]; +void directVolumePerfWaitForStoreState() +{ + __block mds_path_t path; +} |