replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[WebAssembly] Fix wasm backend compilation on gcc 5.4: variable name cannot match class 

Summary:
gcc does not like

const Region *Region;

It wants a different name for the variable.

Is there a better convention for what name to use in such a case?

Reviewers: sbc100, aheejin

Subscribers: aheejin, jgravelle-google, dschuff, llvm-commits

Differential Revision: https://reviews.llvm.org/D50472

Patch by Alon Zakai (kripken)

llvm-svn: 339398
This commit is contained in:
Heejin Ahn 2018-08-09 22:35:23 +00:00
parent fce7f73bec
commit 41b25c6cf4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/lib/Target/WebAssembly/WebAssemblyCFGSort.cpp
View File

@ -212,7 +212,7 @@ struct CompareBlockNumbersBackwards {
/// Bookkeeping for a region to help ensure that we don't mix blocks not /// Bookkeeping for a region to help ensure that we don't mix blocks not
/// dominated by the its header among its blocks. /// dominated by the its header among its blocks.
struct Entry { struct Entry {
const Region *Region; const Region *TheRegion;
unsigned NumBlocksLeft; unsigned NumBlocksLeft;
/// List of blocks not dominated by Loop's header that are deferred until /// List of blocks not dominated by Loop's header that are deferred until
@ -220,7 +220,7 @@ struct Entry {
std::vector<MachineBasicBlock *> Deferred; std::vector<MachineBasicBlock *> Deferred;
explicit Entry(const class Region *R) explicit Entry(const class Region *R)
: Region(R), NumBlocksLeft(R->getNumBlocks()) {} : TheRegion(R), NumBlocksLeft(R->getNumBlocks()) {}
}; };
} // end anonymous namespace } // end anonymous namespace
@ -274,7 +274,7 @@ static void SortBlocks(MachineFunction &MF, const MachineLoopInfo &MLI,
// the last block in an active region, take it off the list and pick up // the last block in an active region, take it off the list and pick up
// any blocks deferred because the header didn't dominate them. // any blocks deferred because the header didn't dominate them.
for (Entry &E : Entries) for (Entry &E : Entries)
if (E.Region->contains(MBB) && --E.NumBlocksLeft == 0) if (E.TheRegion->contains(MBB) && --E.NumBlocksLeft == 0)
for (auto DeferredBlock : E.Deferred) for (auto DeferredBlock : E.Deferred)
Ready.push(DeferredBlock); Ready.push(DeferredBlock);
while (!Entries.empty() && Entries.back().NumBlocksLeft == 0) while (!Entries.empty() && Entries.back().NumBlocksLeft == 0)
@ -299,7 +299,7 @@ static void SortBlocks(MachineFunction &MF, const MachineLoopInfo &MLI,
// If X isn't dominated by the top active region header, defer it until // If X isn't dominated by the top active region header, defer it until
// that region is done. // that region is done.
if (!Entries.empty() && if (!Entries.empty() &&
!MDT.dominates(Entries.back().Region->getHeader(), Next)) { !MDT.dominates(Entries.back().TheRegion->getHeader(), Next)) {
Entries.back().Deferred.push_back(Next); Entries.back().Deferred.push_back(Next);
Next = nullptr; Next = nullptr;
continue; continue;
@ -329,7 +329,7 @@ static void SortBlocks(MachineFunction &MF, const MachineLoopInfo &MLI,
// If Next isn't dominated by the top active region header, defer it // If Next isn't dominated by the top active region header, defer it
// until that region is done. // until that region is done.
if (!Entries.empty() && if (!Entries.empty() &&
!MDT.dominates(Entries.back().Region->getHeader(), Next)) { !MDT.dominates(Entries.back().TheRegion->getHeader(), Next)) {
Entries.back().Deferred.push_back(Next); Entries.back().Deferred.push_back(Next);
continue; continue;
} }