[BOLT][BTI] rename addBTItoBBStart to insertBTI

Author: bgergely0

bolt/include/bolt/Core/MCPlusBuilder.h

@@ -1901,9 +1901,9 @@ class MCPlusBuilder {
     return false;
   }
 
-  /// Adds a BTI landing pad to the start of the BB, that matches the indirect
-  /// call/jump inst.
-  virtual void addBTItoBBStart(BinaryBasicBlock &BB, MCInst &Call) const {
+  /// Inserts a BTI landing pad to the start of the BB, that matches the
+  /// indirect call inst used to call the BB.
+  virtual void insertBTI(BinaryBasicBlock &BB, MCInst &Call) const {
     llvm_unreachable("not implemented");
   }
 

bolt/lib/Target/AArch64/AArch64MCPlusBuilder.cpp

@@ -2836,7 +2836,7 @@ class AArch64MCPlusBuilder : public MCPlusBuilder {
     return false;
   }
 
-  void addBTItoBBStart(BinaryBasicBlock &BB, MCInst &Call) const override {
+  void insertBTI(BinaryBasicBlock &BB, MCInst &Call) const override {
     auto II = BB.getFirstNonPseudo();
     if (II != BB.end()) {
       if (isBTIVariantCoveringCall(Call, *II))

bolt/unittests/Core/MCPlusBuilder.cpp

@@ -198,7 +198,7 @@ TEST_P(MCPlusBuilderTester, AArch64_BTI) {
   ASSERT_TRUE(BC->MIB->isImplicitBTIC(*II));
 }
 
-TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_0) {
+TEST_P(MCPlusBuilderTester, AArch64_insertBTI_0) {
   if (GetParam() != Triple::aarch64)
     GTEST_SKIP();
   BinaryFunction *BF = BC->createInjectedBinaryFunction("BF", true);
@@ -207,12 +207,12 @@ TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_0) {
   BB->addInstruction(Inst);
   // BR x16 needs BTI c or BTI j. We prefer adding a BTI c.
   MCInst CallInst = MCInstBuilder(AArch64::BR).addReg(AArch64::X16);
-  BC->MIB->addBTItoBBStart(*BB, CallInst);
+  BC->MIB->insertBTI(*BB, CallInst);
   auto II = BB->begin();
   ASSERT_TRUE(BC->MIB->isBTILandingPad(*II, true, false));
 }
 
-TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_1) {
+TEST_P(MCPlusBuilderTester, AArch64_insertBTI_1) {
   if (GetParam() != Triple::aarch64)
     GTEST_SKIP();
   BinaryFunction *BF = BC->createInjectedBinaryFunction("BF", true);
@@ -222,12 +222,12 @@ TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_1) {
   BB->addInstruction(BTIc);
   // BR x16 needs BTI c or BTI j. We have a BTI c, no change is needed.
   MCInst CallInst = MCInstBuilder(AArch64::BR).addReg(AArch64::X16);
-  BC->MIB->addBTItoBBStart(*BB, CallInst);
+  BC->MIB->insertBTI(*BB, CallInst);
   auto II = BB->begin();
   ASSERT_TRUE(BC->MIB->isBTILandingPad(*II, true, false));
 }
 
-TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_2) {
+TEST_P(MCPlusBuilderTester, AArch64_insertBTI_2) {
   if (GetParam() != Triple::aarch64)
     GTEST_SKIP();
   BinaryFunction *BF = BC->createInjectedBinaryFunction("BF", true);
@@ -238,12 +238,12 @@ TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_2) {
   // BR x5 needs BTI j
   // we have BTI c -> extend it to BTI jc.
   MCInst CallInst = MCInstBuilder(AArch64::BR).addReg(AArch64::X5);
-  BC->MIB->addBTItoBBStart(*BB, CallInst);
+  BC->MIB->insertBTI(*BB, CallInst);
   auto II = BB->begin();
   ASSERT_TRUE(BC->MIB->isBTILandingPad(*II, true, true));
 }
 
-TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_3) {
+TEST_P(MCPlusBuilderTester, AArch64_insertBTI_3) {
   if (GetParam() != Triple::aarch64)
     GTEST_SKIP();
   BinaryFunction *BF = BC->createInjectedBinaryFunction("BF", true);
@@ -252,12 +252,12 @@ TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_3) {
   BB->addInstruction(Inst);
   // BR x5 needs BTI j
   MCInst CallInst = MCInstBuilder(AArch64::BR).addReg(AArch64::X5);
-  BC->MIB->addBTItoBBStart(*BB, CallInst);
+  BC->MIB->insertBTI(*BB, CallInst);
   auto II = BB->begin();
   ASSERT_TRUE(BC->MIB->isBTILandingPad(*II, false, true));
 }
 
-TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_4) {
+TEST_P(MCPlusBuilderTester, AArch64_insertBTI_4) {
   if (GetParam() != Triple::aarch64)
     GTEST_SKIP();
   BinaryFunction *BF = BC->createInjectedBinaryFunction("BF", true);
@@ -266,12 +266,12 @@ TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_4) {
   BB->addInstruction(Inst);
   // BLR needs BTI c, regardless of the register used.
   MCInst CallInst = MCInstBuilder(AArch64::BLR).addReg(AArch64::X5);
-  BC->MIB->addBTItoBBStart(*BB, CallInst);
+  BC->MIB->insertBTI(*BB, CallInst);
   auto II = BB->begin();
   ASSERT_TRUE(BC->MIB->isBTILandingPad(*II, true, false));
 }
 
-TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_5) {
+TEST_P(MCPlusBuilderTester, AArch64_insertBTI_5) {
   if (GetParam() != Triple::aarch64)
     GTEST_SKIP();
   BinaryFunction *BF = BC->createInjectedBinaryFunction("BF", true);
@@ -282,12 +282,12 @@ TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_5) {
   // BLR needs BTI c, regardless of the register used.
   // We have a BTI j -> extend it to BTI jc.
   MCInst CallInst = MCInstBuilder(AArch64::BLR).addReg(AArch64::X5);
-  BC->MIB->addBTItoBBStart(*BB, CallInst);
+  BC->MIB->insertBTI(*BB, CallInst);
   auto II = BB->begin();
   ASSERT_TRUE(BC->MIB->isBTILandingPad(*II, true, true));
 }
 
-TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_6) {
+TEST_P(MCPlusBuilderTester, AArch64_insertBTI_6) {
   if (GetParam() != Triple::aarch64)
     GTEST_SKIP();
   BinaryFunction *BF = BC->createInjectedBinaryFunction("BF", true);
@@ -297,7 +297,7 @@ TEST_P(MCPlusBuilderTester, AArch64_addBTItoBBStart_6) {
   BB->addInstruction(Paciasp);
   // PACI(AB)SP are implicit BTI c, no change needed.
   MCInst CallInst = MCInstBuilder(AArch64::BR).addReg(AArch64::X17);
-  BC->MIB->addBTItoBBStart(*BB, CallInst);
+  BC->MIB->insertBTI(*BB, CallInst);
   auto II = BB->begin();
   ASSERT_TRUE(BC->MIB->isBTILandingPad(*II, true, false));
   ASSERT_TRUE(BC->MIB->isPSignOnLR(*II));