Author: hans
Date: Thu Aug 9 05:46:44 2018
New Revision: 339341
URL: http://llvm.org/viewvc/llvm-project?rev=339341&view=rev
Log:
Merging r339281:
------------------------------------------------------------------------
r339281 | ctopper | 2018-08-08 21:14:23 +0200 (Wed, 08 Aug 2018) | 5 lines
[CodeGen][Timers] Enable llvm::TimePassesIsEnabled when -ftime-report is
specified
r330571 added a new FrontendTimesIsEnabled variable and replaced many usages of
llvm::TimePassesIsEnabled. Including the place that set
llvm::TimePassesIsEnabled for -ftime-report. The effect of this is that
-ftime-report now only contains the timers specifically referenced in
CodeGenAction.cpp and none of the timers in the backend.
This commit adds back the assignment, but otherwise leaves everything else
unchanged.
------------------------------------------------------------------------
Modified:
cfe/branches/release_70/ (props changed)
cfe/branches/release_70/lib/CodeGen/CodeGenAction.cpp
Propchange: cfe/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 9 05:46:44 2018
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:338552-338553,338602,338627,338749,338942,339128,339170,339210,339317
+/cfe/trunk:338552-338553,338602,338627,338749,338942,339128,339170,339210,339281,339317
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_70/lib/CodeGen/CodeGenAction.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/lib/CodeGen/CodeGenAction.cpp?rev=339341&r1=339340&r2=339341&view=diff
==============================================================================
--- cfe/branches/release_70/lib/CodeGen/CodeGenAction.cpp (original)
+++ cfe/branches/release_70/lib/CodeGen/CodeGenAction.cpp Thu Aug 9 05:46:44
2018
@@ -127,6 +127,7 @@ namespace clang {
CodeGenOpts, C, CoverageInfo)),
LinkModules(std::move(LinkModules)) {
FrontendTimesIsEnabled = TimePasses;
+ llvm::TimePassesIsEnabled = TimePasses;
}
llvm::Module *getModule() const { return Gen->GetModule(); }
std::unique_ptr<llvm::Module> takeModule() {
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
