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

Debug Info: Assert that location is available for cleanups 

rdar://57630879

Differential Revision: https://reviews.llvm.org/D71042
This commit is contained in:
Adrian Prantl 2019-12-05 12:26:16 -08:00
parent a1a9aa17b4
commit ce7d35988d
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/CodeGen/CGObjC.cpp
View File

@ -981,7 +981,7 @@ void CodeGenFunction::GenerateObjCGetter(ObjCImplementationDecl *IMP,
generateObjCGetterBody(IMP, PID, OMD, AtomicHelperFn); generateObjCGetterBody(IMP, PID, OMD, AtomicHelperFn);
FinishFunction(); FinishFunction(OMD->getEndLoc());
} }
static bool hasTrivialGetExpr(const ObjCPropertyImplDecl *propImpl) { static bool hasTrivialGetExpr(const ObjCPropertyImplDecl *propImpl) {
@ -1515,7 +1515,7 @@ void CodeGenFunction::GenerateObjCSetter(ObjCImplementationDecl *IMP,
generateObjCSetterBody(IMP, PID, AtomicHelperFn); generateObjCSetterBody(IMP, PID, AtomicHelperFn);
FinishFunction(); FinishFunction(OMD->getEndLoc());
} }
namespace { namespace {

2
clang/lib/CodeGen/CGOpenMPRuntime.cpp
View File

@ -6189,7 +6189,7 @@ static llvm::Value *emitReduceFiniFunction(CodeGenModule &CGM,
// Emit the finalizer body: // Emit the finalizer body:
// <destroy>(<type>* %0) // <destroy>(<type>* %0)
RCG.emitCleanups(CGF, N, PrivateAddr); RCG.emitCleanups(CGF, N, PrivateAddr);
CGF.FinishFunction(); CGF.FinishFunction(Loc);
return Fn; return Fn;
} }

5
clang/lib/CodeGen/CodeGenFunction.cpp
View File

@ -377,9 +377,12 @@ void CodeGenFunction::FinishFunction(SourceLocation EndLoc) {
if (HasCleanups) { if (HasCleanups) {
// Make sure the line table doesn't jump back into the body for // Make sure the line table doesn't jump back into the body for
// the ret after it's been at EndLoc. // the ret after it's been at EndLoc.
if (CGDebugInfo *DI = getDebugInfo()) if (CGDebugInfo *DI = getDebugInfo()) {
if (OnlySimpleReturnStmts) if (OnlySimpleReturnStmts)
DI->EmitLocation(Builder, EndLoc); DI->EmitLocation(Builder, EndLoc);
else
assert(EndLoc.isValid() && "no location for inlineable cleanup calls");
}
PopCleanupBlocks(PrologueCleanupDepth); PopCleanupBlocks(PrologueCleanupDepth);
} }

25
clang/test/CodeGenObjCXX/synthesized-property-cleanup.mm Normal file
View File

@ -0,0 +1,25 @@
// RUN: %clang_cc1 -triple arm64e-apple-ios13.0 -debug-info-kind=standalone -fobjc-arc \
// RUN: %s -emit-llvm -o - | FileCheck %s
@interface NSObject
+ (id)alloc;
@end
@interface NSString : NSObject
@end
// CHECK: define {{.*}}@"\01-[MyData setData:]"
// CHECK: [[DATA:%.*]] = alloca %struct.Data
// CHECK: call %struct.Data* @_ZN4DataD1Ev(%struct.Data* [[DATA]]){{.*}}, !dbg [[LOC:![0-9]+]]
// CHECK-NEXT: ret void
// [[LOC]] = !DILocation(line: 0
@interface MyData : NSObject
struct Data {
NSString *name;
};
@property struct Data data;
@end
@implementation MyData
@end