aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@debian.org>2004-09-06 22:02:34 +0000
committerDaniel Jacobowitz <drow@gcc.gnu.org>2004-09-06 22:02:34 +0000
commitfa3ee80180e39e4b2e9e7d03f6cada0b4b549e02 (patch)
treea271ac0a938b36bc6dc6250ebe3df557111e9508 /gcc
parentd3a583b1fdc8f3e6f5dd31141efbe252bedb16e3 (diff)
downloadgcc-fa3ee80180e39e4b2e9e7d03f6cada0b4b549e02.zip
gcc-fa3ee80180e39e4b2e9e7d03f6cada0b4b549e02.tar.gz
gcc-fa3ee80180e39e4b2e9e7d03f6cada0b4b549e02.tar.bz2
* semantics.c (expand_body): Assert that we are not nested.
From-SVN: r87126
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/semantics.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fd9b97d..0625d8b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-06 Daniel Jacobowitz <dan@debian.org>
+
+ * semantics.c (expand_body): Assert that we are not nested.
+
2004-09-06 Zack Weinberg <zack@codesourcery.com>
* decl.c (build_enumerator): Use add_double and int_fits_type_p
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index cadb5a7..dd35580 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2881,7 +2881,12 @@ expand_body (tree fn)
/* Emit any thunks that should be emitted at the same time as FN. */
emit_associated_thunks (fn);
- tree_rest_of_compilation (fn, function_depth > 1);
+ /* This function is only called from cgraph, or recursively from
+ emit_associated_thunks. In neither case should we be currently
+ generating trees for a function. */
+ gcc_assert (function_depth == 0);
+
+ tree_rest_of_compilation (fn, 0);
current_function_decl = saved_function;