diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2008-11-21 19:21:53 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2008-11-21 19:21:53 +0000 |
| commit | f2878e5dffd20bf0a97fb0b30a376f2d60963593 (patch) | |
| tree | 098a9eed961ac05a782bdf67b286c398ce19d02a | |
| parent | 4c5d320a7581f4b80b151630c91cea5727fa9923 (diff) | |
Fixed bugzilla bug# 3095 related to code gen. for @synchronized.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59838 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGObjCMac.cpp | 18 | ||||
| -rw-r--r-- | test/CodeGenObjC/synchronized.m | 20 |
2 files changed, 31 insertions, 7 deletions
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp index ff2d93a331..8eb81a4b4b 100644 --- a/lib/CodeGen/CGObjCMac.cpp +++ b/lib/CodeGen/CGObjCMac.cpp @@ -1589,9 +1589,10 @@ void CGObjCMac::EmitTryOrSynchronizedStmt(CodeGen::CodeGenFunction &CGF, "_rethrow"); if (!isTry) { // For @synchronized, call objc_sync_enter(sync.expr) - CGF.Builder.CreateCall(ObjCTypes.SyncEnterFn, - CGF.EmitScalarExpr( - cast<ObjCAtSynchronizedStmt>(S).getSynchExpr())); + llvm::Value *Arg = CGF.EmitScalarExpr( + cast<ObjCAtSynchronizedStmt>(S).getSynchExpr()); + Arg = CGF.Builder.CreateBitCast(Arg, ObjCTypes.ObjectPtrTy); + CGF.Builder.CreateCall(ObjCTypes.SyncEnterFn, Arg); } // Enter a new try block and call setjmp. @@ -1748,11 +1749,14 @@ void CGObjCMac::EmitTryOrSynchronizedStmt(CodeGen::CodeGenFunction &CGF, cast<ObjCAtTryStmt>(S).getFinallyStmt()) CGF.EmitStmt(FinallyStmt->getFinallyBody()); } - else + else { // For @synchronized objc_sync_exit(expr); As finally's sole statement. - CGF.Builder.CreateCall(ObjCTypes.SyncExitFn, - CGF.EmitScalarExpr( - cast<ObjCAtSynchronizedStmt>(S).getSynchExpr())); + // For @synchronized, call objc_sync_enter(sync.expr) + llvm::Value *Arg = CGF.EmitScalarExpr( + cast<ObjCAtSynchronizedStmt>(S).getSynchExpr()); + Arg = CGF.Builder.CreateBitCast(Arg, ObjCTypes.ObjectPtrTy); + CGF.Builder.CreateCall(ObjCTypes.SyncExitFn, Arg); + } CGF.EmitBlock(FinallyJump); diff --git a/test/CodeGenObjC/synchronized.m b/test/CodeGenObjC/synchronized.m index 0222846ccd..c74a83edbe 100644 --- a/test/CodeGenObjC/synchronized.m +++ b/test/CodeGenObjC/synchronized.m @@ -3,6 +3,24 @@ #include <stdio.h> +@interface MyClass +{ +} +- (void)method; +@end + +@implementation MyClass + +- (void)method +{ + @synchronized(self) + { + NSLog(@"sync"); + } +} + +@end + void foo(id a) { @synchronized(a) { printf("Swimming? No."); @@ -10,3 +28,5 @@ void foo(id a) { } } + + |