Skip to content

Commit e4d63a4

Browse files
author
Marina Yatsina
committed
Fixing warnings caused by commit 323095
Change-Id: I4e1f81db2f5382a820f4016c23b243e4d5aebf51 llvm-svn: 323114
1 parent 9b36fd2 commit e4d63a4

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

llvm/lib/CodeGen/ExecutionDomainFix.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void ExecutionDomainFix::enterBasicBlock(
167167

168168
// Try to coalesce live-out registers from predecessors.
169169
for (MachineBasicBlock *pred : MBB->predecessors()) {
170-
assert(pred->getNumber() < MBBOutRegsInfos.size() &&
170+
assert(unsigned(pred->getNumber()) < MBBOutRegsInfos.size() &&
171171
"Should have pre-allocated MBBInfos for all MBBs");
172172
LiveRegsDVInfo &Incoming = MBBOutRegsInfos[pred->getNumber()];
173173
// Incoming is null if this is a backedge from a BB
@@ -208,7 +208,7 @@ void ExecutionDomainFix::enterBasicBlock(
208208
void ExecutionDomainFix::leaveBasicBlock(
209209
const LoopTraversal::TraversedMBBInfo &TraversedMBB) {
210210
assert(!LiveRegs.empty() && "Must enter basic block first.");
211-
int MBBNumber = TraversedMBB.MBB->getNumber();
211+
unsigned MBBNumber = TraversedMBB.MBB->getNumber();
212212
assert(MBBNumber < MBBOutRegsInfos.size() &&
213213
"Unexpected basic block number.");
214214
// Save register clearances at end of MBB - used by enterBasicBlock().

llvm/lib/CodeGen/LoopTraversal.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using namespace llvm;
1515

1616
bool LoopTraversal::isBlockDone(MachineBasicBlock *MBB) {
17-
int MBBNumber = MBB->getNumber();
17+
unsigned MBBNumber = MBB->getNumber();
1818
assert(MBBNumber < MBBInfos.size() && "Unexpected basic block number.");
1919
return MBBInfos[MBBNumber].PrimaryCompleted &&
2020
MBBInfos[MBBNumber].IncomingCompleted ==
@@ -33,7 +33,7 @@ LoopTraversal::TraversalOrder LoopTraversal::traverse(MachineFunction &MF) {
3333
for (MachineBasicBlock *MBB : RPOT) {
3434
// N.B: IncomingProcessed and IncomingCompleted were already updated while
3535
// processing this block's predecessors.
36-
int MBBNumber = MBB->getNumber();
36+
unsigned MBBNumber = MBB->getNumber();
3737
assert(MBBNumber < MBBInfos.size() && "Unexpected basic block number.");
3838
MBBInfos[MBBNumber].PrimaryCompleted = true;
3939
MBBInfos[MBBNumber].PrimaryIncoming = MBBInfos[MBBNumber].IncomingProcessed;
@@ -45,7 +45,7 @@ LoopTraversal::TraversalOrder LoopTraversal::traverse(MachineFunction &MF) {
4545
bool Done = isBlockDone(ActiveMBB);
4646
MBBTraversalOrder.push_back(TraversedMBBInfo(ActiveMBB, Primary, Done));
4747
for (MachineBasicBlock *Succ : ActiveMBB->successors()) {
48-
int SuccNumber = Succ->getNumber();
48+
unsigned SuccNumber = Succ->getNumber();
4949
assert(SuccNumber < MBBInfos.size() &&
5050
"Unexpected basic block number.");
5151
if (!isBlockDone(Succ)) {

llvm/lib/CodeGen/ReachingDefAnalysis.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void ReachingDefAnalysis::enterBasicBlock(
2323
const LoopTraversal::TraversedMBBInfo &TraversedMBB) {
2424

2525
MachineBasicBlock *MBB = TraversedMBB.MBB;
26-
int MBBNumber = MBB->getNumber();
26+
unsigned MBBNumber = MBB->getNumber();
2727
assert(MBBNumber < MBBReachingDefs.size() &&
2828
"Unexpected basic block number.");
2929
MBBReachingDefs[MBBNumber].resize(NumRegUnits);
@@ -53,7 +53,7 @@ void ReachingDefAnalysis::enterBasicBlock(
5353

5454
// Try to coalesce live-out registers from predecessors.
5555
for (MachineBasicBlock *pred : MBB->predecessors()) {
56-
assert(pred->getNumber() < MBBOutRegsInfos.size() &&
56+
assert(unsigned(pred->getNumber()) < MBBOutRegsInfos.size() &&
5757
"Should have pre-allocated MBBInfos for all MBBs");
5858
const LiveRegsDefInfo &Incoming = MBBOutRegsInfos[pred->getNumber()];
5959
// Incoming is null if this is a backedge from a BB
@@ -77,7 +77,7 @@ void ReachingDefAnalysis::enterBasicBlock(
7777
void ReachingDefAnalysis::leaveBasicBlock(
7878
const LoopTraversal::TraversedMBBInfo &TraversedMBB) {
7979
assert(!LiveRegs.empty() && "Must enter basic block first.");
80-
int MBBNumber = TraversedMBB.MBB->getNumber();
80+
unsigned MBBNumber = TraversedMBB.MBB->getNumber();
8181
assert(MBBNumber < MBBOutRegsInfos.size() &&
8282
"Unexpected basic block number.");
8383
// Save register clearances at end of MBB - used by enterBasicBlock().
@@ -95,7 +95,7 @@ void ReachingDefAnalysis::leaveBasicBlock(
9595
void ReachingDefAnalysis::processDefs(MachineInstr *MI) {
9696
assert(!MI->isDebugValue() && "Won't process debug values");
9797

98-
int MBBNumber = MI->getParent()->getNumber();
98+
unsigned MBBNumber = MI->getParent()->getNumber();
9999
assert(MBBNumber < MBBReachingDefs.size() &&
100100
"Unexpected basic block number.");
101101
const MCInstrDesc &MCID = MI->getDesc();
@@ -174,7 +174,7 @@ int ReachingDefAnalysis::getReachingDef(MachineInstr *MI, int PhysReg) {
174174
assert(InstIds.count(MI) && "Unexpected machine instuction.");
175175
int InstId = InstIds[MI];
176176
int DefRes = ReachingDedDefaultVal;
177-
int MBBNumber = MI->getParent()->getNumber();
177+
unsigned MBBNumber = MI->getParent()->getNumber();
178178
assert(MBBNumber < MBBReachingDefs.size() &&
179179
"Unexpected basic block number.");
180180
int LatestDef = ReachingDedDefaultVal;

0 commit comments

Comments
 (0)