Author: akirtzidis
Date: Mon Aug 24 14:50:45 2015
New Revision: 245867
URL: http://llvm.org/viewvc/llvm-project?rev=245867&view=rev
Log:
[libclang] For convenience to clients, make sure that nullability and __kindof
annotations do not hide
the underlying type.
rdar://22063577
Modified:
cfe/trunk/test/Index/get-cursor.m
cfe/trunk/test/Index/print-type.m
cfe/trunk/tools/libclang/CXType.cpp
Modified: cfe/trunk/test/Index/get-cursor.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/get-cursor.m?rev=245867&r1=245866&r2=245867&view=diff
==============================================================================
--- cfe/trunk/test/Index/get-cursor.m (original)
+++ cfe/trunk/test/Index/get-cursor.m Mon Aug 24 14:50:45 2015
@@ -112,6 +112,23 @@ void foo3(Test3 *test3) {
@property (retain) id propProp3;
@end
+@interface TestNullability
+@property (strong, nonnull) id prop1;
+@property (strong, nullable) id prop2;
+@end
+
+@implementation TestNullability
+- (void)meth {
+ TestNullability *o;
+ [o.prop1 meth];
+ [o.prop2 meth];
+ _Nullable id lo1;
+ _Nonnull id lo2;
+ [lo1 meth];
+ [lo2 meth];
+}
+@end
+
// RUN: c-index-test -cursor-at=%s:4:28 -cursor-at=%s:5:28 %s | FileCheck
-check-prefix=CHECK-PROP %s
// CHECK-PROP: ObjCPropertyDecl=foo1:4:26
@@ -170,3 +187,9 @@ void foo3(Test3 *test3) {
// CHECK-OBJCOPTIONAL: 108:23 ObjCPropertyDecl=propProp2:108:23 (@optional)
[retain,] Extent=[108:1 - 108:32]
// CHECK-OBJCOPTIONAL: 111:8 ObjCInstanceMethodDecl=protMeth3:111:8
Extent=[111:1 - 111:18]
// CHECK-OBJCOPTIONAL: 112:23 ObjCPropertyDecl=propProp3:112:23 [retain,]
Extent=[112:1 - 112:32]
+
+// RUN: c-index-test -cursor-at=%s:123:12 %s | FileCheck
-check-prefix=CHECK-RECEIVER-WITH-NULLABILITY %s
+// RUN: c-index-test -cursor-at=%s:124:12 %s | FileCheck
-check-prefix=CHECK-RECEIVER-WITH-NULLABILITY %s
+// RUN: c-index-test -cursor-at=%s:127:8 %s | FileCheck
-check-prefix=CHECK-RECEIVER-WITH-NULLABILITY %s
+// RUN: c-index-test -cursor-at=%s:128:8 %s | FileCheck
-check-prefix=CHECK-RECEIVER-WITH-NULLABILITY %s
+// CHECK-RECEIVER-WITH-NULLABILITY: Receiver-type=ObjCId
Modified: cfe/trunk/test/Index/print-type.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/print-type.m?rev=245867&r1=245866&r2=245867&view=diff
==============================================================================
--- cfe/trunk/test/Index/print-type.m (original)
+++ cfe/trunk/test/Index/print-type.m Mon Aug 24 14:50:45 2015
@@ -3,6 +3,7 @@
-(int) mymethod;
-(const id) mymethod2:(id)x blah:(Class)y boo:(SEL)z;
-(bycopy)methodIn:(in int)i andOut:(out short *)j , ...;
+-(void)kindof_meth:(__kindof Foo *)p;
@end
// RUN: c-index-test -test-print-type %s | FileCheck %s
@@ -13,3 +14,4 @@
// CHECK: ObjCInstanceMethodDecl=methodIn:andOut::5:10 (variadic) [Bycopy,]
[type=] [typekind=Invalid] [resulttype=id] [resulttypekind=ObjCId] [args= [int]
[Int] [short *] [Pointer]] [isPOD=0]
// CHECK: ParmDecl=i:5:27 (Definition) [In,] [type=int] [typekind=Int]
[isPOD=1]
// CHECK: ParmDecl=j:5:49 (Definition) [Out,] [type=short *]
[typekind=Pointer] [isPOD=1] [pointeetype=short] [pointeekind=Short]
+// CHECK: ParmDecl=p:6:36 (Definition) [type=__kindof Foo *]
[typekind=ObjCObjectPointer] [canonicaltype=__kindof Foo *]
[canonicaltypekind=ObjCObjectPointer] [isPOD=1] [pointeetype=Foo]
[pointeekind=ObjCInterface]
Modified: cfe/trunk/tools/libclang/CXType.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CXType.cpp?rev=245867&r1=245866&r2=245867&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CXType.cpp (original)
+++ cfe/trunk/tools/libclang/CXType.cpp Mon Aug 24 14:50:45 2015
@@ -101,6 +101,11 @@ CXType cxtype::MakeCXType(QualType T, CX
CXTypeKind TK = CXType_Invalid;
if (TU && !T.isNull()) {
+ // Handle attributed types as the original type
+ if (auto *ATT = T->getAs<AttributedType>()) {
+ return MakeCXType(ATT->getModifiedType(), TU);
+ }
+
ASTContext &Ctx = cxtu::getASTUnit(TU)->getASTContext();
if (Ctx.getLangOpts().ObjC1) {
QualType UnqualT = T.getUnqualifiedType();
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
