[cfe-commits] r59838 - in /cfe/trunk: lib/CodeGen/CGObjCMac.cpp test/CodeGenObjC/synchronized.m

[Fariborz Jahanian]

Author: fjahanian
Date: Fri Nov 21 13:21:53 2008
New Revision: 59838

URL: http://llvm.org/viewvc/llvm-project?rev=59838&view=rev
Log:
Fixed bugzilla bug# 3095 related to code gen. for @synchronized.

Modified:
    cfe/trunk/lib/CodeGen/CGObjCMac.cpp
    cfe/trunk/test/CodeGenObjC/synchronized.m

Modified: cfe/trunk/lib/CodeGen/CGObjCMac.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGObjCMac.cpp?rev=59838&r1=59837&r2=59838&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGObjCMac.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGObjCMac.cpp Fri Nov 21 13:21:53 2008
@@ -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);
  

Modified: cfe/trunk/test/CodeGenObjC/synchronized.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/synchronized.m?rev=59838&r1=59837&r2=59838&view=diff

==============================================================================
--- cfe/trunk/test/CodeGenObjC/synchronized.m (original)
+++ cfe/trunk/test/CodeGenObjC/synchronized.m Fri Nov 21 13:21:53 2008
@@ -3,6 +3,24 @@
 
 #include <stdio.h>
 
+ at interface MyClass
+{
+}
+- (void)method;
+ at end
+
+ at implementation MyClass
+
+- (void)method
+{
+	@synchronized(self)
+	{
+		NSLog(@"sync");
+	}
+}
+
+ at end
+
 void foo(id a) {
   @synchronized(a) {
     printf("Swimming? No.");
@@ -10,3 +28,5 @@
   }
 }
 
+
+