diff options
| -rw-r--r-- | clang/lib/CodeGen/CGCall.cpp | 6 | ||||
| -rw-r--r-- | clang/test/CodeGenObjC/arc-linetable-autorelease.m | 40 |
2 files changed, 44 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp index 1ea16fe13a4..9a8edccdef0 100644 --- a/clang/lib/CodeGen/CGCall.cpp +++ b/clang/lib/CodeGen/CGCall.cpp @@ -1667,8 +1667,10 @@ void CodeGenFunction::EmitFunctionEpilog(const CGFunctionInfo &FI, // If there is a dominating store to ReturnValue, we can elide // the load, zap the store, and usually zap the alloca. if (llvm::StoreInst *SI = findDominatingStoreToReturnValue(*this)) { - // Reuse the debug location from the store unless we're told not to. - if (EmitRetDbgLoc) + // Reuse the debug location from the store unless there is + // cleanup code to be emitted between the store and return + // instruction. + if (EmitRetDbgLoc && !AutoreleaseResult) RetDbgLoc = SI->getDebugLoc(); // Get the stored value and nuke the now-dead store. RV = SI->getValueOperand(); diff --git a/clang/test/CodeGenObjC/arc-linetable-autorelease.m b/clang/test/CodeGenObjC/arc-linetable-autorelease.m new file mode 100644 index 00000000000..be05ec2fcd8 --- /dev/null +++ b/clang/test/CodeGenObjC/arc-linetable-autorelease.m @@ -0,0 +1,40 @@ +// RUN: %clang_cc1 -emit-llvm -fobjc-arc -g -triple x86_64-apple-darwin10 %s -o - | FileCheck %s +// Ensure that the line info is making sense: +// ARC cleanups should be at the closing '}'. +@protocol NSObject +@end + +@interface NSObject <NSObject> {} +@end + +@protocol NSCopying +@end + +@protocol NSCoding +@end + +typedef double CGFloat; +struct CGRect {}; +typedef struct CGRect CGRect; +typedef CGRect NSRect; +NSRect NSMakeRect(CGFloat x, CGFloat y, CGFloat w, CGFloat h); +@interface NSBezierPath : NSObject <NSCopying, NSCoding> ++ (NSBezierPath *)bezierPathWithRoundedRect:(NSRect)rect xRadius:(CGFloat)xRadius yRadius:(CGFloat)yRadius; +@end +@implementation AppDelegate : NSObject {} +- (NSBezierPath *)_createBezierPathWithWidth:(CGFloat)width height:(CGFloat)height radius:(CGFloat)radius lineWidth:(CGFloat)lineWidth +{ + NSRect rect = NSMakeRect(0, 0, width, height); + NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:rect xRadius:radius yRadius:radius]; + CGFloat pattern[2]; + // CHECK: define {{.*}}_createBezierPathWithWidth + // CHECK: load {{.*}} %path, align {{.*}}, !dbg ![[RET:[0-9]+]] + // CHECK: call void @objc_storeStrong{{.*}} !dbg ![[ARC1:[0-9]+]] + // CHECK: call {{.*}} @objc_autoreleaseReturnValue{{.*}} !dbg ![[ARC2:[0-9]+]] + // CHECK: ret {{.*}} !dbg ![[ARC2]] + // CHECK: ![[RET]] = metadata !{i32 [[@LINE+1]], i32 0, metadata !{{.*}}, null} + return path; + // CHECK: ![[ARC1]] = metadata !{i32 [[@LINE+2]], i32 0, metadata !{{.*}}, null} + // CHECK: ![[ARC2]] = metadata !{i32 [[@LINE+1]], i32 0, metadata !{{.*}}, null} +} +@end |
