maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Set a source location for Objective-C accessor stubs 

even when there is no explicit synthesize statement.

This fixes a regression introduced in https://reviews.llvm.org/D68108
that could lead to missing debug locations in cleanup code in
synthesized Objective-C++ properties.

rdar://57630879

Differential Revision: https://reviews.llvm.org/D71084
This commit is contained in:
Adrian Prantl 2019-12-05 11:25:46 -08:00
parent d0b9ed5c49
commit a1a9aa17b4
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Sema/SemaObjCProperty.cpp
View File

@ -1058,11 +1058,13 @@ RedeclarePropertyAccessor(ASTContext &Context, ObjCImplementationDecl *Impl,
SourceLocation PropertyLoc) { SourceLocation PropertyLoc) {
ObjCMethodDecl *Decl = AccessorDecl; ObjCMethodDecl *Decl = AccessorDecl;
ObjCMethodDecl *ImplDecl = ObjCMethodDecl::Create( ObjCMethodDecl *ImplDecl = ObjCMethodDecl::Create(
Context, AtLoc, PropertyLoc, Decl->getSelector(), Decl->getReturnType(), Context, AtLoc.isValid() ? AtLoc : Decl->getBeginLoc(),
PropertyLoc.isValid() ? PropertyLoc : Decl->getEndLoc(),
Decl->getSelector(), Decl->getReturnType(),
Decl->getReturnTypeSourceInfo(), Impl, Decl->isInstanceMethod(), Decl->getReturnTypeSourceInfo(), Impl, Decl->isInstanceMethod(),
Decl->isVariadic(), Decl->isPropertyAccessor(), /* isSynthesized*/ true, Decl->isVariadic(), Decl->isPropertyAccessor(),
Decl->isImplicit(), Decl->isDefined(), Decl->getImplementationControl(), /* isSynthesized*/ true, Decl->isImplicit(), Decl->isDefined(),
Decl->hasRelatedResultType()); Decl->getImplementationControl(), Decl->hasRelatedResultType());
ImplDecl->getMethodFamily(); ImplDecl->getMethodFamily();
if (Decl->hasAttrs()) if (Decl->hasAttrs())
ImplDecl->setAttrs(Decl->getAttrs()); ImplDecl->setAttrs(Decl->getAttrs());

23
clang/test/SemaObjC/default-synthesize-sourceloc.m Normal file
View File

@ -0,0 +1,23 @@
// RUN: %clang_cc1 -ast-dump %s | FileCheck %s
// Test that accessor stubs for default-synthesized ObjC accessors
// have a valid source location.
__attribute__((objc_root_class))
@interface NSObject
+ (id)alloc;
@end
@interface NSString : NSObject
@end
@interface MyData : NSObject
struct Data {
NSString *name;
};
@property struct Data data;
@end
// CHECK: ObjCImplementationDecl {{.*}}line:[[@LINE+2]]{{.*}} MyData
// CHECK: ObjCMethodDecl {{.*}}col:23 implicit - setData: 'void'
@implementation MyData
@end