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 | e2caaaa13c0d429c4ec28a822ec44826d3faa012 (patch) | |
| tree | 3cf9733c4bbe29a78b53b73fe6774b7027c0c7ae /clang/lib | |
| parent | 57d0b888302aefeaf7fdbbd04218374e0b1fba22 (diff) | |
| download | bcm5719-llvm-e2caaaa13c0d429c4ec28a822ec44826d3faa012.tar.gz bcm5719-llvm-e2caaaa13c0d429c4ec28a822ec44826d3faa012.zip | |
Fixed bugzilla bug# 3095 related to code gen. for @synchronized.
llvm-svn: 59838
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/CodeGen/CGObjCMac.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp index ff2d93a3317..8eb81a4b4b6 100644 --- a/clang/lib/CodeGen/CGObjCMac.cpp +++ b/clang/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); |
