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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e663170..d9098b4 100644 (file)
--- 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 (file)
--- 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;
 }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9efaacd..445815e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-24  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/57524
+       * g++.dg/ext/timevar2.C: New.
+
 2014-01-24  Marek Polacek  <polacek@redhat.com>
 
        * gcc.dg/pr59846.c (fn1, fn2): Use ULL suffix.

diff --git a/gcc/testsuite/g++.dg/ext/timevar2.C b/gcc/testsuite/g++.dg/ext/timevar2.C
new file mode 100644 (file)
index 0000000..74c4fc8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/timevar2.C
@@ -0,0 +1,14 @@
+// PR c++/57524
+// { dg-options "-ftime-report" }
+// { dg-prune-output "wall" }
+// { dg-prune-output "times" }
+// { dg-prune-output "TOTAL" }
+// { dg-prune-output "checks" }
+
+namespace detail {
+namespace indirect_traits {}
+using namespace indirect_traits;
+void fn1() {
+using namespace detail;
+}
+}