Bugfix#349

clang/lib/3C/ConstraintVariables.cpp

@@ -177,7 +177,6 @@ PointerVariableConstraint::PointerVariableConstraint(
   QualType QTy = QT;
   const Type *Ty = QTy.getTypePtr();
   auto &CS = I.getConstraints();
-  typedeflevelinfo = TypedefLevelFinder::find(QT);
   // If the type is a decayed type, then maybe this is the result of
   // decaying an array to a pointer. If the original type is some
   // kind of array type, we want to use that instead.
@@ -253,6 +252,8 @@ PointerVariableConstraint::PointerVariableConstraint(
     }
   }
 
+  typedeflevelinfo = TypedefLevelFinder::find(QTy);
+
   bool VarCreated = false;
   bool IsArr = false;
   bool IsIncompleteArr = false;

clang/test/3C/hash.c

@@ -1,7 +1,5 @@
 // RUN: 3c -alltypes %s | FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" %s
-
-// Currently not possible to run clang on the output,
-// there is an error reported at https://github.com/correctcomputation/checkedc-clang/issues/349
+// RUN: 3c -alltypes %s | %clang -f3c-tool -c -fcheckedc-extension -x c -o %t1.unused -
 
 /*
  * Based on hash.c in Very Secure FTPd
@@ -25,6 +23,7 @@ extern int memcmp(const void *src1 : byte_count(n), const void *src2 : byte_coun
 
 _Itype_for_any(T) void
 vsf_sysutil_memclr(void* p_dest : itype(_Array_ptr<T>) byte_count(size), unsigned int size)
+// CHECK_ALL: vsf_sysutil_memclr(_Array_ptr<T> p_dest : itype(_Array_ptr<T>) byte_count(size), unsigned int size)
 {
   /* Safety */
   if (size == 0)

clang/test/3C/type_params.c

@@ -1,6 +1,6 @@
-// RUN: 3c -addcr -alltypes %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 | 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 %t1.unused -
 
 // General demonstration
 _Itype_for_any(T) void *test_single(void *a : itype(_Ptr<T>), void *b : itype(_Ptr<T>)) : itype(_Ptr<T>);
@@ -157,3 +157,17 @@ void *example1(void * ptr, unsigned int size) {
     // CHECK: ret = realloc<void>(ptr, size);
     return ret;
 }
+
+// Issue #349. Check that the parameter doesn't inherit the double pointer argument within do_doubleptr
+_Itype_for_any(T)
+void incoming_doubleptr(void* ptr : itype(_Array_ptr<T>)) {
+// CHECK_ALL: void incoming_doubleptr(_Array_ptr<T> ptr : itype(_Array_ptr<T>)) {
+  return;
+}
+
+void do_doubleptr(int count) {
+  int **arr = malloc(sizeof(int*) * count);
+  // CHECK_ALL: _Array_ptr<_Ptr<int>> arr : count(count) = malloc<_Ptr<int>>(sizeof(int*) * count);
+  incoming_doubleptr(arr);
+  // CHECK_ALL: incoming_doubleptr<_Ptr<int>>(arr);
+}

clang/test/3C/type_params_xfail1.c

@@ -0,0 +1,28 @@
+// RUN: 3c -addcr -alltypes %s | FileCheck -match-full-lines %s
+
+// XFAIL: *
+
+// This fails because the type variable is used to constrain both calls to `incoming_doubleptr`.
+// To be correct, the usage of a type variable should be independent at each call site.
+
+// adapted from type_params.c
+#include <stddef.h>
+_Itype_for_any(T) void *malloc(size_t size) : itype(_Array_ptr<T>) byte_count(size);
+
+_Itype_for_any(T)
+void incoming_doubleptr(_Array_ptr<T> ptr : itype(_Array_ptr<T>)) {
+  return;
+}
+
+void do_doubleptr(int count) {
+  int **arr = malloc(sizeof(int*) * count);
+  // CHECK: _Array_ptr<_Ptr<int>> arr : count(count) = malloc<_Ptr<int>>(sizeof(int*) * count);
+  incoming_doubleptr(arr);
+}
+
+// adding this function changes the infered type of the previous one unnecessarily
+void interfere_doubleptr(void)
+{
+  float fl _Checked[5][5] = {};
+  incoming_doubleptr(fl);
+}