r190874 - ObjectiveC modern translator: Provide proper cast of

[Fariborz Jahanian]

Author: fjahanian
Date: Tue Sep 17 12:51:48 2013
New Revision: 190874

URL: http://llvm.org/viewvc/llvm-project?rev=190874&view=rev
Log:
ObjectiveC modern translator: Provide proper cast of
the ObjectiveC object of an @synchronized statement.
// rdar://14993814

Modified:
    cfe/trunk/lib/Rewrite/Frontend/RewriteModernObjC.cpp
    cfe/trunk/test/Rewriter/rewrite-modern-synchronized.m

Modified: cfe/trunk/lib/Rewrite/Frontend/RewriteModernObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/Frontend/RewriteModernObjC.cpp?rev=190874&r1=190873&r2=190874&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/Frontend/RewriteModernObjC.cpp (original)
+++ cfe/trunk/lib/Rewrite/Frontend/RewriteModernObjC.cpp Tue Sep 17 12:51:48 2013
@@ -1904,7 +1904,7 @@ Stmt *RewriteModernObjC::RewriteObjCSync
   std::string buf;
   SourceLocation SynchLoc = S->getAtSynchronizedLoc();
   ConvertSourceLocationToLineDirective(SynchLoc, buf);
-  buf += "{ id _rethrow = 0; id _sync_obj = ";
+  buf += "{ id _rethrow = 0; id _sync_obj = (id)";
   
   const char *lparenBuf = startBuf;
   while (*lparenBuf != '(') lparenBuf++;

Modified: cfe/trunk/test/Rewriter/rewrite-modern-synchronized.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-modern-synchronized.m?rev=190874&r1=190873&r2=190874&view=diff
==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-modern-synchronized.m (original)
+++ cfe/trunk/test/Rewriter/rewrite-modern-synchronized.m Tue Sep 17 12:51:48 2013
@@ -1,7 +1,6 @@
 // RUN: %clang_cc1 -x objective-c -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -fcxx-exceptions -fexceptions  -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -fcxx-exceptions -fexceptions  -Wno-address-of-temporary -D"SEL=void*" -D"Class=struct objc_class *" -D"__declspec(X)=" %t-rw.cpp
 
-typedef struct objc_class *Class;
 typedef struct objc_object {
     Class isa;
 } *id;
@@ -33,3 +32,15 @@ void test_sync_with_implicit_finally() {
         return; // The rewriter knows how to generate code for implicit finally
     }
 }
+
+// rdar://14993814
+ at interface NSObject @end
+
+ at interface I : NSObject @end
+
+ at implementation I
++ (void) Meth {
+ at synchronized(self) {
+}
+}
+ at end