Prevent rewriter crash when variable type is missing.

Fixes radar 7692183.

llvm-svn: 97281

2 files changed, 7 insertions, 0 deletions

diff --git a/clang/lib/Frontend/RewriteObjC.cpp b/clang/lib/Frontend/RewriteObjC.cpp
index be07a6aadf4..635280bf432 100644
--- a/clang/lib/Frontend/RewriteObjC.cpp
+++ b/clang/lib/Frontend/RewriteObjC.cpp
@@ -4781,6 +4781,10 @@ void RewriteObjC::RewriteByRefVar(VarDecl *ND) {
   int flag = 0;
   int isa = 0;
   SourceLocation DeclLoc = ND->getTypeSpecStartLoc();
+  if (DeclLoc.isInvalid())
+    // If type location is missing, it is because of missing type (a warning).
+    // Use variable's location which is good for this case.
+    DeclLoc = ND->getLocation();
   const char *startBuf = SM->getCharacterData(DeclLoc);
   SourceLocation X = ND->getLocEnd();
   X = SM->getInstantiationLoc(X);
diff --git a/clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm b/clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm
index c6279de5e1d..a8f5b140eaa 100644
--- a/clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm
+++ b/clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm
@@ -13,10 +13,13 @@ void f(void (^block)(void));
 @implementation X
 - (void)foo {
         __block int kerfluffle;
+        // radar 7692183
+        __block x; 
         f(^{
                 f(^{
                                 y = 42;
                             kerfluffle = 1;
+			    x = 2;
                 });
         });
 }