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

[Alon Zakai via Phabricator via llvm-commits]

kripken created this revision.
kripken added reviewers: sunfish, sbc100.
Herald added subscribers: llvm-commits, aheejin, jgravelle-google, dschuff.

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?


Repository:
  rL LLVM

https://reviews.llvm.org/D50472

Files:
  lib/Target/WebAssembly/WebAssemblyCFGSort.cpp


Index: lib/Target/WebAssembly/WebAssemblyCFGSort.cpp
===================================================================
--- lib/Target/WebAssembly/WebAssemblyCFGSort.cpp
+++ lib/Target/WebAssembly/WebAssemblyCFGSort.cpp
@@ -212,15 +212,15 @@
 /// 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
   /// after all of Loop's blocks have been seen.
   std::vector<MachineBasicBlock *> Deferred;
 
   explicit Entry(const class Region *R)
-      : Region(R), NumBlocksLeft(R->getNumBlocks()) {}
+      : TheRegion(R), NumBlocksLeft(R->getNumBlocks()) {}
 };
 } // end anonymous namespace
 
@@ -274,7 +274,7 @@
       // 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 @@
       // 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 @@
         // 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;
         }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D50472.159780.patch
Type: text/x-patch
Size: 2127 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180808/23bbcc22/attachment.bin>