Mark objc methods that are implicitly declared for properties (not user-declared) as implicit.
This results in libclang ignoring such methods. llvm-svn: 137852
This commit is contained in:
Argyrios Kyrtzidis
parent
14208800fa
commit
004df6e053
|
|
@ -172,6 +172,7 @@ private:
|
|||
bool isInstance = true,
|
||||
bool isVariadic = false,
|
||||
bool isSynthesized = false,
|
||||
bool isImplicitlyDeclared = false,
|
||||
bool isDefined = false,
|
||||
ImplementationControl impControl = None,
|
||||
bool HasRelatedResultType = false,
|
||||
|
|
@ -184,7 +185,9 @@ private:
|
|||
DeclImplementation(impControl), objcDeclQualifier(OBJC_TQ_None),
|
||||
RelatedResultType(HasRelatedResultType), NumSelectorArgs(numSelectorArgs),
|
||||
MethodDeclType(T), ResultTInfo(ResultTInfo),
|
||||
EndLoc(endLoc), Body(0), SelfDecl(0), CmdDecl(0) {}
|
||||
EndLoc(endLoc), Body(0), SelfDecl(0), CmdDecl(0) {
|
||||
setImplicit(isImplicitlyDeclared);
|
||||
}
|
||||
|
||||
/// \brief A definition will return its interface declaration.
|
||||
/// An interface declaration will return its definition.
|
||||
|
|
@ -201,6 +204,7 @@ public:
|
|||
bool isInstance = true,
|
||||
bool isVariadic = false,
|
||||
bool isSynthesized = false,
|
||||
bool isImplicitlyDeclared = false,
|
||||
bool isDefined = false,
|
||||
ImplementationControl impControl = None,
|
||||
bool HasRelatedResultType = false,
|
||||
|
|
|
|||
|
|
@ -2928,6 +2928,7 @@ Decl *ASTNodeImporter::VisitObjCMethodDecl(ObjCMethodDecl *D) {
|
|||
D->isInstanceMethod(),
|
||||
D->isVariadic(),
|
||||
D->isSynthesized(),
|
||||
D->isImplicit(),
|
||||
D->isDefined(),
|
||||
D->getImplementationControl(),
|
||||
D->hasRelatedResultType());
|
||||
|
|
|
|||
|
|
@ -337,6 +337,7 @@ ObjCMethodDecl *ObjCMethodDecl::Create(ASTContext &C,
|
|||
bool isInstance,
|
||||
bool isVariadic,
|
||||
bool isSynthesized,
|
||||
bool isImplicitlyDeclared,
|
||||
bool isDefined,
|
||||
ImplementationControl impControl,
|
||||
bool HasRelatedResultType,
|
||||
|
|
@ -344,7 +345,8 @@ ObjCMethodDecl *ObjCMethodDecl::Create(ASTContext &C,
|
|||
return new (C) ObjCMethodDecl(beginLoc, endLoc,
|
||||
SelInfo, T, ResultTInfo, contextDecl,
|
||||
isInstance,
|
||||
isVariadic, isSynthesized, isDefined,
|
||||
isVariadic, isSynthesized, isImplicitlyDeclared,
|
||||
isDefined,
|
||||
impControl,
|
||||
HasRelatedResultType,
|
||||
numSelectorArgs);
|
||||
|
|
|
|||
|
|
@ -2138,8 +2138,10 @@ void CodeGenModule::EmitObjCIvarInitializations(ObjCImplementationDecl *D) {
|
|||
Selector cxxSelector = getContext().Selectors.getSelector(0, &II);
|
||||
ObjCMethodDecl *DTORMethod =
|
||||
ObjCMethodDecl::Create(getContext(), D->getLocation(), D->getLocation(),
|
||||
cxxSelector, getContext().VoidTy, 0, D, true,
|
||||
false, true, false, ObjCMethodDecl::Required);
|
||||
cxxSelector, getContext().VoidTy, 0, D,
|
||||
/*isInstance=*/true, /*isVariadic=*/false,
|
||||
/*isSynthesized=*/true, /*isImplicitlyDeclared=*/true,
|
||||
/*isDefined=*/false, ObjCMethodDecl::Required);
|
||||
D->addInstanceMethod(DTORMethod);
|
||||
CodeGenFunction(*this).GenerateObjCCtorDtorMethod(D, DTORMethod, false);
|
||||
D->setHasCXXStructors(true);
|
||||
|
|
@ -2157,7 +2159,11 @@ void CodeGenModule::EmitObjCIvarInitializations(ObjCImplementationDecl *D) {
|
|||
D->getLocation(),
|
||||
D->getLocation(), cxxSelector,
|
||||
getContext().getObjCIdType(), 0,
|
||||
D, true, false, true, false,
|
||||
D, /*isInstance=*/true,
|
||||
/*isVariadic=*/false,
|
||||
/*isSynthesized=*/true,
|
||||
/*isImplicitlyDeclared=*/true,
|
||||
/*isDefined=*/false,
|
||||
ObjCMethodDecl::Required);
|
||||
D->addInstanceMethod(CTORMethod);
|
||||
CodeGenFunction(*this).GenerateObjCCtorDtorMethod(D, CTORMethod, true);
|
||||
|
|
|
|||
|
|
@ -2466,7 +2466,8 @@ Decl *Sema::ActOnMethodDeclaration(
|
|||
ResultTInfo,
|
||||
cast<DeclContext>(ClassDecl),
|
||||
MethodType == tok::minus, isVariadic,
|
||||
false, false,
|
||||
/*isSynthesized=*/false,
|
||||
/*isImplicitlyDeclared=*/false, /*isDefined=*/false,
|
||||
MethodDeclKind == tok::objc_optional
|
||||
? ObjCMethodDecl::Optional
|
||||
: ObjCMethodDecl::Required,
|
||||
|
|
|
|||
|
|
@ -1489,8 +1489,9 @@ void Sema::ProcessPropertyDecl(ObjCPropertyDecl *property,
|
|||
|
||||
GetterMethod = ObjCMethodDecl::Create(Context, Loc, Loc,
|
||||
property->getGetterName(),
|
||||
property->getType(), 0, CD, true, false, true,
|
||||
false,
|
||||
property->getType(), 0, CD, /*isInstance=*/true,
|
||||
/*isVariadic=*/false, /*isSynthesized=*/true,
|
||||
/*isImplicitlyDeclared=*/true, /*isDefined=*/false,
|
||||
(property->getPropertyImplementation() ==
|
||||
ObjCPropertyDecl::Optional) ?
|
||||
ObjCMethodDecl::Optional :
|
||||
|
|
@ -1526,7 +1527,10 @@ void Sema::ProcessPropertyDecl(ObjCPropertyDecl *property,
|
|||
SetterMethod =
|
||||
ObjCMethodDecl::Create(Context, Loc, Loc,
|
||||
property->getSetterName(), Context.VoidTy, 0,
|
||||
CD, true, false, true, false,
|
||||
CD, /*isInstance=*/true, /*isVariadic=*/false,
|
||||
/*isSynthesized=*/true,
|
||||
/*isImplicitlyDeclared=*/true,
|
||||
/*isDefined=*/false,
|
||||
(property->getPropertyImplementation() ==
|
||||
ObjCPropertyDecl::Optional) ?
|
||||
ObjCMethodDecl::Optional :
|
||||
|
|
|
|||
|
|
@ -157,7 +157,3 @@ struct X0 {};
|
|||
|
||||
// CHECK: <invalid loc>:0:0: attribute(iboutlet)=
|
||||
// CHECK: c-index-api-loadTU-test.m:75:29: TypeRef=id:0:0 Extent=[75:29 - 75:31]
|
||||
// CHECK: c-index-api-loadTU-test.m:75:32: ObjCInstanceMethodDecl=anotherOutlet:75:32 Extent=[75:32 - 75:45]
|
||||
// CHECK: c-index-api-loadTU-test.m:75:32: ObjCInstanceMethodDecl=setAnotherOutlet::75:32 Extent=[75:32 - 75:45]
|
||||
// CHECK: c-index-api-loadTU-test.m:75:32: ParmDecl=anotherOutlet:75:32 (Definition) Extent=[75:32 - 75:45]
|
||||
|
||||
|
|
|
|||
|
|
@ -12,10 +12,26 @@
|
|||
}
|
||||
@end
|
||||
|
||||
// RUN: c-index-test -cursor-at=%s:4:28 %s | FileCheck -check-prefix=CHECK-PROP1 %s
|
||||
// RUN: c-index-test -cursor-at=%s:5:28 %s | FileCheck -check-prefix=CHECK-PROP2 %s
|
||||
// CHECK-PROP1: ObjCPropertyDecl=foo1:4:26
|
||||
// CHECK-PROP2: ObjCPropertyDecl=foo2:5:27
|
||||
@interface Test1 {
|
||||
id _name;
|
||||
}
|
||||
@end
|
||||
@interface Test1 ()
|
||||
- (id)name;
|
||||
@end
|
||||
@interface Test1 ()
|
||||
@property (copy) id name;
|
||||
@end
|
||||
@implementation Test1
|
||||
@synthesize name = _name;
|
||||
@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
|
||||
// CHECK-PROP: ObjCPropertyDecl=foo2:5:27
|
||||
|
||||
// RUN: c-index-test -cursor-at=%s:11:11 %s -ccc-host-triple x86_64-apple-macosx10.7.0 | FileCheck -check-prefix=CHECK-WITH-WEAK %s
|
||||
// CHECK-WITH-WEAK: ObjCClassRef=Foo:8:8
|
||||
|
||||
// RUN: c-index-test -cursor-at=%s:20:10 %s | FileCheck -check-prefix=CHECK-METHOD %s
|
||||
// CHECK-METHOD: ObjCInstanceMethodDecl=name:20:1
|
||||
|
|
|
|||
|
|
@ -49,33 +49,24 @@
|
|||
// CHECK: properties-class-extensions.m:5:12: ObjCCategoryDecl=Cat:5:12 Extent=[5:1 - 7:5]
|
||||
// CHECK: properties-class-extensions.m:5:12: ObjCClassRef=Foo:4:12 Extent=[5:12 - 5:15]
|
||||
// CHECK: properties-class-extensions.m:6:15: ObjCPropertyDecl=a:6:15 Extent=[6:1 - 6:16]
|
||||
// CHECK: properties-class-extensions.m:6:15: ObjCInstanceMethodDecl=a:6:15 Extent=[6:15 - 6:16]
|
||||
// CHECK: properties-class-extensions.m:6:15: ObjCInstanceMethodDecl=setA::6:15 Extent=[6:15 - 6:16]
|
||||
// CHECK: properties-class-extensions.m:6:15: ParmDecl=a:6:15 (Definition) Extent=[6:15 - 6:16]
|
||||
// CHECK: properties-class-extensions.m:8:12: ObjCCategoryDecl=:8:12 Extent=[8:1 - 11:5]
|
||||
// CHECK: properties-class-extensions.m:8:12: ObjCClassRef=Foo:4:12 Extent=[8:12 - 8:15]
|
||||
// CHECK: properties-class-extensions.m:9:15: ObjCPropertyDecl=b:9:15 Extent=[9:1 - 9:16]
|
||||
// CHECK: properties-class-extensions.m:9:15: ObjCInstanceMethodDecl=b:9:15 Extent=[9:15 - 9:16]
|
||||
// CHECK: properties-class-extensions.m:9:15: ObjCInstanceMethodDecl=setB::9:15 Extent=[9:15 - 9:16]
|
||||
// CHECK: properties-class-extensions.m:9:15: ParmDecl=b:9:15 (Definition) Extent=[9:15 - 9:16]
|
||||
// CHECK: properties-class-extensions.m:10:1: ObjCInstanceMethodDecl=bar:10:1 Extent=[10:1 - 10:14]
|
||||
// CHECK: properties-class-extensions.m:15:12: ObjCInterfaceDecl=Bar:15:12 Extent=[15:1 - 17:5]
|
||||
// CHECK: properties-class-extensions.m:16:25: ObjCPropertyDecl=bar:16:25 Extent=[16:1 - 16:28]
|
||||
// CHECK: properties-class-extensions.m:16:22: TypeRef=id:0:0 Extent=[16:22 - 16:24]
|
||||
// CHECK: properties-class-extensions.m:16:25: ObjCInstanceMethodDecl=bar:16:25 Extent=[16:25 - 16:28]
|
||||
// CHECK: properties-class-extensions.m:18:12: ObjCCategoryDecl=:18:12 Extent=[18:1 - 20:5]
|
||||
// CHECK: properties-class-extensions.m:18:12: ObjCClassRef=Bar:15:12 Extent=[18:12 - 18:15]
|
||||
// CHECK: properties-class-extensions.m:19:26: ObjCPropertyDecl=bar:19:26 Extent=[19:1 - 19:29]
|
||||
// CHECK: properties-class-extensions.m:19:23: TypeRef=id:0:0 Extent=[19:23 - 19:25]
|
||||
// CHECK-NOT: properties-class-extensions.m:16:25: ObjCInstanceMethodDecl=bar:16:25 Extent=[16:25 - 16:28]
|
||||
// CHECK: properties-class-extensions.m:19:26: ObjCInstanceMethodDecl=setBar::19:26 Extent=[19:26 - 19:29]
|
||||
// CHECK: properties-class-extensions.m:19:26: ParmDecl=bar:19:26 (Definition) Extent=[19:26 - 19:29]
|
||||
// CHECK-NOT: properties-class-extensions.m:19:26: ObjCInstanceMethodDecl=setBar::19:26 Extent=[19:26 - 19:29]
|
||||
// CHECK: properties-class-extensions.m:24:1: UnexposedDecl=[24:8] Extent=[24:1 - 24:23]
|
||||
// CHECK: properties-class-extensions.m:24:8: ObjCClassRef=Rdar8467189_Bar:24:8 Extent=[24:8 - 24:23]
|
||||
// CHECK: properties-class-extensions.m:25:1: ObjCProtocolDecl=Rdar8467189_FooProtocol:25:1 (Definition) Extent=[25:1 - 27:5]
|
||||
// CHECK: properties-class-extensions.m:26:39: ObjCPropertyDecl=Rdar8467189_Bar:26:39 Extent=[26:1 - 26:54]
|
||||
// CHECK: properties-class-extensions.m:26:22: ObjCClassRef=Rdar8467189_Bar:24:8 Extent=[26:22 - 26:37]
|
||||
// CHECK: properties-class-extensions.m:26:39: ObjCInstanceMethodDecl=Rdar8467189_Bar:26:39 Extent=[26:39 - 26:54]
|
||||
// CHECK: properties-class-extensions.m:28:12: ObjCInterfaceDecl=Rdar8467189_Foo:28:12 Extent=[28:1 - 29:5]
|
||||
// CHECK: properties-class-extensions.m:28:29: ObjCProtocolRef=Rdar8467189_FooProtocol:25:1 Extent=[28:29 - 28:52]
|
||||
// CHECK-NOT: properties-class-extensions.m:31:40: ObjCPropertyDecl=Rdar8467189_Bar:31:40 Extent=[31:40 - 31:55]
|
||||
|
|
@ -84,16 +75,10 @@
|
|||
// CHECK: properties-class-extensions.m:30:12: ObjCClassRef=Rdar8467189_Foo:28:12 Extent=[30:12 - 30:27]
|
||||
// CHECK: properties-class-extensions.m:31:40: ObjCPropertyDecl=Rdar8467189_Bar:31:40 Extent=[31:1 - 31:55]
|
||||
// CHECK: properties-class-extensions.m:31:23: ObjCClassRef=Rdar8467189_Bar:24:8 Extent=[31:23 - 31:38]
|
||||
// CHECK: properties-class-extensions.m:31:40: ObjCInstanceMethodDecl=Rdar8467189_Bar:31:40 [Overrides @26:39] Extent=[31:40 - 31:55]
|
||||
// CHECK: properties-class-extensions.m:31:40: ObjCInstanceMethodDecl=setRdar8467189_Bar::31:40 Extent=[31:40 - 31:55]
|
||||
// CHECK: properties-class-extensions.m:31:40: ParmDecl=Rdar8467189_Bar:31:40 (Definition) Extent=[31:40 - 31:55]
|
||||
// CHECK: properties-class-extensions.m:35:12: ObjCInterfaceDecl=Qux:35:12 Extent=[35:1 - 36:5]
|
||||
// CHECK: properties-class-extensions.m:37:12: ObjCCategoryDecl=:37:12 Extent=[37:1 - 39:5]
|
||||
// CHECK: properties-class-extensions.m:37:12: ObjCClassRef=Qux:35:12 Extent=[37:12 - 37:15]
|
||||
// CHECK: properties-class-extensions.m:38:34: ObjCPropertyDecl=qux:38:34 Extent=[38:1 - 38:37]
|
||||
// CHECK: properties-class-extensions.m:38:31: TypeRef=id:0:0 Extent=[38:31 - 38:33]
|
||||
// CHECK: properties-class-extensions.m:38:34: ObjCInstanceMethodDecl=qux:38:34 Extent=[38:34 - 38:37]
|
||||
// CHECK: properties-class-extensions.m:38:34: ObjCInstanceMethodDecl=setQux::38:34 Extent=[38:34 - 38:37]
|
||||
// CHECK: properties-class-extensions.m:38:34: ParmDecl=qux:38:34 (Definition) Extent=[38:34 - 38:37]
|
||||
// CHECK: properties-class-extensions.m:42:10: ObjCDynamicDecl=qux:38:34 (Definition) Extent=[42:1 - 42:13]
|
||||
|
||||
|
|
|
|||
|
|
@ -102,9 +102,6 @@ int test_multi_declaration(void) {
|
|||
// CHECK: usrs.m c:objc(cs)Foo(im)godzilla Extent=[29:1 - 29:17]
|
||||
// CHECK: usrs.m c:objc(cs)Foo(cm)kingkong Extent=[30:1 - 30:17]
|
||||
// CHECK: usrs.m c:objc(cs)Foo(py)d1 Extent=[31:1 - 31:17]
|
||||
// CHECK: usrs.m c:objc(cs)Foo(im)d1 Extent=[31:15 - 31:17]
|
||||
// CHECK: usrs.m c:objc(cs)Foo(im)setD1: Extent=[31:15 - 31:17]
|
||||
// CHECK: usrs.m c:usrs.m@352objc(cs)Foo(im)setD1:@d1 Extent=[31:15 - 31:17]
|
||||
// CHECK: usrs.m c:objc(cs)Foo Extent=[34:1 - 45:2]
|
||||
// CHECK: usrs.m c:objc(cs)Foo(im)godzilla Extent=[35:1 - 39:2]
|
||||
// CHECK: usrs.m c:usrs.m@402objc(cs)Foo(im)godzilla@a Extent=[36:3 - 36:19]
|
||||
|
|
@ -171,9 +168,6 @@ int test_multi_declaration(void) {
|
|||
// CHECK-source: usrs.m:30:1: ObjCClassMethodDecl=kingkong:30:1 Extent=[30:1 - 30:17]
|
||||
// CHECK-source: usrs.m:30:4: TypeRef=id:0:0 Extent=[30:4 - 30:6]
|
||||
// CHECK-source: usrs.m:31:15: ObjCPropertyDecl=d1:31:15 Extent=[31:1 - 31:17]
|
||||
// CHECK-source: usrs.m:31:15: ObjCInstanceMethodDecl=d1:31:15 Extent=[31:15 - 31:17]
|
||||
// CHECK-source: usrs.m:31:15: ObjCInstanceMethodDecl=setD1::31:15 Extent=[31:15 - 31:17]
|
||||
// CHECK-source: usrs.m:31:15: ParmDecl=d1:31:15 (Definition) Extent=[31:15 - 31:17]
|
||||
// CHECK-source: usrs.m:34:1: ObjCImplementationDecl=Foo:34:1 (Definition) Extent=[34:1 - 45:2]
|
||||
// CHECK-source: usrs.m:35:1: ObjCInstanceMethodDecl=godzilla:35:1 (Definition) [Overrides @29:1] Extent=[35:1 - 39:2]
|
||||
// CHECK-source: usrs.m:35:4: TypeRef=id:0:0 Extent=[35:4 - 35:6]
|
||||
|
|
|
|||
|
|
@ -3497,13 +3497,6 @@ static enum CXChildVisitResult GetCursorVisitor(CXCursor cursor,
|
|||
// cursor.
|
||||
if (cursor.kind == CXCursor_MacroExpansion && Data->PointsAtMacroArgExpansion)
|
||||
return CXChildVisit_Recurse;
|
||||
|
||||
if (clang_isDeclaration(cursor.kind)) {
|
||||
// Avoid having the synthesized methods override the property decls.
|
||||
if (ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(getCursorDecl(cursor)))
|
||||
if (MD->isSynthesized())
|
||||
return CXChildVisit_Break;
|
||||
}
|
||||
|
||||
if (clang_isExpression(cursor.kind) &&
|
||||
clang_isDeclaration(BestCursor->kind)) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue