From: Volodymyr Sapsai <vsapsai@apple.com>
Date: Wed, 18 Sep 2019 00:05:45 +0000 (+0000)
Subject: [Timers] Fix printing some `-ftime-report` sections twice. Fixes PR40328.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67a539da85af8053e98e47da1d43d3a7580ce7bd;p=clang

[Timers] Fix printing some `-ftime-report` sections twice. Fixes PR40328.

Starting from r324788 timer groups aren't cleared automatically when
printed out. As a result some timer groups were printed one more time.
For example, "Pass execution timing report" was printed again in
`ManagedStatic<PassTimingInfo>` destructor, "DWARF Emission" in
`ManagedStatic<Name2PairMap> NamedGroupedTimers` destructor.

Fix by clearing timer groups manually.

Reviewers: thegameg, george.karpenkov

Reviewed By: thegameg

Subscribers: aprantl, jkorous, dexonsmith, ributzka, aras-p, cfe-commits

Differential Revision: https://reviews.llvm.org/D67683


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

diff --git a/tools/driver/cc1_main.cpp b/tools/driver/cc1_main.cpp
index 29767b880b..9ed15f51b1 100644
--- a/tools/driver/cc1_main.cpp
+++ b/tools/driver/cc1_main.cpp
@@ -253,6 +253,7 @@ int cc1_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {
   // If any timers were active but haven't been destroyed yet, print their
   // results now.  This happens in -disable-free mode.
   llvm::TimerGroup::printAll(llvm::errs());
+  llvm::TimerGroup::clearAll();
 
   if (llvm::timeTraceProfilerEnabled()) {
     SmallString<128> Path(Clang->getFrontendOpts().OutputFile);
diff --git a/tools/driver/cc1as_main.cpp b/tools/driver/cc1as_main.cpp
index fbeea0dd3b..ae58a95f36 100644
--- a/tools/driver/cc1as_main.cpp
+++ b/tools/driver/cc1as_main.cpp
@@ -609,6 +609,7 @@ int cc1as_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {
   // If any timers were active but haven't been destroyed yet, print their
   // results now.
   TimerGroup::printAll(errs());
+  TimerGroup::clearAll();
 
   return !!Failed;
 }
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index eebc8920fe..f160049001 100644
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -499,6 +499,7 @@ int main(int argc_, const char **argv_) {
   // If any timers were active but haven't been destroyed yet, print their
   // results now.  This happens in -disable-free mode.
   llvm::TimerGroup::printAll(llvm::errs());
+  llvm::TimerGroup::clearAll();
 
 #ifdef _WIN32
   // Exit status should not be negative on Win32, unless abnormal termination.