timevar.def: Add TV_CONSTEXPR.

	* timevar.def: Add TV_CONSTEXPR.

	* constexpr.c (cxx_eval_outermost_constant_expr): Use TV_CONSTEXPR.

From-SVN: r247563

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af5c6bf179fbc441991a5b16e24805a3289df0f1..6cf12153848d4d223d89e3f2da9d60508f58de39 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-03  Jason Merrill  <jason@redhat.com>
+
+       * timevar.def: Add TV_CONSTEXPR.
+
 2017-05-03  David Malcolm  <dmalcolm@redhat.com>
 
        * common.opt (fdiagnostics-parseable-fixits): Fix typo.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 56f9c2081a5cbd2e394a8c4a70e11bb295ef675d..7f395b461a44cce66bad86f2def530b71a7f524f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-03  Jason Merrill  <jason@redhat.com>
+
+       * constexpr.c (cxx_eval_outermost_constant_expr): Use TV_CONSTEXPR.
+
 2017-05-03  Nathan Sidwell  <nathan@acm.org>
 
        * cp-tree.h (enum cp_tree_index, cp_global_trees): Move earlier,

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 366d562a8a60b0b7129217ecb050486d1bd99258..34d25ba6509fb869eaafe20135f26e665e2af314 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -32,6 +32,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-inline.h"
 #include "ubsan.h"
 #include "gimple-fold.h"
+#include "timevar.h"
 
 static bool verify_constant (tree, bool, bool *, bool *);
 #define VERIFY_CONSTANT(X)                                             \
@@ -4606,6 +4607,8 @@ static tree
 cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
                                  bool strict = true, tree object = NULL_TREE)
 {
+  auto_timevar time (TV_CONSTEXPR);
+
   bool non_constant_p = false;
   bool overflow_p = false;
   hash_map<tree,tree> map;

diff --git a/gcc/timevar.def b/gcc/timevar.def
index 51ec0357656b11da08a08af545ade2045d080ff3..9ceda8a32683e4f0665c1a49ec0ea26984201f9c 100644 (file)
--- a/gcc/timevar.def
+++ b/gcc/timevar.def
@@ -137,6 +137,7 @@ DEFTIMEVAR (TV_PARSE_FUNC            , "parser function body")
 DEFTIMEVAR (TV_PARSE_INLINE          , "parser inl. func. body")
 DEFTIMEVAR (TV_PARSE_INMETH          , "parser inl. meth. body")
 DEFTIMEVAR (TV_TEMPLATE_INST         , "template instantiation")
+DEFTIMEVAR (TV_CONSTEXPR            , "constant expression evaluation")
 DEFTIMEVAR (TV_CONSTRAINT_SAT        , "constraint satisfaction")
 DEFTIMEVAR (TV_CONSTRAINT_SUB        , "constraint subsumption")
 DEFTIMEVAR (TV_FLATTEN_INLINING      , "flatten inlining")