Fixed bugzilla bug# 3095 related to code gen. for @synchronized.
llvm-svn: 59838
diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp
index ff2d93a..8eb81a4 100644
--- a/clang/lib/CodeGen/CGObjCMac.cpp
+++ b/clang/lib/CodeGen/CGObjCMac.cpp
@@ -1589,9 +1589,10 @@
"_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 @@
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/clang/test/CodeGenObjC/synchronized.m b/clang/test/CodeGenObjC/synchronized.m
index 0222846..c74a83e 100644
--- a/clang/test/CodeGenObjC/synchronized.m
+++ b/clang/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 @@
}
}
+
+