Author: adrian
Date: Thu Sep 26 16:35:50 2013
New Revision: 191463
URL: http://llvm.org/viewvc/llvm-project?rev=191463&view=rev
Log:
Debug info: Fix a crash when trying to construct a type with redundant
ownership qualifiers.
Fixes rdar://problem/14990656.
Added:
cfe/trunk/test/CodeGenObjC/debug-info-lifetime-crash.m
Modified:
cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=191463&r1=191462&r2=191463&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Thu Sep 26 16:35:50 2013
@@ -1891,7 +1891,11 @@ llvm::DIType CGDebugInfo::CreateEnumType
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:
Added: cfe/trunk/test/CodeGenObjC/debug-info-lifetime-crash.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/debug-info-lifetime-crash.m?rev=191463&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenObjC/debug-info-lifetime-crash.m (added)
+++ cfe/trunk/test/CodeGenObjC/debug-info-lifetime-crash.m Thu Sep 26 16:35:50
2013
@@ -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
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
