Merge pull request #277 from plum-umd/iss276

Fixing issue #276

Author: mwhicks1

clang/include/clang/CConv/ConstraintVariables.h

@@ -297,6 +297,8 @@ class PointerVariableConstraint : public ConstraintVariable {
   bool getArrPresent() const { return ArrPresent; }
   // Check if the outermost pointer is an unsized array.
   bool isTopCvarUnsizedArr() const;
+  // Check if any of the pointers is either a sized or unsized arr.
+  bool hasSomeSizedArr() const;
 
   // Is an itype present for this constraint? If yes,
   // what is the text of that itype?

clang/lib/CConv/AVarBoundsInfo.cpp

@@ -692,15 +692,14 @@ bool AvarBoundsInference::inferPossibleBounds(BoundsKey K, ABounds *SB,
       auto *SBVar = BI->getProgramVar(SBKey);
       if (SBVar->IsNumConstant()) {
         PotentialB.insert(SBVar);
-      } else {
-        // Find all the in scope variables reachable from the current
-        // bounds variable.
-        ScopeVisitor TV(Kvar->getScope(), PotentialB, BI->PVarInfo,
-                        BI->PointerBoundsKey);
-        BKGraph.visitBreadthFirst(SBKey, [&TV](BoundsKey BK) {
-          TV.visitBoundsKey(BK);
-        });
       }
+      // Find all the in scope variables reachable from the current
+      // bounds variable.
+      ScopeVisitor TV(Kvar->getScope(), PotentialB, BI->PVarInfo,
+                      BI->PointerBoundsKey);
+      BKGraph.visitBreadthFirst(SBKey, [&TV](BoundsKey BK) {
+        TV.visitBoundsKey(BK);
+      });
 
       if (*Kvar->getScope() == *SBVar->getScope()) {
         PotentialB.insert(SBVar);

clang/lib/CConv/ConstraintVariables.cpp

@@ -151,8 +151,9 @@ PointerVariableConstraint::PointerVariableConstraint(const QualType &QT,
   ArrPresent = false;
 
   bool IsDeclTy = false;
+
+  auto &ABInfo = I.getABoundsInfo();
   if (D != nullptr) {
-    auto &ABInfo = I.getABoundsInfo();
     if (ABInfo.tryGetVariable(D, BKey)) {
       ValidBoundsKey = true;
     }
@@ -210,6 +211,7 @@ PointerVariableConstraint::PointerVariableConstraint(const QualType &QT,
   bool VarCreated = false;
   bool IsArr = false;
   bool IsIncompleteArr = false;
+  bool IsTopMost = true;
   OriginallyChecked = false;
   uint32_t TypeIdx = 0;
   std::string Npre = inFunc ? ((*inFunc)+":") : "";
@@ -268,7 +270,14 @@ PointerVariableConstraint::PointerVariableConstraint(const QualType &QT,
       // See if there is a constant size to this array type at this position.
       if (const ConstantArrayType *CAT = dyn_cast<ConstantArrayType>(Ty)) {
         arrSizes[TypeIdx] = std::pair<OriginalArrType,uint64_t>(
-                O_SizedArray,CAT->getSize().getZExtValue());
+                O_SizedArray, CAT->getSize().getZExtValue());
+
+        // If this is the top-most pointer variable?
+        if (hasBoundsKey() && IsTopMost) {
+          BoundsKey CBKey = ABInfo.getConstKey(CAT->getSize().getZExtValue());
+          ABounds *NB = new CountBound(CBKey);
+          ABInfo.insertDeclaredBounds(D, NB);
+        }
       } else {
         arrSizes[TypeIdx] = std::pair<OriginalArrType,uint64_t>(
                 O_UnSizedArray,0);
@@ -316,6 +325,7 @@ PointerVariableConstraint::PointerVariableConstraint(const QualType &QT,
     TypeIdx++;
     Npre = Npre + "*";
     VK = VarAtom::V_Other; // only the outermost pointer considered a param/return
+    IsTopMost = false;
   }
   insertQualType(TypeIdx, QTy);
 
@@ -1148,6 +1158,16 @@ bool PointerVariableConstraint::isTopCvarUnsizedArr() const {
   return true;
 }
 
+bool PointerVariableConstraint::hasSomeSizedArr() const {
+  for (auto &AS : arrSizes) {
+    if (AS.second.first == O_SizedArray ||
+        AS.second.second == O_UnSizedArray) {
+      return true;
+    }
+  }
+  return false;
+}
+
 bool PointerVariableConstraint::
     solutionEqualTo(Constraints &CS, const ConstraintVariable *CV) const {
   bool Ret = false;

clang/lib/CConv/RewriteUtils.cpp

@@ -342,7 +342,7 @@ std::string ArrayBoundsRewriter::getBoundsString(PVConstraint *PV,
   // For itype we do not want to add a second ":".
   std::string Pfix = Isitype ? " " : " : ";
 
-  if (ValidBKey) {
+  if (ValidBKey && !PV->hasSomeSizedArr()) {
     ABounds *ArrB = ABInfo.getBounds(DK);
     // Only we we have bounds and no pointer arithmetic on the variable.
     if (ArrB != nullptr && !ABInfo.hasPointerArithmetic(DK)) {

clang/test/CheckedCRewriter/basic_checks.c

@@ -27,7 +27,7 @@ void typd_driver(void) {
 
 //CHECK_ALL: wchar_t buf _Checked[10];
 //CHECK_ALL: _Ptr<wchar_t> a = &buf[0];
-//CHECK_ALL: _Array_ptr<wchar_t> b = &buf[0];
+//CHECK_ALL: _Array_ptr<wchar_t> b : count(10) = &buf[0];
 
 
 typedef struct _A {

clang/test/CheckedCRewriter/simple_locals.c

@@ -151,7 +151,7 @@ void pullit(char *base, char *out, int *index) {
 
   return;
 }
-//CHECK_ALL: void pullit(_Array_ptr<char> base, _Ptr<char> out, _Ptr<int> index) _Checked {
+//CHECK_ALL: void pullit(_Array_ptr<char> base : count(10), _Ptr<char> out, _Ptr<int> index) _Checked {
 //CHECK_NOALL: void pullit(char *base, _Ptr<char> out, _Ptr<int> index) {
 
 void driver() {