[PP-EXT][Refactoring] Outline utils function from Parser to CGFunctionInfo header

Author: kpdev

clang/include/clang/CodeGen/CGFunctionInfo.h

@@ -799,6 +799,23 @@ class CGFunctionInfo final
 };
 
 }  // end namespace CodeGen
+
+enum class PPStructType {
+  Default,
+  Generalization,
+  Specialization
+};
+
+PPStructType PPExtGetStructType(const RecordDecl* RD);
+
+struct PPStructInitDesc {
+  NamedDecl* VD;
+  const RecordDecl* RD;
+  const PPStructType Type;
+};
+
+std::vector<PPStructInitDesc> PPExtGetRDListToInit(const RecordDecl* RD);
+
 }  // end namespace clang
 
 #endif

clang/include/clang/Parse/Parser.h

@@ -18,6 +18,7 @@
 #include "clang/Basic/OpenMPKinds.h"
 #include "clang/Basic/OperatorPrecedence.h"
 #include "clang/Basic/Specifiers.h"
+#include "clang/CodeGen/CGFunctionInfo.h"
 #include "clang/Lex/CodeCompletionHandler.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Sema/DeclSpec.h"
@@ -287,22 +288,6 @@ class Parser : public CodeCompletionHandler {
     bool NeedToAddLParen = true
   );
 
-  enum class PPStructType {
-    Default,
-    Generalization,
-    Specialization
-  };
-
-  PPStructType PPExtGetStructType(const RecordDecl* RD) const;
-
-  struct PPStructInitDesc {
-    NamedDecl* VD;
-    const RecordDecl* RD;
-    const PPStructType Type;
-  };
-
-  std::vector<PPStructInitDesc> PPExtGetRDListToInit(const RecordDecl* RD) const;
-
   std::string PPExtConstructTagName(StringRef GenName);
 
   struct PPMemberInitData {

clang/lib/Parse/ParseStmt.cpp

@@ -45,6 +45,81 @@ StmtResult Parser::ParseStatement(SourceLocation *TrailingElseLoc,
   return Res;
 }
 
+namespace clang
+{
+
+PPStructType
+PPExtGetStructType(const RecordDecl* RD)
+{
+  StringRef TagFieldName("__pp_specialization_type");
+  for (auto FieldIter = RD->field_begin();
+            FieldIter != RD->field_end(); ++FieldIter) {
+    if (FieldIter->getName().equals(TagFieldName)) {
+      return PPStructType::Generalization;
+    }
+  }
+
+  if (RD->getName().startswith("__pp_struct")) {
+    return PPStructType::Specialization;
+  }
+
+  return PPStructType::Default;
+}
+
+std::vector<PPStructInitDesc>
+PPExtGetRDListToInit(const RecordDecl* RD)
+{
+  std::vector<PPStructInitDesc> Result;
+  assert(!RD->field_empty());
+  auto HeadElem = *RD->field_begin();
+  auto HeadType = HeadElem->getType();
+  const RecordDecl* RDHead = HeadType.getCanonicalType().getTypePtr()->
+                          getAsRecordDecl();
+
+  if (!RDHead ||
+      !HeadElem->getName().equals("__pp_head")) {
+    RDHead = RD;
+  }
+
+  for (auto FieldIter = RDHead->field_begin();
+            FieldIter != RDHead->field_end(); ++FieldIter) {
+    auto FieldType = FieldIter->getType();
+    RecordDecl* RDField = FieldType.getCanonicalType().getTypePtr()->
+                            getAsRecordDecl();
+    if (RDField) {
+      auto StrTy = PPExtGetStructType(RDField);
+      if (StrTy != PPStructType::Default) {
+        Result.emplace_back(
+          PPStructInitDesc{*FieldIter, RDField, StrTy});
+      }
+    }
+  }
+
+  return Result;
+}
+
+} // namespace clang
+
+
+
+PPStructType
+PPExtGetStructType(const RecordDecl* RD)
+{
+  StringRef TagFieldName("__pp_specialization_type");
+  for (auto FieldIter = RD->field_begin();
+            FieldIter != RD->field_end(); ++FieldIter) {
+    if (FieldIter->getName().equals(TagFieldName)) {
+      return PPStructType::Generalization;
+    }
+  }
+
+  if (RD->getName().startswith("__pp_struct")) {
+    return PPStructType::Specialization;
+  }
+
+  return PPStructType::Default;
+}
+
 /// ParseStatementOrDeclaration - Read 'statement' or 'declaration'.
 ///       StatementOrDeclaration:
 ///         statement
@@ -1168,57 +1243,6 @@ StmtResult Parser::handleExprStmt(ExprResult E, ParsedStmtContext StmtCtx) {
   return Actions.ActOnExprStmt(E, /*DiscardedValue=*/!IsStmtExprResult);
 }
 
-Parser::PPStructType
-Parser::PPExtGetStructType(const RecordDecl* RD) const
-{
-  StringRef TagFieldName("__pp_specialization_type");
-  for (auto FieldIter = RD->field_begin();
-            FieldIter != RD->field_end(); ++FieldIter) {
-    if (FieldIter->getName().equals(TagFieldName)) {
-      return PPStructType::Generalization;
-    }
-  }
-
-  if (RD->getName().startswith("__pp_struct")) {
-    return PPStructType::Specialization;
-  }
-
-  return PPStructType::Default;
-}
-
-
-std::vector<Parser::PPStructInitDesc>
-Parser::PPExtGetRDListToInit(const RecordDecl* RD) const
-{
-  std::vector<Parser::PPStructInitDesc> Result;
-  assert(!RD->field_empty());
-  auto HeadElem = *RD->field_begin();
-  auto HeadType = HeadElem->getType();
-  const RecordDecl* RDHead = HeadType.getCanonicalType().getTypePtr()->
-                          getAsRecordDecl();
-
-  if (!RDHead ||
-      !HeadElem->getName().equals("__pp_head")) {
-    RDHead = RD;
-  }
-
-  for (auto FieldIter = RDHead->field_begin();
-            FieldIter != RDHead->field_end(); ++FieldIter) {
-    auto FieldType = FieldIter->getType();
-    RecordDecl* RDField = FieldType.getCanonicalType().getTypePtr()->
-                            getAsRecordDecl();
-    if (RDField) {
-      auto StrTy = PPExtGetStructType(RDField);
-      if (StrTy != PPStructType::Default) {
-        Result.emplace_back(
-          PPStructInitDesc{*FieldIter, RDField, StrTy});
-      }
-    }
-  }
-
-  return Result;
-}
-
 
 Parser::PPMemberInitData
 Parser::PPExtInitPPStruct(PPStructInitDesc IDesc, Expr* MemberAccess)