Fixed the addition of storage qualifiers (i.e., static and extern)

Author: Machiry

tools/checked-c-convert/RewriteUtils.cpp

@@ -522,7 +522,7 @@ bool CastPlacementVisitor::VisitFunctionDecl(FunctionDecl *FD) {
       }
     }
 
-    s = returnVar + cDecl->getName() + "(";
+    s = getStorageQualifierString(Definition) + returnVar + cDecl->getName() + "(";
     if (parmStrs.size() > 0) {
       std::ostringstream ss;
 
@@ -809,8 +809,8 @@ void RewriteConsumer::HandleTranslationUnit(ASTContext &Context) {
 
       if (PV && PV->anyChanges(Info.getConstraints().getVariables())) {
         // Rewrite a declaration.
-        std::string newTy = PV->mkString(Info.getConstraints().getVariables());
-        rewriteThese.insert(DAndReplace(D, DS, newTy));;
+        std::string newTy = getStorageQualifierString(D) + PV->mkString(Info.getConstraints().getVariables());
+        rewriteThese.insert(DAndReplace(D, DS, newTy));
       } else if (FV && FV->anyChanges(Info.getConstraints().getVariables())) {
         // Rewrite a function variables return value.
         std::set<ConstraintVariable*> V = FV->getReturnVars();

tools/checked-c-convert/RewriteUtils.h

@@ -33,6 +33,11 @@ struct DAndReplace
                     Statement(nullptr),
                     Replacement(""),
                     fullDecl(false) { }
+    DAndReplace(const DAndReplace &other, std::string R): Declaration(other.Declaration),
+                                                          Statement(other.Statement),
+                                                          Replacement(R),
+                                                          fullDecl(other.fullDecl) {}
+
 
     DAndReplace(Decl *D, std::string R) : Declaration(D),
                                           Statement(nullptr),

tools/checked-c-convert/Utils.cpp

@@ -134,4 +134,25 @@ bool isFunctionPointerExpr(clang::Expr *toCheck) {
     return dyn_cast<FunctionDecl>(DRE->getDecl()) != nullptr;
   }
   return false;
+}
+
+static std::string storageClassToString(StorageClass SC) {
+  switch(SC) {
+    case StorageClass::SC_Static: return "static ";
+    case StorageClass::SC_Extern: return "extern ";
+    // no default class, we do not care.
+  }
+  return "";
+}
+
+// this method gets the storage qualifier for the
+// provided declaration i.e., static, extern, etc.
+std::string getStorageQualifierString(Decl *D) {
+  if(FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
+    return storageClassToString(FD->getStorageClass());
+  }
+  if(VarDecl *VD = dyn_cast<VarDecl>(D)) {
+    return storageClassToString(VD->getStorageClass());
+  }
+  return "";
 }

tools/checked-c-convert/Utils.h

@@ -40,5 +40,7 @@ bool hasFunctionBody(clang::Decl *param);
 
 bool isFunctionPointerExpr(clang::Expr *toCheck);
 
+std::string getStorageQualifierString(clang::Decl *D);
+
 clang::SourceLocation getFunctionDeclarationEnd(clang::FunctionDecl *FD, clang::SourceManager &S);
 #endif