[cfe-commits] r136717 - in /cfe/trunk: lib/Rewrite/RewriteObjC.cpp test/Rewriter/rewrite-foreach-in-block.mm

[Fariborz Jahanian]

Author: fjahanian
Date: Tue Aug  2 15:28:46 2011
New Revision: 136717

URL: http://llvm.org/viewvc/llvm-project?rev=136717&view=rev
Log:
objective-c rewrite: Fixes rewriting of objective-c collection
statement inside a block. // rdar://9878420

Added:
    cfe/trunk/test/Rewriter/rewrite-foreach-in-block.mm
Modified:
    cfe/trunk/lib/Rewrite/RewriteObjC.cpp

Modified: cfe/trunk/lib/Rewrite/RewriteObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/RewriteObjC.cpp?rev=136717&r1=136716&r2=136717&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/RewriteObjC.cpp (original)
+++ cfe/trunk/lib/Rewrite/RewriteObjC.cpp Tue Aug  2 15:28:46 2011
@@ -5577,12 +5577,20 @@
     CurrentBody = BE->getBody();
     CollectPropertySetters(CurrentBody);
     PropParentMap = 0;
+    // block literal on rhs of a property-dot-sytax assignment
+    // must be replaced by its synthesize ast so getRewrittenText
+    // works as expected. In this case, what actually ends up on RHS
+    // is the blockTranscribed which is the helper function for the
+    // block literal; as in: self.c = ^() {[ace ARR];};
+    bool saveDisableReplaceStmt = DisableReplaceStmt;
+    DisableReplaceStmt = false;
     RewriteFunctionBodyOrGlobalInitializer(BE->getBody());
+    DisableReplaceStmt = saveDisableReplaceStmt;
     CurrentBody = SaveCurrentBody;
     PropParentMap = 0;
     ImportedLocalExternalDecls.clear();
     // Now we snarf the rewritten text and stash it away for later use.
-    std::string Str = Rewrite.ConvertToString(BE->getBody());
+    std::string Str = Rewrite.getRewrittenText(BE->getSourceRange());
     RewrittenBlockExprs[BE] = Str;
 
     Stmt *blockTranscribed = SynthBlockInitExpr(BE, InnerBlockDeclRefs);

Added: cfe/trunk/test/Rewriter/rewrite-foreach-in-block.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-foreach-in-block.mm?rev=136717&view=auto
==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-foreach-in-block.mm (added)
+++ cfe/trunk/test/Rewriter/rewrite-foreach-in-block.mm Tue Aug  2 15:28:46 2011
@@ -0,0 +1,28 @@
+// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
+// rdar:// 9878420
+
+void objc_enumerationMutation(id);
+void *sel_registerName(const char *);
+typedef void (^CoreDAVCompletionBlock)(void);
+
+ at interface I
+- (void)M;
+- (id) ARR;
+ at property (readwrite, copy, nonatomic) CoreDAVCompletionBlock c;
+ at end
+
+ at implementation I
+- (void)M {
+    I* ace;
+    self.c = ^() {
+          // sanity test for the changes.
+	  [ace ARR];
+          for (I *privilege in [ace ARR]) { }
+    };
+    self.c = ^() {
+          // sanity test for the changes.
+	  [ace ARR];
+    };
+}
+ at end