From 41b25c6cf4a9cd65021a1e71bc3168b861545ada Mon Sep 17 00:00:00 2001 From: Heejin Ahn Date: Thu, 9 Aug 2018 22:35:23 +0000 Subject: [PATCH] [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 --- llvm/lib/Target/WebAssembly/WebAssemblyCFGSort.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyCFGSort.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyCFGSort.cpp index 3fe524a0b7f5..fc827e9d5780 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyCFGSort.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyCFGSort.cpp @@ -212,7 +212,7 @@ struct CompareBlockNumbersBackwards { /// Bookkeeping for a region to help ensure that we don't mix blocks not /// dominated by the its header among its blocks. struct Entry { - const Region *Region; + const Region *TheRegion; unsigned NumBlocksLeft; /// List of blocks not dominated by Loop's header that are deferred until @@ -220,7 +220,7 @@ struct Entry { std::vector Deferred; explicit Entry(const class Region *R) - : Region(R), NumBlocksLeft(R->getNumBlocks()) {} + : TheRegion(R), NumBlocksLeft(R->getNumBlocks()) {} }; } // 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 // any blocks deferred because the header didn't dominate them. 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) Ready.push(DeferredBlock); 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 // that region is done. if (!Entries.empty() && - !MDT.dominates(Entries.back().Region->getHeader(), Next)) { + !MDT.dominates(Entries.back().TheRegion->getHeader(), Next)) { Entries.back().Deferred.push_back(Next); Next = nullptr; 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 // until that region is done. if (!Entries.empty() && - !MDT.dominates(Entries.back().Region->getHeader(), Next)) { + !MDT.dominates(Entries.back().TheRegion->getHeader(), Next)) { Entries.back().Deferred.push_back(Next); continue; }