PR c++/43621

	* pt.c (maybe_update_decl_type): Check the return value from
	push_scope.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158006 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1e50c2f..323fcd9 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-06  Jason Merrill  <jason@redhat.com>
+
+       PR c++/43621
+       * pt.c (maybe_update_decl_type): Check the return value from
+       push_scope.
+
 2010-04-01  Jason Merrill  <jason@redhat.com>
 
        * decl.c (next_initializable_field): No longer static.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f3de76e..6f77baa 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-06  Jason Merrill  <jason@redhat.com>
+
+       PR c++/43621
+       * g++.dg/template/error-recovery2.C: New.
+
 2010-04-06  Jan Hubicka  <jh@suse.czpli
 
        PR tree-optimization/42906