commit 35f6e12bf00f1ee5706cccb32aad6809ac0e72b1
author Fariborz Jahanian <fjahanian@apple.com> Mon Apr 16 23:00:57 2012 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Mon Apr 16 23:00:57 2012 +0000
tree 301f15ec88c15880f511c31a8bb2e656752d705a
parent 2bf5f739777b0636954d2030e4d0879116fdeb8b

Modern objective-c translator:'self' used inside
block literal is imported. // rdar://11259664

llvm-svn: 154876

clang/lib/Rewrite/RewriteModernObjC.cpp

diff --git a/clang/lib/Rewrite/RewriteModernObjC.cpp b/clang/lib/Rewrite/RewriteModernObjC.cpp
index 5d124ab..28502dd 100644
--- a/clang/lib/Rewrite/RewriteModernObjC.cpp
+++ b/clang/lib/Rewrite/RewriteModernObjC.cpp
@@ -4156,11 +4156,15 @@
         GetBlockDeclRefExprs(*CI);
     }
   // Handle specific things.
-  if (DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(S))
-    if (DRE->refersToEnclosingLocal() &&
-        HasLocalVariableExternalStorage(DRE->getDecl())) {
-      BlockDeclRefs.push_back(DRE);
+  if (DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(S)) {
+    if (DRE->refersToEnclosingLocal()) {
+      // FIXME: Handle enums.
+      if (!isa<FunctionDecl>(DRE->getDecl()))
+        BlockDeclRefs.push_back(DRE);
+      if (HasLocalVariableExternalStorage(DRE->getDecl()))
+        BlockDeclRefs.push_back(DRE);
     }
+  }
   
   return;
 }