Minimal fix to detect inline structs nested in other structs so

multi-decl rewriting splits them rather than losing them.

Fixes #531
except for a "declaration does not declare anything" compiler warning
that will be addressed by de-nesting the inline structs.

Author: mattmccutchen-cci

clang/include/clang/3C/DeclRewriter.h

@@ -40,6 +40,9 @@ class DeclRewriter {
                  std::string &IType, ProgramInfo &Info,
                  ArrayBoundsRewriter &ABR);
 
+  // Called from the outside by FieldFinder.
+  static void detectInlineStruct(Decl *D, SourceManager &SM);
+
 private:
   static RecordDecl *LastRecordDecl;
   static std::map<Decl *, Decl *> VDToRDMap;
@@ -79,7 +82,6 @@ class DeclRewriter {
   bool isSingleDeclaration(DeclReplacement *N);
   bool areDeclarationsOnSameLine(DeclReplacement *N1, DeclReplacement *N2);
   SourceRange getNextCommaOrSemicolon(SourceLocation L);
-  static void detectInlineStruct(Decl *D, SourceManager &SM);
 };
 
 // Visits function declarations and adds entries with their new rewritten
@@ -129,6 +131,7 @@ class FieldFinder : public RecursiveASTVisitor<FieldFinder> {
   FieldFinder(GlobalVariableGroups &GVG) : GVG(GVG) {}
 
   bool VisitFieldDecl(FieldDecl *FD);
+  bool VisitRecordDecl(RecordDecl *RD);
 
   static void gatherSameLineFields(GlobalVariableGroups &GVG, Decl *D);
 

clang/include/clang/3C/RewriteUtils.h

@@ -166,6 +166,8 @@ class GlobalVariableGroups {
 
   virtual ~GlobalVariableGroups();
 
+  SourceManager &getSourceManager() { return SM; }
+
 private:
   SourceManager &SM;
   std::map<Decl *, std::vector<Decl *> *> GlobVarGroups;

clang/lib/3C/DeclRewriter.cpp

@@ -521,15 +521,15 @@ void DeclRewriter::detectInlineStruct(Decl *D, SourceManager &SM) {
       RD->getBeginLoc().isValid()) {
     LastRecordDecl = RD;
   }
-  if (VarDecl *VD = dyn_cast<VarDecl>(D)) {
+  if (isa<VarDecl>(D) || isa<FieldDecl>(D)) {
     if (LastRecordDecl != nullptr) {
       auto LastRecordLocation = LastRecordDecl->getBeginLoc();
-      auto Begin = VD->getBeginLoc();
-      auto End = VD->getEndLoc();
+      auto Begin = D->getBeginLoc();
+      auto End = D->getEndLoc();
       bool IsInLineStruct = SM.isPointWithin(LastRecordLocation, Begin, End);
       if (IsInLineStruct) {
-        VDToRDMap[VD] = LastRecordDecl;
-        InlineVarDecls.insert(VD);
+        VDToRDMap[D] = LastRecordDecl;
+        InlineVarDecls.insert(D);
       }
     }
   }
@@ -859,7 +859,13 @@ bool FunctionDeclBuilder::inParamMultiDecl(const ParmVarDecl *PVD) {
   return false;
 }
 
+bool FieldFinder::VisitRecordDecl(RecordDecl *RD) {
+  DeclRewriter::detectInlineStruct(RD, GVG.getSourceManager());
+  return true;
+}
+
 bool FieldFinder::VisitFieldDecl(FieldDecl *FD) {
+  DeclRewriter::detectInlineStruct(FD, GVG.getSourceManager());
   GVG.addGlobalDecl(FD);
   return true;
 }