decl.c (define_label): Use POP_TIMEVAR_AND_RETURN.

	* decl.c (define_label): Use POP_TIMEVAR_AND_RETURN.
	* name-lookup.c (pushdecl_class_level): Likewise.

From-SVN: r92485

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bb5af6d08c0942c6189da90d23a93f316689fc6a..087fcc6e7a108d4f135d7af549238536a893ec8a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-22  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+       * decl.c (define_label): Use POP_TIMEVAR_AND_RETURN.
+       * name-lookup.c (pushdecl_class_level): Likewise.
+
 2004-12-21  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
        * name-lookup.c (pushtag): Add missing POP_TIMEVAR_AND_RETURN.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 515bb2c504144ed7a32f45b63ecb7d2a6a2544bd..ed0604cf5cb25ff8e212c9e13dd0b825ae5db7f2 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2431,8 +2431,7 @@ define_label (location_t location, tree name)
       check_previous_gotos (decl);
     }
 
-  timevar_pop (TV_NAME_LOOKUP);
-  return decl;
+  POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, decl);
 }
 
 struct cp_switch

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index c856463b29fc43e6f06a00cec4980015c4a6d1d9..0ee9dfe71d5586ec20a37c2e6f84b15e8b1c89b0 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -2480,9 +2480,7 @@ pushdecl_class_level (tree x)
          input_location = save_location;
        }
     }
-  timevar_pop (TV_NAME_LOOKUP);
-
-  return is_valid;
+  POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, is_valid);
 }
 
 /* Return the BINDING (if any) for NAME in SCOPE, which is a class