write phi elimination

include/IR/IR_basic.h

@@ -89,17 +89,9 @@ class BRAction : public JMPActionItem {
   }
 };
 class UNConditionJMPAction : public JMPActionItem {
-  friend class IRBuilder;
-  friend class FunctionDefItem;
-  friend void GenerateNaiveASM(std::ostream &os, std::shared_ptr<ModuleItem> prog);
-  friend void NaiveBackend::GenerateASM(std::shared_ptr<ActionItem> act, std::vector<std::string> &code_lines,
-                                        NaiveBackend::FuncLayout &layout,
-                                        const std::unordered_map<std::string, IRClassInfo> &low_level_class_info,
-                                        bool process_phi);
-  friend class CFGType BuildCFGForFunction(const std::shared_ptr<class FunctionDefItem> &func);
+ public:
   std::string label_full;
 
- public:
   UNConditionJMPAction() = default;
   void RecursivePrint(std::ostream &os) const { os << "br label %" << label_full << "\n"; }
 };
@@ -492,10 +484,7 @@ class ConstStrItem : public LLVMIRItemBase {
   }
 };
 class ModuleItem : public LLVMIRItemBase {
-  friend class IRBuilder;
-  friend std::shared_ptr<ModuleItem> BuildIR(std::shared_ptr<Program_ASTNode> src);
-  friend void GenerateNaiveASM(std::ostream &os, std::shared_ptr<ModuleItem> prog);
-  friend std::shared_ptr<ModuleItem> Mem2Reg(std::shared_ptr<ModuleItem> src);
+ public:
   std::vector<std::shared_ptr<ConstStrItem>> const_strs;
   std::vector<std::shared_ptr<FunctionDeclareItem>> function_declares;
   std::vector<std::shared_ptr<TypeDefItem>> type_defs;
@@ -503,7 +492,6 @@ class ModuleItem : public LLVMIRItemBase {
   std::vector<std::shared_ptr<FunctionDefItem>> function_defs;
   std::unordered_map<std::string, IRClassInfo> low_level_class_info;
 
- public:
   ModuleItem() = default;
   void RecursivePrint(std::ostream &os) const {
     for (auto &item : const_strs) {

include/opt/cfg.h

@@ -8,8 +8,10 @@
 using CFGNodeCollection = std::list<class CFGNodeType *>;
 class CFGNodeType {
  public:
+  // successors, predecessors, corresponding_block is provided by BuildCFGForFunction
   std::vector<CFGNodeType *> successors, predecessors;
   BlockItem *corresponding_block;
+  // the following fields are provided by user
   CFGNodeCollection dom;
   bool visited;
   CFGNodeType *idom;

include/opt/opt.h

@@ -1,2 +1,3 @@
+#include "cfg.h"
 #include "mem2reg.h"
-#include "cfg.h"
+#include "regalloc.h"

include/opt/phieliminate.h

@@ -0,0 +1,18 @@
+#pragma once
+#include "IR/IR_basic.h"
+#include "cfg.h"
+
+namespace opt {
+class MoveInstruct : public ActionItem {
+ public:
+  std::string src_full;
+  std::string dest_full;
+  MoveInstruct() = default;
+  void RecursivePrint(std::ostream &os) const {
+    throw std::runtime_error("Move instruction is not an actual LLVM IR instruction");
+  }
+};
+}  // namespace opt
+
+
+std::shared_ptr<ModuleItem> PhiEliminate(std::shared_ptr<ModuleItem> src);

include/opt/regalloc.h

@@ -0,0 +1,2 @@
+#pragma once
+#include "phieliminate.h"