[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.
llvm-svn: 370969
diff --git a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
index 6dbd846..64b8692 100644
--- a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
+++ b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp
@@ -610,12 +610,10 @@
}
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/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
index e7820bc..09539c4 100644
--- a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
+++ b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
@@ -146,11 +146,10 @@
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;