diff options
| -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; +} |