[llvm] r370969 - [llvm-rtdyld][llvm-jitlink] Rename struct member to remove ambiguity.

[Lang Hames via llvm-commits]

Author: lhames
Date: Wed Sep  4 13:26:26 2019
New Revision: 370969

URL: http://llvm.org/viewvc/llvm-project?rev=370969&view=rev
Log:
[llvm-rtdyld][llvm-jitlink] Rename struct member to remove ambiguity.

This ambiguity (struct member name matching struct name) was causing errors on
a few of the MSVC bots. Hopefully this should fix it.

Modified:
    llvm/trunk/tools/llvm-jitlink/llvm-jitlink.cpp
    llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp

Modified: llvm/trunk/tools/llvm-jitlink/llvm-jitlink.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-jitlink/llvm-jitlink.cpp?rev=370969&r1=370968&r2=370969&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-jitlink/llvm-jitlink.cpp (original)
+++ llvm/trunk/tools/llvm-jitlink/llvm-jitlink.cpp Wed Sep  4 13:26:26 2019
@@ -610,12 +610,10 @@ Expected<int> runEntryPoint(Session &S,
 }
 
 struct JITLinkTimers {
-  TimerGroup JITLinkTimers{"llvm-jitlink timers",
-                           "timers for llvm-jitlink phases"};
-  Timer LoadObjectsTimer{"load", "time to load/add object files",
-                         JITLinkTimers};
-  Timer LinkTimer{"link", "time to link object files", JITLinkTimers};
-  Timer RunTimer{"run", "time to execute jitlink'd code", JITLinkTimers};
+  TimerGroup JITLinkTG{"llvm-jitlink timers", "timers for llvm-jitlink phases"};
+  Timer LoadObjectsTimer{"load", "time to load/add object files", JITLinkTG};
+  Timer LinkTimer{"link", "time to link object files", JITLinkTG};
+  Timer RunTimer{"run", "time to execute jitlink'd code", JITLinkTG};
 };
 
 int main(int argc, char *argv[]) {

Modified: llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp?rev=370969&r1=370968&r2=370969&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp (original)
+++ llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp Wed Sep  4 13:26:26 2019
@@ -146,11 +146,10 @@ static cl::opt<bool> ShowTimes("show-tim
 ExitOnError ExitOnErr;
 
 struct RTDyldTimers {
-  TimerGroup RTDyldTimers{"llvm-rtdyld timers",
-                          "timers for llvm-rtdyld phases"};
-  Timer LoadObjectsTimer{"load", "time to load/add object files", RTDyldTimers};
-  Timer LinkTimer{"link", "time to link object files", RTDyldTimers};
-  Timer RunTimer{"run", "time to execute jitlink'd code", RTDyldTimers};
+  TimerGroup RTDyldTG{"llvm-rtdyld timers", "timers for llvm-rtdyld phases"};
+  Timer LoadObjectsTimer{"load", "time to load/add object files", RTDyldTG};
+  Timer LinkTimer{"link", "time to link object files", RTDyldTG};
+  Timer RunTimer{"run", "time to execute jitlink'd code", RTDyldTG};
 };
 
 std::unique_ptr<RTDyldTimers> Timers;