Omit clobbering info for warnings, simplify

Author: atrosinenko

bolt/include/bolt/Passes/PAuthGadgetScanner.h

@@ -302,6 +302,10 @@ class FunctionAnalysis {
   void findUnsafeUses(SmallVector<BriefReport<MCPhysReg>> &Reports);
   void augmentUnsafeUseReports(const ArrayRef<BriefReport<MCPhysReg>> Reports);
 
+  /// Process the reports which do not have to be augmented, and remove them
+  /// from Reports.
+  void handleSimpleReports(SmallVector<BriefReport<MCPhysReg>> &Reports);
+
 public:
   FunctionAnalysis(BinaryFunction &BF, MCPlusBuilder::AllocatorIdTy AllocatorId,
                    bool PacRetGadgetsOnly)

bolt/lib/Passes/PAuthGadgetScanner.cpp

@@ -518,13 +518,11 @@ class SrcSafetyAnalysis {
 public:
   std::vector<MCInstReference>
   getLastClobberingInsts(const MCInst &Inst, BinaryFunction &BF,
-                         std::optional<MCPhysReg> ClobberedReg) const {
-    if (!ClobberedReg || RegsToTrackInstsFor.empty())
-      return {};
+                         MCPhysReg ClobberedReg) const {
     const SrcState &S = getStateBefore(Inst);
 
     std::vector<MCInstReference> Result;
-    for (const MCInst *Inst : lastWritingInsts(S, *ClobberedReg)) {
+    for (const MCInst *Inst : lastWritingInsts(S, ClobberedReg)) {
       MCInstReference Ref = MCInstReference::get(Inst, BF);
       assert(Ref && "Expected Inst to be found");
       Result.push_back(Ref);
@@ -868,16 +866,29 @@ void FunctionAnalysis::augmentUnsafeUseReports(
   });
 
   // Augment gadget reports.
-  for (auto Report : Reports) {
+  for (auto &Report : Reports) {
     MCInstReference Location = Report.Issue->Location;
     LLVM_DEBUG({ traceInst(BC, "Attaching clobbering info to", Location); });
+    assert(Report.RequestedDetails &&
+           "Should be removed by handleSimpleReports");
     auto DetailedInfo =
         std::make_shared<ClobberingInfo>(Analysis->getLastClobberingInsts(
-            Location, BF, Report.RequestedDetails));
+            Location, BF, *Report.RequestedDetails));
     Result.Diagnostics.emplace_back(Report.Issue, DetailedInfo);
   }
 }
 
+void FunctionAnalysis::handleSimpleReports(
+    SmallVector<BriefReport<MCPhysReg>> &Reports) {
+  // Before re-running the detailed analysis, process the reports which do not
+  // need any additional details to be attached.
+  for (auto &Report : Reports) {
+    if (!Report.RequestedDetails)
+      Result.Diagnostics.emplace_back(Report.Issue, nullptr);
+  }
+  llvm::erase_if(Reports, [](const auto &R) { return !R.RequestedDetails; });
+}
+
 void FunctionAnalysis::run() {
   LLVM_DEBUG({
     dbgs() << "Analyzing function " << BF.getPrintName()
@@ -887,6 +898,7 @@ void FunctionAnalysis::run() {
 
   SmallVector<BriefReport<MCPhysReg>> UnsafeUses;
   findUnsafeUses(UnsafeUses);
+  handleSimpleReports(UnsafeUses);
   if (!UnsafeUses.empty())
     augmentUnsafeUseReports(UnsafeUses);
 }

bolt/test/binary-analysis/AArch64/gs-pacret-autiasp.s

@@ -217,6 +217,7 @@ f_callclobbered_calleesaved:
 f_unreachable_instruction:
 // CHECK-LABEL: GS-PAUTH: Warning: unreachable instruction found in function f_unreachable_instruction, basic block {{[0-9a-zA-Z.]+}}, at address
 // CHECK-NEXT:    The instruction is     {{[0-9a-f]+}}:       add     x0, x1, x2
+// CHECK-NOT:   instructions that write to the affected registers after any authentication are:
         b       1f
         add     x0, x1, x2
 1: