Fix for malloc incorrectly preventing checked region addition (issue #486)

clang/include/clang/3C/ConstraintVariables.h

@@ -130,6 +130,7 @@ class ConstraintVariable {
   // Here, AIdx is the pointer level which needs to be checked.
   // By default, we check for all pointer levels (or VarAtoms)
   virtual bool hasWild(const EnvironmentMap &E, int AIdx = -1) const = 0;
+  virtual bool hasParamWild(const EnvironmentMap &E) const = 0;
   virtual bool hasArr(const EnvironmentMap &E, int AIdx = -1) const = 0;
   virtual bool hasNtArr(const EnvironmentMap &E, int AIdx = -1) const = 0;
 
@@ -416,6 +417,7 @@ class PointerVariableConstraint : public ConstraintVariable {
   bool anyChanges(const EnvironmentMap &E) const override;
   bool anyArgumentIsWild(const EnvironmentMap &E);
   bool hasWild(const EnvironmentMap &E, int AIdx = -1) const override;
+  bool hasParamWild(const EnvironmentMap &E) const override;
   bool hasArr(const EnvironmentMap &E, int AIdx = -1) const override;
   bool hasNtArr(const EnvironmentMap &E, int AIdx = -1) const override;
 
@@ -476,6 +478,7 @@ class FVComponentVariable {
 
   bool hasItypeSolution(Constraints &CS) const;
   bool hasCheckedSolution(Constraints &CS) const;
+  bool hasWild(const EnvironmentMap &E) const;
 
   PVConstraint *getInternal() const { return InternalConstraint; }
   PVConstraint *getExternal() const { return ExternalConstraint; }
@@ -585,6 +588,7 @@ class FunctionVariableConstraint : public ConstraintVariable {
                        PersistentSourceLoc *PL) const override;
   bool anyChanges(const EnvironmentMap &E) const override;
   bool hasWild(const EnvironmentMap &E, int AIdx = -1) const override;
+  bool hasParamWild(const EnvironmentMap &E) const override;
   bool hasArr(const EnvironmentMap &E, int AIdx = -1) const override;
   bool hasNtArr(const EnvironmentMap &E, int AIdx = -1) const override;
 

clang/lib/3C/CheckedRegions.cpp

@@ -215,6 +215,10 @@ bool CheckedRegionFinder::VisitCStyleCastExpr(CStyleCastExpr *E) {
   return true;
 }
 
+
+
+
+
 bool CheckedRegionFinder::VisitCallExpr(CallExpr *C) {
   auto *FD = C->getDirectCallee();
   FoldingSetNodeID ID;
@@ -227,9 +231,10 @@ bool CheckedRegionFinder::VisitCallExpr(CallExpr *C) {
       if (Info.hasTypeParamBindings(C,Context))
         for (auto Entry : Info.getTypeParamBindings(C, Context))
           Wild |= (Entry.second == nullptr);
-      auto Type = FD->getReturnType();
+      const auto IT = FD->getInteropType();
+      const auto Type = FD->getReturnType();
       Wild |= (!(FD->hasPrototype() || FD->doesThisDeclarationHaveABody())) ||
-              containsUncheckedPtr(Type);
+              containsUncheckedPtr(IT.getTypePtrOrNull() ? IT : Type);
       auto *FV = Info.getFuncConstraint(FD, Context);
       for (unsigned I = 0; I < FV->numParams(); I++)
         Wild |= isWild(*FV->getExternalParam(I));
@@ -340,10 +345,11 @@ bool CheckedRegionFinder::isInStatementPosition(CallExpr *C) {
 }
 
 bool CheckedRegionFinder::isWild(CVarOption Cv) {
-  if (Cv.hasValue() &&
-      Cv.getValue().hasWild(Info.getConstraints().getVariables()))
-    return true;
-  return false;
+  const auto &E = Info.getConstraints().getVariables();
+  if (Cv.hasValue())
+    return Cv.getValue().hasWild(E) || Cv.getValue().hasParamWild(E);
+  else
+    return false;
 }
 
 bool CheckedRegionFinder::containsUncheckedPtr(QualType Qt) {

clang/lib/3C/ConstraintVariables.cpp

@@ -16,6 +16,7 @@
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/CommandLine.h"
 #include <sstream>
+#include <algorithm>
 
 using namespace clang;
 // Macro for boolean implication.
@@ -1049,11 +1050,15 @@ bool FunctionVariableConstraint::anyChanges(const EnvironmentMap &E) const {
            return CV.ExternalConstraint->anyChanges(E);
          });
 }
-
 bool FunctionVariableConstraint::hasWild(const EnvironmentMap &E,
                                          int AIdx) const {
   return ReturnVar.ExternalConstraint->hasWild(E, AIdx);
 }
+bool FunctionVariableConstraint::hasParamWild(const EnvironmentMap &E) const {
+  return std::any_of(this->ParamVars.begin(), this->ParamVars.end(),
+                [&E](const auto V) { return V.hasWild(E); } );
+}
+
 
 bool FunctionVariableConstraint::hasArr(const EnvironmentMap &E,
                                         int AIdx) const {
@@ -1241,6 +1246,13 @@ bool PointerVariableConstraint::hasWild(const EnvironmentMap &E,
   return false;
 }
 
+bool PointerVariableConstraint::hasParamWild(const EnvironmentMap &E) const {
+  if (const auto *TFV = this->getFV())
+    return TFV->hasParamWild(E);
+  else
+    return false;
+}
+
 bool PointerVariableConstraint::hasArr(const EnvironmentMap &E,
                                        int AIdx) const {
   int VarIdx = 0;
@@ -1915,6 +1927,10 @@ std::string FVComponentVariable::mkItypeStr(Constraints &CS) const {
   return "";
 }
 
+bool FVComponentVariable::hasWild(const EnvironmentMap &E) const {
+  return InternalConstraint->hasWild(E);
+}
+
 bool FVComponentVariable::hasCheckedSolution(Constraints &CS) const {
   // If the external constraint variable is checked, then the variable should
   // be advertised as checked to callers. If the internal and external

clang/test/3C/3d-allocation.c

@@ -13,7 +13,7 @@ extern _Itype_for_any(T) void *malloc(size_t size)
 
 int ***malloc3d(int y, int x, int z) {
   //CHECK_NOALL: int ***malloc3d(int y, int x, int z) : itype(_Ptr<int **>) {
-  //CHECK_ALL: _Array_ptr<_Array_ptr<_Array_ptr<int>>> malloc3d(int y, int x, int z) : count(y) {
+  //CHECK_ALL: _Array_ptr<_Array_ptr<_Array_ptr<int>>> malloc3d(int y, int x, int z) : count(y) _Checked {
 
   int i, j;
 

clang/test/3C/b13_calleestructp.c

@@ -40,6 +40,8 @@ struct r {
 };
 
 struct p sus(struct p x) {
+  //CHECK_NOALL: struct p sus(struct p x) {
+  //CHECK_ALL: struct p sus(struct p x) _Checked {
   x.x += 1;
   struct p *n = malloc(sizeof(struct p));
   //CHECK: _Ptr<struct p> n = malloc<struct p>(sizeof(struct p));

clang/test/3C/b14_callerstructp.c

@@ -40,6 +40,8 @@ struct r {
 };
 
 struct p sus(struct p x) {
+  //CHECK_NOALL: struct p sus(struct p x) {
+  //CHECK_ALL: struct p sus(struct p x) _Checked {
   struct p *n = malloc(sizeof(struct p));
   //CHECK: _Ptr<struct p> n = malloc<struct p>(sizeof(struct p));
   return *n;

clang/test/3C/b18_bothstructp.c

@@ -40,6 +40,8 @@ struct r {
 };
 
 struct p sus(struct p x) {
+  //CHECK_NOALL: struct p sus(struct p x) {
+  //CHECK_ALL: struct p sus(struct p x) _Checked {
   x.x += 1;
   struct p *n = malloc(sizeof(struct p));
   //CHECK: _Ptr<struct p> n = malloc<struct p>(sizeof(struct p));

clang/test/3C/b1_allsafe.c

@@ -22,7 +22,7 @@ extern _Unchecked char *strcpy(char *restrict dest, const char *restrict src
 
 int *sus(int *x, int *y) {
   //CHECK_NOALL: _Ptr<int> sus(int *x : itype(_Ptr<int>), _Ptr<int> y) {
-  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) {
+  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) _Checked {
   int *z = malloc(sizeof(int));
   //CHECK: _Ptr<int> z = malloc<int>(sizeof(int));
   *z = 1;
@@ -32,8 +32,7 @@ int *sus(int *x, int *y) {
 }
 
 int *foo() {
-  //CHECK_NOALL: _Ptr<int> foo(void) _Checked {
-  //CHECK_ALL: _Ptr<int> foo(void) {
+  //CHECK: _Ptr<int> foo(void) {
   int sx = 3, sy = 4;
   int *x = &sx;
   //CHECK_NOALL: _Ptr<int> x = &sx;
@@ -48,8 +47,7 @@ int *foo() {
 }
 
 int *bar() {
-  //CHECK_NOALL: _Ptr<int> bar(void) _Checked {
-  //CHECK_ALL: _Ptr<int> bar(void) {
+  //CHECK: _Ptr<int> bar(void) {
   int sx = 3, sy = 4;
   int *x = &sx;
   //CHECK_NOALL: _Ptr<int> x = &sx;

clang/test/3C/b23_explicitunsafecast.c

@@ -22,7 +22,7 @@ extern _Unchecked char *strcpy(char *restrict dest, const char *restrict src
 
 int *sus(int *x, int *y) {
   //CHECK_NOALL: _Ptr<int> sus(int *x : itype(_Ptr<int>), _Ptr<int> y) {
-  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) {
+  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) _Checked {
   int *z = malloc(sizeof(int));
   //CHECK: _Ptr<int> z = malloc<int>(sizeof(int));
   *z = 1;

clang/test/3C/b24_implicitunsafecast.c

@@ -22,7 +22,7 @@ extern _Unchecked char *strcpy(char *restrict dest, const char *restrict src
 
 int *sus(int *x, int *y) {
   //CHECK_NOALL: _Ptr<int> sus(int *x : itype(_Ptr<int>), _Ptr<int> y) {
-  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) {
+  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) _Checked {
   int *z = malloc(sizeof(int));
   //CHECK: _Ptr<int> z = malloc<int>(sizeof(int));
   *z = 1;

clang/test/3C/b24_retswitchimplicit.c

@@ -22,7 +22,7 @@ extern _Unchecked char *strcpy(char *restrict dest, const char *restrict src
 
 char *sus(int *x, int *y) {
   //CHECK_NOALL: _Ptr<char> sus(int *x : itype(_Ptr<int>), _Ptr<int> y) {
-  //CHECK_ALL: _Ptr<char> sus(_Array_ptr<int> x, _Ptr<int> y) {
+  //CHECK_ALL: _Ptr<char> sus(_Array_ptr<int> x, _Ptr<int> y) _Checked {
   char *z = malloc(sizeof(char));
   //CHECK: _Ptr<char> z = malloc<char>(sizeof(char));
   *z = 1;

clang/test/3C/b25_castprotosafe.c

@@ -55,7 +55,7 @@ int *bar() {
 
 int *sus(int *x, int *y) {
   //CHECK_NOALL: _Ptr<int> sus(int *x : itype(_Ptr<int>), _Ptr<int> y) {
-  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) {
+  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) _Checked {
   int *z = malloc(sizeof(int));
   //CHECK: _Ptr<int> z = malloc<int>(sizeof(int));
   *z = 1;

clang/test/3C/b26_castprotounsafe.c

@@ -55,7 +55,7 @@ char *bar() {
 
 int *sus(int *x, int *y) {
   //CHECK_NOALL: _Ptr<int> sus(int *x : itype(_Ptr<int>), _Ptr<int> y) {
-  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) {
+  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) _Checked {
   int *z = malloc(sizeof(int));
   //CHECK: _Ptr<int> z = malloc<int>(sizeof(int));
   *z = 1;

clang/test/3C/b26_castprotounsafeimplicit.c

@@ -55,7 +55,7 @@ char *bar() {
 
 int *sus(int *x, int *y) {
   //CHECK_NOALL: _Ptr<int> sus(int *x : itype(_Ptr<int>), _Ptr<int> y) {
-  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) {
+  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) _Checked {
   int *z = malloc(sizeof(int));
   //CHECK: _Ptr<int> z = malloc<int>(sizeof(int));
   *z = 1;

clang/test/3C/b26_castprotounsafeimplicitretswitch.c

@@ -55,7 +55,7 @@ int *bar() {
 
 char *sus(int *x, int *y) {
   //CHECK_NOALL: _Ptr<char> sus(int *x : itype(_Ptr<int>), _Ptr<int> y) {
-  //CHECK_ALL: _Ptr<char> sus(_Array_ptr<int> x, _Ptr<int> y) {
+  //CHECK_ALL: _Ptr<char> sus(_Array_ptr<int> x, _Ptr<int> y) _Checked {
   char *z = malloc(sizeof(char));
   //CHECK: _Ptr<char> z = malloc<char>(sizeof(char));
   *z = 1;

clang/test/3C/b2_calleeunsafe.c

@@ -33,8 +33,7 @@ int *sus(int *x, int *y) {
 }
 
 int *foo() {
-  //CHECK_NOALL: _Ptr<int> foo(void) _Checked {
-  //CHECK_ALL: _Ptr<int> foo(void) {
+  //CHECK: _Ptr<int> foo(void) {
   int sx = 3, sy = 4;
   int *x = &sx;
   //CHECK_NOALL: _Ptr<int> x = &sx;
@@ -49,8 +48,7 @@ int *foo() {
 }
 
 int *bar() {
-  //CHECK_NOALL: _Ptr<int> bar(void) _Checked {
-  //CHECK_ALL: _Ptr<int> bar(void) {
+  //CHECK: _Ptr<int> bar(void) {
   int sx = 3, sy = 4;
   int *x = &sx;
   //CHECK_NOALL: _Ptr<int> x = &sx;

clang/test/3C/b30_structprotoconflictbodyconvert.c

@@ -80,7 +80,8 @@ struct np *bar() {
 }
 
 struct np *sus(struct r *x, struct r *y) {
-  //CHECK: _Ptr<struct np> sus(_Ptr<struct r> x, _Ptr<struct r> y) {
+  //CHECK_NOALL: _Ptr<struct np> sus(_Ptr<struct r> x, _Ptr<struct r> y) {
+  //CHECK_ALL: _Ptr<struct np> sus(_Ptr<struct r> x, _Ptr<struct r> y) _Checked {
   x->next += 1;
   struct np *z = malloc(sizeof(struct np));
   //CHECK: _Ptr<struct np> z = malloc<struct np>(sizeof(struct np));

clang/test/3C/b3_onecallerunsafe.c

@@ -33,8 +33,7 @@ int *sus(int *x, int *y) {
 }
 
 int *foo() {
-  //CHECK_NOALL: _Ptr<int> foo(void) _Checked {
-  //CHECK_ALL: _Ptr<int> foo(void) {
+  //CHECK: _Ptr<int> foo(void) {
   int sx = 3;
   int sy = 4;
   int *x = &sx;

clang/test/3C/b4_bothunsafe.c

@@ -33,8 +33,7 @@ int *sus(int *x, int *y) {
 }
 
 int *foo() {
-  //CHECK_NOALL: _Ptr<int> foo(void) _Checked {
-  //CHECK_ALL: _Ptr<int> foo(void) {
+  //CHECK: _Ptr<int> foo(void) {
   int sx = 3, sy = 4;
   int *x = &sx;
   //CHECK_NOALL: _Ptr<int> x = &sx;

clang/test/3C/b5_calleeunsafeproto.c

@@ -25,8 +25,7 @@ int *sus(int *, int *);
 //CHECK_ALL: int *sus(_Array_ptr<int> x, _Ptr<int> y) : itype(_Ptr<int>);
 
 int *foo() {
-  //CHECK_NOALL: _Ptr<int> foo(void) _Checked {
-  //CHECK_ALL: _Ptr<int> foo(void) {
+  //CHECK: _Ptr<int> foo(void) {
   int sx = 3, sy = 4;
   int *x = &sx;
   //CHECK_NOALL: _Ptr<int> x = &sx;
@@ -41,8 +40,7 @@ int *foo() {
 }
 
 int *bar() {
-  //CHECK_NOALL: _Ptr<int> bar(void) _Checked {
-  //CHECK_ALL: _Ptr<int> bar(void) {
+  //CHECK: _Ptr<int> bar(void) {
   int sx = 3, sy = 4;
   int *x = &sx;
   //CHECK_NOALL: _Ptr<int> x = &sx;

clang/test/3C/b6_callerunsafeproto.c

@@ -25,8 +25,7 @@ int *sus(int *, int *);
 //CHECK_ALL: int *sus(_Array_ptr<int> x, _Ptr<int> y) : itype(_Array_ptr<int>);
 
 int *foo() {
-  //CHECK_NOALL: _Ptr<int> foo(void) _Checked {
-  //CHECK_ALL: _Ptr<int> foo(void) {
+  //CHECK: _Ptr<int> foo(void) {
   int sx = 3, sy = 4;
   int *x = &sx;
   //CHECK_NOALL: _Ptr<int> x = &sx;

clang/test/3C/b7_allsafeproto.c

@@ -25,8 +25,7 @@ int *sus(int *, int *);
 //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y);
 
 int *foo() {
-  //CHECK_NOALL: _Ptr<int> foo(void) _Checked {
-  //CHECK_ALL: _Ptr<int> foo(void) {
+  //CHECK: _Ptr<int> foo(void) {
   int sx = 3, sy = 4;
   int *x = &sx;
   //CHECK_NOALL: _Ptr<int> x = &sx;
@@ -41,8 +40,7 @@ int *foo() {
 }
 
 int *bar() {
-  //CHECK_NOALL: _Ptr<int> bar(void) _Checked {
-  //CHECK_ALL: _Ptr<int> bar(void) {
+  //CHECK: _Ptr<int> bar(void) {
   int sx = 3, sy = 4;
   int *x = &sx;
   //CHECK_NOALL: _Ptr<int> x = &sx;
@@ -57,7 +55,7 @@ int *bar() {
 
 int *sus(int *x, int *y) {
   //CHECK_NOALL: _Ptr<int> sus(int *x : itype(_Ptr<int>), _Ptr<int> y) {
-  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) {
+  //CHECK_ALL: _Ptr<int> sus(_Array_ptr<int> x, _Ptr<int> y) _Checked {
   int *z = malloc(sizeof(int));
   //CHECK: _Ptr<int> z = malloc<int>(sizeof(int));
   *z = 1;

clang/test/3C/b9_allsafestructp.c

@@ -39,6 +39,7 @@ struct r {
 };
 
 struct p sus(struct p x) {
+  //CHECK: struct p sus(struct p x) _Checked {
   struct p *n = malloc(sizeof(struct p));
   //CHECK: _Ptr<struct p> n = malloc<struct p>(sizeof(struct p));
   return *n;

clang/test/3C/complex_expression.c

@@ -41,9 +41,9 @@ int *foo(int *y, int *w) {
 //CHECK-NEXT:   return x;
 //CHECK-NEXT: }
 
-//CHECK_ALL: _Array_ptr<int> foo(_Array_ptr<int> y, _Ptr<int> w) _Checked {
+//CHECK_ALL: _Array_ptr<int> foo(_Array_ptr<int> y, _Ptr<int> w) {
 //CHECK_ALL: _Array_ptr<int> z = 0;
-//CHECK_NOALL: _Ptr<int> foo(_Ptr<int> y, _Ptr<int> w) _Checked {
+//CHECK_NOALL: _Ptr<int> foo(_Ptr<int> y, _Ptr<int> w) {
 //CHECK_NOALL: _Ptr<int> z = 0;
 
 void baz(int *p) {

clang/test/3C/fn_sets.c

@@ -22,7 +22,7 @@ int *g(int *y) {
 }
 
 void foo(int *z) {
-  //CHECK: void foo(_Ptr<int> z) _Checked {
+  //CHECK: void foo(_Ptr<int> z) {
   int *w = (0 ? f : g)(z);
   //CHECK: _Ptr<int> w = (0 ? f : g)(z);
 }

clang/test/3C/fptr.c

@@ -13,7 +13,7 @@ char *bar(int x) {
 }
 
 int f(char c) {
-  //CHECK: int f(char c) _Checked {
+  //CHECK: int f(char c) {
   int (*x)(char *) = &foo;
   //CHECK: _Ptr<int (char * : itype(_Ptr<char>))> x = &foo;