Issue #59: Replace JUMPDEST with BEGINSUB at begin of functions.

etclabscore · Apr 28, 2020 · e8c5a66 · e8c5a66
1 parent 6cf2cf9
commit e8c5a66
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/lib/Target/EVM/EVMFinalization.cpp b/lib/Target/EVM/EVMFinalization.cpp
@@ -42,6 +42,8 @@ class EVMFinalization final : public MachineFunctionPass {
 
   bool runOnMachineFunction(MachineFunction &MF) override;
   bool shouldInsertJUMPDEST(MachineBasicBlock &MBB) const;
+  bool shouldInsertBEGINSUB(MachineBasicBlock &MBB) const;
+
   void expandADJFP(MachineInstr *MI) const;
 };
 } // end anonymous namespace
@@ -56,6 +58,10 @@ FunctionPass *llvm::createEVMFinalization() {
 }
 
 bool EVMFinalization::shouldInsertJUMPDEST(MachineBasicBlock &MBB) const {
+  if (ST->hasSubroutine()) {
+    return false;
+  }
+
   if (MBB.empty()) {
     return false;
   }
@@ -69,6 +75,14 @@ bool EVMFinalization::shouldInsertJUMPDEST(MachineBasicBlock &MBB) const {
   return true;
 }
 
+bool EVMFinalization::shouldInsertBEGINSUB(MachineBasicBlock &MBB) const {
+  if (!ST->hasSubroutine()) {
+    return false;
+  }
+
+  return true;
+}
+
 void EVMFinalization::expandADJFP(MachineInstr* MI) const {
   MachineBasicBlock* MBB = MI->getParent();
   DebugLoc DL = MI->getDebugLoc();
@@ -116,11 +130,14 @@ bool EVMFinalization::runOnMachineFunction(MachineFunction &MF) {
 
     //// TODO: we force each of those MBB's to have address taken.
     //MBB.setHasAddressTaken();
+    MachineBasicBlock::iterator begin = MBB.begin();
     if (shouldInsertJUMPDEST(MBB)) {
-      MachineBasicBlock::iterator begin = MBB.begin();
       BuildMI(MBB, begin, begin->getDebugLoc(), TII->get(EVM::JUMPDEST));
+    } else if (shouldInsertBEGINSUB(MBB)) {
+      BuildMI(MBB, begin, begin->getDebugLoc(), TII->get(EVM::BEGINSUB));
     }
 
+
     // use iterator since we need to remove pseudo instructions
     for (MachineBasicBlock::iterator I = MBB.begin(), E = MBB.end();
          I != E;) {