Author: fjahanian
Date: Mon Nov 8 12:37:50 2010
New Revision: 118425
URL: http://llvm.org/viewvc/llvm-project?rev=118425&view=rev
Log:
Fixes a rewrite bug, rewriting nested property usage
inside blocks. Fixes //rdar: //8608293.
Added:
cfe/trunk/test/Rewriter/rewrite-nested-property-in-blocks.mm (with props)
Modified:
cfe/trunk/clang.xcodeproj/project.pbxproj
cfe/trunk/lib/Rewrite/RewriteObjC.cpp
Modified: cfe/trunk/clang.xcodeproj/project.pbxproj
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/clang.xcodeproj/project.pbxproj?rev=118425&r1=118424&r2=118425&view=diff
==============================================================================
--- cfe/trunk/clang.xcodeproj/project.pbxproj (original)
+++ cfe/trunk/clang.xcodeproj/project.pbxproj Mon Nov 8 12:37:50 2010
@@ -1931,7 +1931,6 @@
isa = PBXProject;
buildConfigurationList = 1DEB923508733DC60010E9CD /*
Build configuration list for PBXProject "clang" */;
compatibilityVersion = "Xcode 2.4";
- developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Modified: cfe/trunk/lib/Rewrite/RewriteObjC.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/RewriteObjC.cpp?rev=118425&r1=118424&r2=118425&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/RewriteObjC.cpp (original)
+++ cfe/trunk/lib/Rewrite/RewriteObjC.cpp Mon Nov 8 12:37:50 2010
@@ -5524,7 +5524,12 @@
GetInnerBlockDeclRefExprs(BE->getBody(),
InnerBlockDeclRefs, InnerContexts);
// Rewrite the block body in place.
+ Stmt *SaveCurrentBody = CurrentBody;
+ CurrentBody = BE->getBody();
+ PropParentMap = 0;
RewriteFunctionBodyOrGlobalInitializer(BE->getBody());
+ CurrentBody = SaveCurrentBody;
+ PropParentMap = 0;
ImportedLocalExternalDecls.clear();
// Now we snarf the rewritten text and stash it away for later use.
std::string Str = Rewrite.getRewrittenText(BE->getSourceRange());
Added: cfe/trunk/test/Rewriter/rewrite-nested-property-in-blocks.mm
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-nested-property-in-blocks.mm?rev=118425&view=auto
==============================================================================
--- cfe/trunk/test/Rewriter/rewrite-nested-property-in-blocks.mm (added)
+++ cfe/trunk/test/Rewriter/rewrite-nested-property-in-blocks.mm Mon Nov 8
12:37:50 2010
@@ -0,0 +1,52 @@
+// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions
-rewrite-objc %s -o %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -fms-extensions -Wno-address-of-temporary
-Did="void *" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
+// radar 8608293
+
+void *sel_registerName(const char *);
+
+extern "C" void nowarn(id);
+
+extern "C" void noblockwarn(void (^)());
+
+...@interface INTFOFPROP
+...@property (readwrite, retain) INTFOFPROP *outer;
+...@property (readwrite, retain) id inner;
+...@end
+
+...@interface NSSet
+- (NSSet *)objectsPassingTest:(char (^)(id obj, char *stop))predicate ;
+...@end
+
+...@interface INTF
+- (NSSet *)Meth;
+...@end
+
+...@implementation INTF
+
+- (NSSet *)Meth
+{
+ NSSet *aces;
+
+ noblockwarn(^() {
+ INTFOFPROP *ace;
+ nowarn(ace.outer.inner);
+ noblockwarn(^() {
+ INTFOFPROP *ace;
+ nowarn(ace.outer.inner);
+ });
+ });
+
+ noblockwarn(^() {
+ INTFOFPROP *ace;
+ nowarn(ace.outer.inner);
+ });
+
+return [aces objectsPassingTest:^(id obj, char *stop)
+ {
+ INTFOFPROP *ace = (INTFOFPROP *)obj;
+ nowarn(ace.outer.inner);
+ return (char)0;
+ }];
+
+}
+...@end
Propchange: cfe/trunk/test/Rewriter/rewrite-nested-property-in-blocks.mm
------------------------------------------------------------------------------
svn:executable = *
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
