From 72fff241b6bde0ccacabca46a203c4b5ecf146c7 Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames@gmail.com>
Date: Wed, 4 Sep 2019 20:26:26 +0000
Subject: [PATCH] [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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@370969 91177308-0d34-0410-b5e6-96231b3b80d8
---
 tools/llvm-jitlink/llvm-jitlink.cpp | 10 ++++------
 tools/llvm-rtdyld/llvm-rtdyld.cpp   |  9 ++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/tools/llvm-jitlink/llvm-jitlink.cpp b/tools/llvm-jitlink/llvm-jitlink.cpp
index 6dbd8468171..64b8692b962 100644
--- a/tools/llvm-jitlink/llvm-jitlink.cpp
+++ b/tools/llvm-jitlink/llvm-jitlink.cpp
@@ -610,12 +610,10 @@ Expected<int> runEntryPoint(Session &S, JITEvaluatedSymbol EntryPoint) {
 }
 
 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[]) {
diff --git a/tools/llvm-rtdyld/llvm-rtdyld.cpp b/tools/llvm-rtdyld/llvm-rtdyld.cpp
index e7820bc6265..09539c457a9 100644
--- a/tools/llvm-rtdyld/llvm-rtdyld.cpp
+++ b/tools/llvm-rtdyld/llvm-rtdyld.cpp
@@ -146,11 +146,10 @@ static cl::opt<bool> ShowTimes("show-times",
 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;
-- 
2.50.1