Skip to content

Commit a5b966d

Browse files
committed
Drop redundant const qualifier from ArrayRef<T>
1 parent b942d6e commit a5b966d

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

bolt/include/bolt/Passes/PAuthGadgetScanner.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ struct Report {
221221

222222
// The two methods below are called by Analysis::computeDetailedInfo when
223223
// iterating over the reports.
224-
virtual const ArrayRef<MCPhysReg> getAffectedRegisters() const { return {}; }
225-
virtual void setOverwritingInstrs(const ArrayRef<MCInstReference> Instrs) {}
224+
virtual ArrayRef<MCPhysReg> getAffectedRegisters() const { return {}; }
225+
virtual void setOverwritingInstrs(ArrayRef<MCInstReference> Instrs) {}
226226

227227
void printBasicInfo(raw_ostream &OS, const BinaryContext &BC,
228228
StringRef IssueKind) const;
@@ -245,11 +245,11 @@ struct GadgetReport : public Report {
245245

246246
void generateReport(raw_ostream &OS, const BinaryContext &BC) const override;
247247

248-
const ArrayRef<MCPhysReg> getAffectedRegisters() const override {
248+
ArrayRef<MCPhysReg> getAffectedRegisters() const override {
249249
return AffectedRegisters;
250250
}
251251

252-
void setOverwritingInstrs(const ArrayRef<MCInstReference> Instrs) override {
252+
void setOverwritingInstrs(ArrayRef<MCInstReference> Instrs) override {
253253
OverwritingInstrs.assign(Instrs.begin(), Instrs.end());
254254
}
255255
};

bolt/lib/Passes/PAuthGadgetScanner.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,21 @@ class TrackedRegisters {
9191
const std::vector<MCPhysReg> Registers;
9292
std::vector<uint16_t> RegToIndexMapping;
9393

94-
static size_t getMappingSize(const ArrayRef<MCPhysReg> RegsToTrack) {
94+
static size_t getMappingSize(ArrayRef<MCPhysReg> RegsToTrack) {
9595
if (RegsToTrack.empty())
9696
return 0;
9797
return 1 + *llvm::max_element(RegsToTrack);
9898
}
9999

100100
public:
101-
TrackedRegisters(const ArrayRef<MCPhysReg> RegsToTrack)
101+
TrackedRegisters(ArrayRef<MCPhysReg> RegsToTrack)
102102
: Registers(RegsToTrack),
103103
RegToIndexMapping(getMappingSize(RegsToTrack), NoIndex) {
104104
for (unsigned I = 0; I < RegsToTrack.size(); ++I)
105105
RegToIndexMapping[RegsToTrack[I]] = I;
106106
}
107107

108-
const ArrayRef<MCPhysReg> getRegisters() const { return Registers; }
108+
ArrayRef<MCPhysReg> getRegisters() const { return Registers; }
109109

110110
size_t getNumTrackedRegisters() const { return Registers.size(); }
111111

@@ -232,9 +232,9 @@ struct SrcState {
232232
bool operator!=(const SrcState &RHS) const { return !((*this) == RHS); }
233233
};
234234

235-
static void printLastInsts(
236-
raw_ostream &OS,
237-
const ArrayRef<SmallPtrSet<const MCInst *, 4>> LastInstWritingReg) {
235+
static void
236+
printLastInsts(raw_ostream &OS,
237+
ArrayRef<SmallPtrSet<const MCInst *, 4>> LastInstWritingReg) {
238238
OS << "Insts: ";
239239
for (unsigned I = 0; I < LastInstWritingReg.size(); ++I) {
240240
auto &Set = LastInstWritingReg[I];
@@ -294,16 +294,15 @@ void SrcStatePrinter::print(raw_ostream &OS, const SrcState &S) const {
294294
/// version for functions without reconstructed CFG.
295295
class SrcSafetyAnalysis {
296296
public:
297-
SrcSafetyAnalysis(BinaryFunction &BF,
298-
const ArrayRef<MCPhysReg> RegsToTrackInstsFor)
297+
SrcSafetyAnalysis(BinaryFunction &BF, ArrayRef<MCPhysReg> RegsToTrackInstsFor)
299298
: BC(BF.getBinaryContext()), NumRegs(BC.MRI->getNumRegs()),
300299
RegsToTrackInstsFor(RegsToTrackInstsFor) {}
301300

302301
virtual ~SrcSafetyAnalysis() {}
303302

304303
static std::shared_ptr<SrcSafetyAnalysis>
305304
create(BinaryFunction &BF, MCPlusBuilder::AllocatorIdTy AllocId,
306-
const ArrayRef<MCPhysReg> RegsToTrackInstsFor);
305+
ArrayRef<MCPhysReg> RegsToTrackInstsFor);
307306

308307
virtual void run() = 0;
309308
virtual const SrcState &getStateBefore(const MCInst &Inst) const = 0;
@@ -518,7 +517,7 @@ class SrcSafetyAnalysis {
518517
public:
519518
std::vector<MCInstReference>
520519
getLastClobberingInsts(const MCInst &Inst, BinaryFunction &BF,
521-
const ArrayRef<MCPhysReg> UsedDirtyRegs) const {
520+
ArrayRef<MCPhysReg> UsedDirtyRegs) const {
522521
if (RegsToTrackInstsFor.empty())
523522
return {};
524523
const SrcState &S = getStateBefore(Inst);
@@ -552,7 +551,7 @@ class DataflowSrcSafetyAnalysis
552551
public:
553552
DataflowSrcSafetyAnalysis(BinaryFunction &BF,
554553
MCPlusBuilder::AllocatorIdTy AllocId,
555-
const ArrayRef<MCPhysReg> RegsToTrackInstsFor)
554+
ArrayRef<MCPhysReg> RegsToTrackInstsFor)
556555
: SrcSafetyAnalysis(BF, RegsToTrackInstsFor), DFParent(BF, AllocId) {}
557556

558557
const SrcState &getStateBefore(const MCInst &Inst) const override {
@@ -669,7 +668,7 @@ class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis {
669668
public:
670669
CFGUnawareSrcSafetyAnalysis(BinaryFunction &BF,
671670
MCPlusBuilder::AllocatorIdTy AllocId,
672-
const ArrayRef<MCPhysReg> RegsToTrackInstsFor)
671+
ArrayRef<MCPhysReg> RegsToTrackInstsFor)
673672
: SrcSafetyAnalysis(BF, RegsToTrackInstsFor), BF(BF), AllocId(AllocId) {
674673
StateAnnotationIndex =
675674
BC.MIB->getOrCreateAnnotationIndex("CFGUnawareSrcSafetyAnalysis");
@@ -713,7 +712,7 @@ class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis {
713712
std::shared_ptr<SrcSafetyAnalysis>
714713
SrcSafetyAnalysis::create(BinaryFunction &BF,
715714
MCPlusBuilder::AllocatorIdTy AllocId,
716-
const ArrayRef<MCPhysReg> RegsToTrackInstsFor) {
715+
ArrayRef<MCPhysReg> RegsToTrackInstsFor) {
717716
if (BF.hasCFG())
718717
return std::make_shared<DataflowSrcSafetyAnalysis>(BF, AllocId,
719718
RegsToTrackInstsFor);

0 commit comments

Comments
 (0)