Merge pull request #331 from kyleheadley/bugfix#301

Add extern and static qualifiers to initialized variables

Author: mwhicks1

clang/lib/3C/StructInit.cpp

@@ -17,6 +17,8 @@
 using namespace clang;
 
 bool StructVariableInitializer::variableNeedsInitializer(VarDecl *VD) {
+  if (VD->getStorageClass() == StorageClass::SC_Extern)
+    return false;
   RecordDecl *RD = VD->getType().getTypePtr()->getAsRecordDecl();
   if (RecordDecl *Definition = RD->getDefinition()) {
     // See if we already know that this structure has a checked pointer.
@@ -49,7 +51,11 @@ void StructVariableInitializer::insertVarDecl(VarDecl *VD, DeclStmt *S) {
     if (variableNeedsInitializer(VD)) {
       // Create replacement declaration text with an initializer.
       const clang::Type *Ty = VD->getType().getTypePtr();
-      std::string ToReplace = tyToStr(Ty) + " " + VD->getName().str() + " = {}";
+      std::string TQ = VD->getType().getQualifiers().getAsString();
+      if (!TQ.empty()) { TQ += " "; }
+      std::string ToReplace =
+          getStorageQualifierString(VD) + TQ +
+          tyToStr(Ty) + " " + VD->getName().str() + " = {}";
       RewriteThese.insert(new VarDeclReplacement(VD, S, ToReplace));
     }
   }

clang/test/3C/qualifiers.c

@@ -52,3 +52,17 @@ void mixed() {
 }
 //CHECK: const volatile restrict _Ptr<int> a = ((void *)0);
 //CHECK: restrict _Ptr<const volatile _Ptr<const _Ptr<const volatile int>>> b = ((void *)0);
+
+struct qualifier_struct { int *a; };
+void structs() {
+  struct qualifier_struct a0;
+  static struct qualifier_struct a;
+  volatile static struct qualifier_struct b;
+  const static struct qualifier_struct *c;
+  const extern struct qualifier_struct d;
+}
+//CHECK: struct qualifier_struct a0 = {};
+//CHECK: static struct qualifier_struct a = {};
+//CHECK: static volatile struct qualifier_struct b = {};
+//CHECK: static _Ptr<const struct qualifier_struct> c = ((void *)0);
+//CHECK: const extern struct qualifier_struct d;