diff options
| author | Adrian Prantl <aprantl@apple.com> | 2013-09-26 21:35:50 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2013-09-26 21:35:50 +0000 |
| commit | 179af903d230fe454013d3f7a8b3afa86cec9942 (patch) | |
| tree | 1cbdc35c37987fe4b21f8d964498ac6fe8ec6e07 | |
| parent | 6440fcbee027344df3e8006ab4729c8f928d218a (diff) | |
| download | bcm5719-llvm-179af903d230fe454013d3f7a8b3afa86cec9942.tar.gz bcm5719-llvm-179af903d230fe454013d3f7a8b3afa86cec9942.zip | |
Debug info: Fix a crash when trying to construct a type with redundant
ownership qualifiers.
Fixes rdar://problem/14990656.
llvm-svn: 191463
| -rw-r--r-- | clang/lib/CodeGen/CGDebugInfo.cpp | 6 | ||||
| -rw-r--r-- | clang/test/CodeGenObjC/debug-info-lifetime-crash.m | 23 |
2 files changed, 28 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index eebafe40bb0..5e3d38284b2 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -1891,7 +1891,11 @@ llvm::DIType CGDebugInfo::CreateEnumType(const EnumType *Ty) { static QualType UnwrapTypeForDebugInfo(QualType T, const ASTContext &C) { Qualifiers Quals; do { - Quals += T.getLocalQualifiers(); + Qualifiers InnerQuals = T.getLocalQualifiers(); + // Qualifiers::operator+() doesn't like it if you add a Qualifier + // that is already there. + Quals += Qualifiers::removeCommonQualifiers(Quals, InnerQuals); + Quals += InnerQuals; QualType LastT = T; switch (T->getTypeClass()) { default: diff --git a/clang/test/CodeGenObjC/debug-info-lifetime-crash.m b/clang/test/CodeGenObjC/debug-info-lifetime-crash.m new file mode 100644 index 00000000000..90382010fb6 --- /dev/null +++ b/clang/test/CodeGenObjC/debug-info-lifetime-crash.m @@ -0,0 +1,23 @@ +// RUN: %clang_cc1 -cc1 -triple arm-apple-ios -emit-llvm -g -fblocks -fobjc-runtime=ios-7.0.0 -fobjc-arc %s -o - | FileCheck %s +// rdar://problem/14990656 +@protocol NSObject +- (id)copy; +@end +@class W; +@interface View1 +@end +@implementation Controller { + void (^Block)(void); +} +- (void)View:(View1 *)View foo:(W *)W +{ + // The debug type for these two will be identical, because we do not + // actually emit the ownership qualifier. + // CHECK-DAG: metadata !"weakSelf", metadata !{{[0-9]+}}, i32 [[@LINE+1]], metadata ![[SELFTY:[0-9]+]], i32 0, i32 0, {{.*}}} ; [ DW_TAG_auto_variable ] [weakSelf] + __attribute__((objc_ownership(weak))) __typeof(self) weakSelf = self; + Block = [^{ + // CHECK-DAG: metadata !"strongSelf", metadata !{{[0-9]+}}, i32 [[@LINE+1]], metadata ![[SELFTY]], i32 0, i32 0} ; [ DW_TAG_auto_variable ] [strongSelf] + __attribute__((objc_ownership(strong))) __typeof(self) strongSelf = weakSelf; + } copy]; +} +@end |
