From: Arnaud A. de Grandmaison <arnaud.degrandmaison@arm.com>
Date: Fri, 9 Oct 2015 09:23:01 +0000 (+0000)
Subject: [EarlyCSE] Address post commit review for r249523.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d9ce589f8e7a8dd5d649ffab0b7bcd3ffa51ff6;p=oota-llvm.git

[EarlyCSE] Address post commit review for r249523.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@249814 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Scalar/EarlyCSE.cpp b/lib/Transforms/Scalar/EarlyCSE.cpp
index 008b0e5ffb3..4dab49372e3 100644
--- a/lib/Transforms/Scalar/EarlyCSE.cpp
+++ b/lib/Transforms/Scalar/EarlyCSE.cpp
@@ -291,12 +291,12 @@ public:
   /// after every possibly writing memory operation, which ensures that we only
   /// CSE loads with other loads that have no intervening store.
   struct LoadValue {
-    Value *data;
-    unsigned generation;
-    int matchingId;
-    LoadValue() : data(nullptr), generation(0), matchingId(-1) {}
-    LoadValue(Value *data, unsigned generation, unsigned matchingId)
-        : data(data), generation(generation), matchingId(matchingId) {}
+    Value *Data;
+    unsigned Generation;
+    int MatchingId;
+    LoadValue() : Data(nullptr), Generation(0), MatchingId(-1) {}
+    LoadValue(Value *Data, unsigned Generation, unsigned MatchingId)
+        : Data(Data), Generation(Generation), MatchingId(MatchingId) {}
   };
   typedef RecyclingAllocator<BumpPtrAllocator,
                              ScopedHashTableVal<Value *, LoadValue>>
@@ -568,12 +568,12 @@ bool EarlyCSE::processNode(DomTreeNode *Node) {
       // If we have an available version of this load, and if it is the right
       // generation, replace this instruction.
       LoadValue InVal = AvailableLoads.lookup(MemInst.getPtr());
-      if (InVal.data != nullptr && InVal.generation == CurrentGeneration &&
-          InVal.matchingId == MemInst.getMatchingId()) {
-        Value *Op = getOrCreateResult(InVal.data, Inst->getType());
+      if (InVal.Data != nullptr && InVal.Generation == CurrentGeneration &&
+          InVal.MatchingId == MemInst.getMatchingId()) {
+        Value *Op = getOrCreateResult(InVal.Data, Inst->getType());
         if (Op != nullptr) {
           DEBUG(dbgs() << "EarlyCSE CSE LOAD: " << *Inst
-                       << "  to: " << *InVal.data << '\n');
+                       << "  to: " << *InVal.Data << '\n');
           if (!Inst->use_empty())
             Inst->replaceAllUsesWith(Op);
           Inst->eraseFromParent();