Fix for issue #373

clang/include/clang/3C/ProgramInfo.h

@@ -129,7 +129,6 @@ class ProgramInfo : public ProgramVariableAdder {
 
   // Map storing constraint information for typedefed types
   // The set contains all the constraint variables that also use this tyepdef
-  // TODO this could be replaced w/ a signle CVar
   // The bool informs the rewriter whether or not this typedef should be
   // rewritten. It will be false for typedefs we don't support rewritting,
   // such as typedefs that are pointers to anonymous structs

clang/lib/3C/ProgramInfo.cpp

@@ -1047,8 +1047,8 @@ void ProgramInfo::addTypedef(PersistentSourceLoc PSL, bool ShouldCheck,
   auto Name = "typedef__" + TD->getNameAsString();
   auto* PV = new PointerVariableConstraint(TD->getUnderlyingType(), nullptr,
                                        Name, *this, C);
-  if (ShouldCheck && canWrite(PSL.getFileName()))
-    this->typedefVars[PSL] = {*PV};
-   else
-    this->typedefVars[PSL] = {};
+  if (!(ShouldCheck && canWrite(PSL.getFileName())))
+    PV->constrainToWild(this->getConstraints(), "wild", &PSL);
+  constrainWildIfMacro(PV, TD->getLocation(), &PSL);
+  this->typedefVars[PSL] = {*PV};
 }

clang/test/3C/basic_checks.c

@@ -39,7 +39,7 @@ void mut_pa(PA p) {
   p->a = 0;
   p->b = 1;
 }
-//CHECK: void mut_pa(_Ptr<struct _A> p) {
+//CHECK: void mut_pa(PA p) {
 
 void pa_driver(void) {
   A a = {0};
@@ -49,7 +49,7 @@ void pa_driver(void) {
 }
 //CHECK: void pa_driver(void) {
 //CHECK-NEXT: A a = {0};
-//CHECK-NEXT: _Ptr<struct _A> b = &a;
+//CHECK-NEXT: PA b = &a;
 
 int *id(int *a) {
   return a;

clang/test/3C/simple_locals.c

@@ -200,8 +200,8 @@ void dfnk(int a, int b) {
 }
 //CHECK: void dfnk(int a, int b) {
 //CHECK-NEXT: A j;
-//CHECK-NEXT: _Ptr<struct _A>  k = &j;
-//CHECK-NEXT: _Ptr<_Ptr<struct _A>>  u = &k;
+//CHECK-NEXT: PA k = &j;
+//CHECK-NEXT: PPA  u = &k;
 
 void adsfse(void) {
   int a = 0;

clang/test/3C/typedefs.c

@@ -76,6 +76,12 @@ void barfoo(intptr x) {
 	  *x = 5;
 }
 
+#define MYDECL typedef int* ZZZ;
+MYDECL
+void zzz(void) {
+  int x = 3;
+  ZZZ z = &x;
+}