[BOLT][NFC] Readability improvements in X86,Aarch64 MCPlusBuilder

Summary: Minor refactorings in target specific MCPlusBuilders to improve readability (cherry picked from FBD29309701)
llvm · Jun 18, 2021 · b964e85 · b964e85
1 parent dea6c24
commit b964e85
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/bolt/src/Target/AArch64/AArch64MCPlusBuilder.cpp b/bolt/src/Target/AArch64/AArch64MCPlusBuilder.cpp
@@ -569,12 +569,13 @@ class AArch64MCPlusBuilder : public MCPlusBuilder {
            OpNum != OpEnd; ++OpNum) {
         if (!Instr.getOperand(OpNum).isReg())
           continue;
-        Uses[&Instr].push_back(RegAliasTable[Instr.getOperand(OpNum).getReg()]);
+        unsigned Reg = Instr.getOperand(OpNum).getReg();
+        MCInst* AliasInst = RegAliasTable[Reg];
+        Uses[&Instr].push_back(AliasInst);
         LLVM_DEBUG({
-          dbgs() << "Adding reg operand " << Instr.getOperand(OpNum).getReg()
-                 << " refs ";
-          if (RegAliasTable[Instr.getOperand(OpNum).getReg()] != nullptr)
-            RegAliasTable[Instr.getOperand(OpNum).getReg()]->dump();
+          dbgs() << "Adding reg operand " << Reg << " refs ";
+          if (AliasInst != nullptr)
+            AliasInst->dump();
           else
             dbgs() << "\n";
         });

diff --git a/bolt/src/Target/X86/X86MCPlusBuilder.cpp b/bolt/src/Target/X86/X86MCPlusBuilder.cpp
@@ -3399,9 +3399,7 @@ class X86MCPlusBuilder : public MCPlusBuilder {
         NewCall->push_back(CallInst);
         MCInst &Compare = NewCall->back();
         Compare.clear();
-        if (CallInst.getOpcode() == X86::CALL64r ||
-            CallInst.getOpcode() == X86::JMP64r ||
-            CallInst.getOpcode() == X86::TAILJMPr) {
+        if (isBranchOnReg(CallInst)) {
           Compare.setOpcode(X86::CMP64rr);
         } else if (CallInst.getOpcode() == X86::CALL64pcrel32) {
           Compare.setOpcode(X86::CMP64ri32);
@@ -3422,9 +3420,7 @@ class X86MCPlusBuilder : public MCPlusBuilder {
         NewCall->push_back(CallInst);
         MCInst &Compare = NewCall->back();
         Compare.clear();
-        if (CallInst.getOpcode() == X86::CALL64r ||
-            CallInst.getOpcode() == X86::JMP64r ||
-            CallInst.getOpcode() == X86::TAILJMPr) {
+        if (isBranchOnReg(CallInst)) {
           Compare.setOpcode(X86::CMP64ri32);
         } else {
           Compare.setOpcode(X86::CMP64mi32);