[llvm] [BOLT][binary-analysis] Add initial pac-ret gadget scanner (PR #122304)

via llvm-commits llvm-commits at lists.llvm.org
Thu Jan 9 07:51:11 PST 2025


github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff 266bb4971b7cb8481bf9f3aa7a9fbba08ec89d98 0b0137b8feab04db089297cb0efc288255f54298 --extensions cpp,h -- bolt/include/bolt/Passes/NonPacProtectedRetAnalysis.h bolt/lib/Passes/NonPacProtectedRetAnalysis.cpp bolt/include/bolt/Core/MCPlusBuilder.h bolt/include/bolt/Utils/CommandLineOpts.h bolt/lib/Rewrite/RewriteInstance.cpp bolt/lib/Target/AArch64/AArch64MCPlusBuilder.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/bolt/include/bolt/Passes/NonPacProtectedRetAnalysis.h b/bolt/include/bolt/Passes/NonPacProtectedRetAnalysis.h
index a974089636..21d089ed7b 100644
--- a/bolt/include/bolt/Passes/NonPacProtectedRetAnalysis.h
+++ b/bolt/include/bolt/Passes/NonPacProtectedRetAnalysis.h
@@ -31,7 +31,7 @@ struct MCInstInBBReference {
       : BB(BB), BBIndex(BBIndex) {}
   MCInstInBBReference() : BB(nullptr), BBIndex(0) {}
   static MCInstInBBReference get(const MCInst *Inst, BinaryFunction &BF) {
-    for (BinaryBasicBlock& BB : BF)
+    for (BinaryBasicBlock &BB : BF)
       for (size_t I = 0; I < BB.size(); ++I)
         if (Inst == &(BB.getInstructionAtIndex(I)))
           return MCInstInBBReference(&BB, I);
@@ -78,9 +78,7 @@ struct MCInstInBFReference {
 
   uint64_t getOffset() const { return Offset; }
 
-  uint64_t getAddress() const {
-    return BF->getAddress() + getOffset();
-  }
+  uint64_t getAddress() const { return BF->getAddress() + getOffset(); }
 };
 
 raw_ostream &operator<<(raw_ostream &OS, const MCInstInBFReference &);
@@ -179,7 +177,7 @@ struct NonPacProtectedRetGadget {
   }
   NonPacProtectedRetGadget(
       MCInstReference RetInst,
-      const std::vector<MCInstReference>& OverwritingRetRegInst)
+      const std::vector<MCInstReference> &OverwritingRetRegInst)
       : RetInst(RetInst), OverwritingRetRegInst(OverwritingRetRegInst) {}
 };
 
diff --git a/bolt/lib/Rewrite/RewriteInstance.cpp b/bolt/lib/Rewrite/RewriteInstance.cpp
index 0a45c35f02..135cfc63de 100644
--- a/bolt/lib/Rewrite/RewriteInstance.cpp
+++ b/bolt/lib/Rewrite/RewriteInstance.cpp
@@ -246,11 +246,12 @@ static cl::opt<bool> WriteBoltInfoSection(
     "bolt-info", cl::desc("write bolt info section in the output binary"),
     cl::init(true), cl::Hidden, cl::cat(BoltOutputCategory));
 
-cl::list<GadgetScannerKind> GadgetScannersToRun(
-    "scanners", cl::desc("which gadget scanners to run"),
-    cl::values(clEnumValN(GS_PACRET, "pacret", "pac-ret"),
-               clEnumValN(GS_ALL, "all", "all")),
-    cl::ZeroOrMore, cl::CommaSeparated, cl::cat(BinaryAnalysisCategory));
+cl::list<GadgetScannerKind>
+    GadgetScannersToRun("scanners", cl::desc("which gadget scanners to run"),
+                        cl::values(clEnumValN(GS_PACRET, "pacret", "pac-ret"),
+                                   clEnumValN(GS_ALL, "all", "all")),
+                        cl::ZeroOrMore, cl::CommaSeparated,
+                        cl::cat(BinaryAnalysisCategory));
 
 } // namespace opts
 

``````````

</details>


https://github.com/llvm/llvm-project/pull/122304


More information about the llvm-commits mailing list