Now locals work too.

Author: Andrew Ruef

test/CheckedCRewriter/const_tests.c

@@ -6,17 +6,6 @@
 // RUN: checked-c-convert %s -- | %clang_cc1 -verify -fcheckedc-extension -x c -
 // expected-no-diagnostics
 
-// Have something so that we always get some output.
-void a0(void) {
-  int q = 0;
-  int *k = &q;
-  *k = 0;
-}
-//CHECK: int q = 0;
-//CHECK-NEXT: _Ptr<int> k = &q;
-//CHECK-NEXT: *k = 0;
-//CHECK-NEXT: }
-
 void cst1(const int *a) {
   int b = *a;
 }
@@ -32,3 +21,13 @@ void cst3(const int *a, int i) {
 }
 //CHECK: void cst3(const int *a, int i) {
 //CHECK-NEXT: int c = *(a+i);
+
+void cst4(const int *b) {
+  int c = *b;
+  const int *d = b;
+  int e = *d;
+}
+//CHECK: void cst4(_Ptr<const int>  b) {
+//CHECK-NEXT: int c = *b;
+//CHECK-NEXT: _Ptr<const int>  d;
+//CHECK-NEXT: int e = *d;

tools/checked-c-convert/CheckedCConvert.cpp

@@ -162,7 +162,8 @@ void rewrite(Rewriter &R, std::set<DAndReplace> &toRewrite, SourceManager &S,
           errs() << "VarDecl at:\n";
           Where->dump();
         }
-        SourceRange TR = VD->getTypeSourceInfo()->getTypeLoc().getSourceRange();
+        SourceRange TR = VD->getSourceRange();
+        std::string sRewrite = N.second + " " + VD->getNameAsString();
 
         // Is it a variable type? This is the easy case, we can re-write it
         // locally, at the site of the declaration.
@@ -173,7 +174,7 @@ void rewrite(Rewriter &R, std::set<DAndReplace> &toRewrite, SourceManager &S,
         Files.insert(FSL.getFileID());
         if (Where->isSingleDecl()) {
           if (canRewrite(R, TR)) {
-            R.ReplaceText(TR, N.second);
+            R.ReplaceText(TR, sRewrite);
           } else {
             // This can happen if SR is within a macro. If that is the case, 
             // maybe there is still something we can do because Decl refers