Skip to content

Commit 41adc37

Browse files
committed
[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
1 parent 7966953 commit 41adc37

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

llvm/tools/llvm-jitlink/llvm-jitlink.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -610,12 +610,10 @@ Expected<int> runEntryPoint(Session &S, JITEvaluatedSymbol EntryPoint) {
610610
}
611611

612612
struct JITLinkTimers {
613-
TimerGroup JITLinkTimers{"llvm-jitlink timers",
614-
"timers for llvm-jitlink phases"};
615-
Timer LoadObjectsTimer{"load", "time to load/add object files",
616-
JITLinkTimers};
617-
Timer LinkTimer{"link", "time to link object files", JITLinkTimers};
618-
Timer RunTimer{"run", "time to execute jitlink'd code", JITLinkTimers};
613+
TimerGroup JITLinkTG{"llvm-jitlink timers", "timers for llvm-jitlink phases"};
614+
Timer LoadObjectsTimer{"load", "time to load/add object files", JITLinkTG};
615+
Timer LinkTimer{"link", "time to link object files", JITLinkTG};
616+
Timer RunTimer{"run", "time to execute jitlink'd code", JITLinkTG};
619617
};
620618

621619
int main(int argc, char *argv[]) {

llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,10 @@ static cl::opt<bool> ShowTimes("show-times",
146146
ExitOnError ExitOnErr;
147147

148148
struct RTDyldTimers {
149-
TimerGroup RTDyldTimers{"llvm-rtdyld timers",
150-
"timers for llvm-rtdyld phases"};
151-
Timer LoadObjectsTimer{"load", "time to load/add object files", RTDyldTimers};
152-
Timer LinkTimer{"link", "time to link object files", RTDyldTimers};
153-
Timer RunTimer{"run", "time to execute jitlink'd code", RTDyldTimers};
149+
TimerGroup RTDyldTG{"llvm-rtdyld timers", "timers for llvm-rtdyld phases"};
150+
Timer LoadObjectsTimer{"load", "time to load/add object files", RTDyldTG};
151+
Timer LinkTimer{"link", "time to link object files", RTDyldTG};
152+
Timer RunTimer{"run", "time to execute jitlink'd code", RTDyldTG};
154153
};
155154

156155
std::unique_ptr<RTDyldTimers> Timers;

0 commit comments

Comments
 (0)