Fixing issue #373

Author: Aaron Eline

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

@@ -391,6 +391,8 @@ class PointerVariableConstraint : public ConstraintVariable {
     return S->getKind() == PointerVariable;
   }
 
+  std::string gatherQualStrings(void) const;
+
   std::string mkString(const EnvironmentMap &E, bool EmitName = true,
                        bool ForItype = false,
                        bool EmitPointee = false,

clang/lib/3C/ConstraintVariables.cpp

@@ -580,6 +580,7 @@ void PointerVariableConstraint::getQualString(uint32_t TypeIdx,
 
 void PointerVariableConstraint::insertQualType(uint32_t TypeIdx,
                                                QualType &QTy) {
+  if (QTy.isConstQualified())
   if (QTy.isConstQualified())
     QualMap[TypeIdx].insert(ConstQualification);
   if (QTy.isVolatileQualified())
@@ -653,11 +654,24 @@ void PointerVariableConstraint::setTypedef(TypedefNameDecl* T, std::string s) {
 // variables and potentially nested function pointer declaration. Produces a
 // string that can be replaced in the source code.
 
+std::string PointerVariableConstraint::gatherQualStrings(void) const {
+  std::ostringstream S;
+  uint32_t Idx = 0;
+
+  for (auto It = Vars.begin(); It != Vars.end(); It++, Idx++) {
+    getQualString(Idx, S);
+  }
+
+  return S.str();
+}
+
 std::string PointerVariableConstraint::mkString(const EnvironmentMap &E,
                                                 bool EmitName, bool ForItype,
                                                 bool EmitPointee, bool UnmaskTypedef) const {
-  if (IsTypedef && !UnmaskTypedef)
-    return typedefString + (EmitName && getName() != RETVAR ? (" " + getName()) : " ");
+  if (IsTypedef && !UnmaskTypedef) {
+    return gatherQualStrings() + typedefString +
+           (EmitName && getName() != RETVAR ? (" " + getName()) : " ");
+  }
 
   std::ostringstream Ss;
   // This deque will store all the type strings that need to pushed

clang/lib/3C/ProgramInfo.cpp

@@ -1042,8 +1042,10 @@ bool ProgramInfo::seenTypedef(PersistentSourceLoc PSL) {
 
 void ProgramInfo::addTypedef(PersistentSourceLoc PSL, bool ShouldCheck,
                              TypedefDecl* TD, ASTContext &C) {
+  llvm::errs() << "Creating tyepdefvar for " << TD->getNameAsString() << "\n";
+  auto Name = "typedef__" + TD->getNameAsString();
   auto* PV = new PointerVariableConstraint(TD->getUnderlyingType(), nullptr,
-                                       TD->getNameAsString(), *this, C);
+                                       Name, *this, C);
   if (ShouldCheck)
     this->typedefVars[PSL] = {*PV};
    else

clang/test/3C/typedefs.c

@@ -32,6 +32,8 @@ intptr bar(intptr x) {
 	return x;
 }
 
+typedef int* integer;
+//CHECK: typedef _Ptr<int> integer;
 int foo(void) { 
     //CHECK: int foo(void) {
     int x = 3;
@@ -48,6 +50,10 @@ int foo(void) {
     const nat z = 3;
     const nat* cnstp = &z;
     //CHECK: _Ptr<const nat> cnstp = &z;
+    int w = 34;
+    const integer c = &w;
+    //CHECK: const integer c = &w;
+
 
     return *p;
 }