Fix bug in PR #380

CheckedC does let you take the address of constant size checked arrays. The
previous commit would not let this happen, causing the ptrtoconstarr.c
test to fail. It also caused ptrptr.c to fail, but this was because the
-alltypes behavior expected in that test generated code that did not
compile (because it took the address of an _Array_ptr). Both tests are
now passing.

Author: john-h-kastner

clang/lib/3C/ConstraintResolver.cpp

@@ -383,7 +383,10 @@ CVarSet ConstraintResolver::getExprConstraintVars(Expr *E) {
           // 3C will not generate such code.
           for (auto *CV : T)
             if (auto *PCV = dyn_cast<PVConstraint>(CV))
-              PCV->constrainOuterTo(CS, CS.getPtr(), true);
+              // On the other hand, CheckedC does let you take the address of
+              // constant sized arrays.
+              if (!PCV->getArrPresent())
+                PCV->constrainOuterTo(CS, CS.getPtr(), true);
           // add a VarAtom to UOExpr's PVConstraint, for &
           Ret = addAtomAll(T, CS.getPtr(), CS);
         }

clang/test/3C/ptrptr.c

@@ -1,6 +1,6 @@
 // RUN: 3c -alltypes -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" %s
 // RUN: 3c -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
-// RUN: 3c -addcr %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
+// RUN: 3c -addcr -alltypes %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
 // RUN: 3c -output-postfix=checked -alltypes %s
 // RUN: 3c -alltypes %S/ptrptr.checked.c -- | count 0
 // RUN: rm %S/ptrptr.checked.c
@@ -27,17 +27,13 @@ void f() {
 
 void g() {
   int *x = malloc(sizeof(int)*1);
-	//CHECK_NOALL: int *x = malloc<int>(sizeof(int)*1);
-	//CHECK_ALL:   _Array_ptr<int> x : count(1) = malloc<int>(sizeof(int)*1);
+	//CHECK: int *x = malloc<int>(sizeof(int)*1);
   int y[5];
-	//CHECK_NOALL: int y[5];
-	//CHECK_ALL:   int y _Checked[5];
+	//CHECK: int y[5];
   int **p = &x;
-	//CHECK_NOALL: _Ptr<int *> p = &x;
-	//CHECK_ALL:   _Ptr<_Array_ptr<int>> p = &x;
+	//CHECK: _Ptr<int *> p = &x;
   int **r = 0;
-	//CHECK_NOALL: _Ptr<int *> r = 0;
-	//CHECK_ALL:   _Ptr<_Array_ptr<int>> r = 0;
+	//CHECK: _Ptr<int *> r = 0;
   *p = y;
   (*p)[0] = 1;
   r = p;