Fixing issue when the return value is WILD inside the function

Author: Machiry

tools/checked-c-convert/ProgramInfo.cpp

@@ -167,7 +167,7 @@ void ProgramInfo::print_stats(std::set<std::string> &F, raw_ostream &O, bool onl
       varC += foundVars.size();
       for (const auto &N : foundVars) {
         VarAtom *V = CS.getVar(N);
-        assert(V != NULL);
+        assert(V != nullptr);
         auto K = env.find(V);
         assert(K != env.end());
 
@@ -240,10 +240,7 @@ bool ProgramInfo::checkStructuralEquality(QualType D, QualType S) {
   if (D == S)
     return true;
 
-  if (D->isPointerType() == S->isPointerType())
-    return true;
-
-  return false;
+  return D->isPointerType() == S->isPointerType();
 }
 
 bool ProgramInfo::isExternOkay(std::string ext) {

tools/checked-c-convert/RewriteUtils.cpp

@@ -512,9 +512,11 @@ bool CastPlacementVisitor::VisitFunctionDecl(FunctionDecl *FD) {
       }
     }
 
+    // this means inside the function, the return value is WILD
+    // so the return type is what was originally declared.
     if(!returnHandled) {
       // If we used to implement a bounds-safe interface, continue to do that.
-      returnVar = Decl->mkString(Info.getConstraints().getVariables());
+      returnVar = Decl->getOriginalTy() + " ";
 
       endStuff = getExistingIType(Decl, Defn, Declaration);
       if(!endStuff.empty()) {

tools/checked-c-convert/functests/ntarr/basic_field_local.expected.c

@@ -4,7 +4,7 @@
 // we will use b as an NTArr
 typedef struct {
    int a;
-   _Nt_array_ptrchar> b;
+   _Nt_array_ptr<char> b;
 } foo;
 // here we use b in a safe way as an array, hence
 // it will be a array ptr
@@ -21,7 +21,7 @@ typedef struct {
 
 int main() {
   foo obj;
-  _Nt_array_ptrchar> bp;
+  _Nt_array_ptr<char> bp;
   float b;
   foo2 obj2;
   int hel;

tools/checked-c-convert/functests/ntarr/basic_inter.expected.c

@@ -5,8 +5,8 @@
 // we test propagation with and without function
 // declaration.
 // here, ntiptr will be an itype(Nt_ptr)
-int funcdecl(char *ntiptr : itype(_Nt_array_ptrchar> ) , int *iptr : itype(_Ptr<int> ) , int *wild);
-int funcdecl(char *ntiptr : itype(_Nt_array_ptrchar> ) , int *iptr : itype(_Ptr<int> ) , int *wild) {
+int funcdecl(char *ntiptr : itype(_Nt_array_ptr<char> ) , int *iptr : itype(_Ptr<int> ) , int *wild);
+int funcdecl(char *ntiptr : itype(_Nt_array_ptr<char> ) , int *iptr : itype(_Ptr<int> ) , int *wild) {
    if(ntiptr != 0) {
     ntiptr = strstr("Hello", "world");
    }   

tools/checked-c-convert/functests/ntarr/basic_inter_field.expected.c

@@ -3,12 +3,12 @@
 // within the fields of structure.
 typedef struct {  
   _Ptr<int> ptr;
-  _Nt_array_ptrchar> ntptr; 
+  _Nt_array_ptr<char> ntptr; 
 } foo;
 
 foo obj1;
 
-_Ptr<int> func(_Ptr<int> ptr, _Nt_array_ptrchar> ntptr) {
+_Ptr<int> func(_Ptr<int> ptr, _Nt_array_ptr<char> ntptr) {
    obj1.ptr = ptr;
    obj1.ntptr = strstr(ntptr, "world");
    return ptr;
@@ -17,7 +17,7 @@ _Ptr<int> func(_Ptr<int> ptr, _Nt_array_ptrchar> ntptr) {
 int main() {
   int a;
   _Ptr<int> b;
-  _Nt_array_ptrchar> wil;
+  _Nt_array_ptr<char> wil;
   a = strlen(wil);
   b = func(&a, wil);
 }

tools/checked-c-convert/functests/ntarr/basic_local.expected.c

@@ -6,11 +6,11 @@ int main() {
   // as NTArr
   // we use this as an argument
   // to string function.
-  _Nt_array_ptrchar> a;
+  _Nt_array_ptr<char> a;
   // c should be identified as 
   // ARR as we assign it the return value of
   // string function use it.
-  _Nt_array_ptrchar> c;
+  _Nt_array_ptr<char> c;
   // we will make this wild.
   int *d;
   int b;