[BOLT] Add first bits to build CFG

Summary: Add first bits to build CFG. (cherry picked from FBD19943472)
llvm · Feb 17, 2020 · 4ad5048 · 4ad5048
1 parent 5b64bf2
commit 4ad5048
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/bolt/src/MachORewriteInstance.cpp b/bolt/src/MachORewriteInstance.cpp
@@ -20,7 +20,7 @@ namespace opts {
 using namespace llvm;
 extern cl::opt<bool> PrintSections;
 extern cl::opt<bool> PrintDisasm;
-
+extern cl::opt<bool> PrintCFG;
 } // namespace opts
 
 namespace llvm {
@@ -121,13 +121,29 @@ void MachORewriteInstance::disassembleFunctions() {
     Function.disassemble();
     if (opts::PrintDisasm)
       Function.print(outs(), "after disassembly", true);
+    if (!Function.buildCFG(/*AllocId*/0)) {
+      errs() << "BOLT-WARNING: failed to build CFG for the function "
+             << Function << "\n";
+    }
+  }
+}
+
+void MachORewriteInstance::postProcessFunctions() {
+  for (auto &BFI : BC->getBinaryFunctions()) {
+    BinaryFunction &Function = BFI.second;
+    if (Function.empty())
+      continue;
+    Function.postProcessCFG();
+    if (opts::PrintCFG)
+      Function.print(outs(), "after building cfg", true);
   }
 }
 
 void MachORewriteInstance::run() {
   readSpecialSections();
   discoverFileObjects();
   disassembleFunctions();
+  postProcessFunctions();
 }
 
 MachORewriteInstance::~MachORewriteInstance() {}

diff --git a/bolt/src/MachORewriteInstance.h b/bolt/src/MachORewriteInstance.h
@@ -30,6 +30,7 @@ class MachORewriteInstance {
   void readSpecialSections();
   void discoverFileObjects();
   void disassembleFunctions();
+  void postProcessFunctions();
 
 public:
   MachORewriteInstance(object::MachOObjectFile *InputFile, DataReader &DR);

diff --git a/bolt/src/RewriteInstance.cpp b/bolt/src/RewriteInstance.cpp
@@ -273,7 +273,7 @@ PrintAll("print-all",
   cl::Hidden,
   cl::cat(BoltCategory));
 
-static cl::opt<bool>
+cl::opt<bool>
 PrintCFG("print-cfg",
   cl::desc("print functions after CFG construction"),
   cl::ZeroOrMore,