aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2014-01-24 15:45:14 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2014-01-24 15:45:14 +0000
commitf9e2a506da8d61699611f756732f4c708f72976c (patch)
tree0e880da3f4fb99cf6efdc81066e87df8a9c59929 /gcc/cp
parent317363b4c15062c196316f3df87d6204bc26b06f (diff)
downloadgcc-f9e2a506da8d61699611f756732f4c708f72976c.zip
gcc-f9e2a506da8d61699611f756732f4c708f72976c.tar.gz
gcc-f9e2a506da8d61699611f756732f4c708f72976c.tar.bz2
re PR c++/57524 (ICE: in timevar_start, at timevar.c:343)
/cp 2014-01-24 Paolo Carlini <paolo.carlini@oracle.com> PR c++/57524 * name-lookup.c (push_using_directive): Use timevar_cond_start. /testsuite 2014-01-24 Paolo Carlini <paolo.carlini@oracle.com> PR c++/57524 * g++.dg/ext/timevar2.C: New. From-SVN: r207047
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/name-lookup.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e663170..d9098b4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-24 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/57524
+ * name-lookup.c (push_using_directive): Use timevar_cond_start.
+
2014-01-23 Marek Polacek <polacek@redhat.com>
PR c/59846
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 28f998d..3ffcf69 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -5683,9 +5683,9 @@ static tree
push_using_directive (tree used)
{
tree ret;
- timevar_start (TV_NAME_LOOKUP);
+ bool subtime = timevar_cond_start (TV_NAME_LOOKUP);
ret = push_using_directive_1 (used);
- timevar_stop (TV_NAME_LOOKUP);
+ timevar_cond_stop (TV_NAME_LOOKUP, subtime);
return ret;
}