* parse.y (simple_stmt): Use getdecls() to check for decl.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6da997c..8261905 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 17 11:54:16 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * parse.y (simple_stmt): Use getdecls() to check for decl.
+
 Sat Feb 14 11:50:51 1998  Manfred Hollstein  <manfred@s-direktnet.de>
 
        * Make-lang.in (DEMANGLER_INSTALL_NAME, DEMANGLER_CROSS_NAME): New 

diff --git a/gcc/cp/parse.c b/gcc/cp/parse.c
index 80ef276..d94c905 100644 (file)
--- a/gcc/cp/parse.c
+++ b/gcc/cp/parse.c
@@ -7483,7 +7483,7 @@ case 687:
                  /* If the condition wasn't a declaration, clear out the
                     block we made for it and start a new one here so the
                     optimization in expand_end_loop will work.  */
-                 if (TREE_CODE (yyvsp[0].ttype) != VAR_DECL)
+                 if (getdecls () == NULL_TREE)
                    {
                      do_poplevel ();
                      do_pushlevel ();
@@ -7615,7 +7615,7 @@ case 694:
                  /* If the condition wasn't a declaration, clear out the
                     block we made for it and start a new one here so the
                     optimization in expand_end_loop will work.  */
-                 if (yyvsp[-1].ttype == NULL_TREE || TREE_CODE (yyvsp[-1].ttype) != VAR_DECL)
+                 if (getdecls () == NULL_TREE)
                    {
                      do_poplevel ();
                      do_pushlevel ();

diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y
index edc6cf7..01e0f75 100644 (file)
--- a/gcc/cp/parse.y
+++ b/gcc/cp/parse.y
@@ -3658,7 +3658,7 @@ simple_stmt:
                  /* If the condition wasn't a declaration, clear out the
                     block we made for it and start a new one here so the
                     optimization in expand_end_loop will work.  */
-                 if (TREE_CODE ($4) != VAR_DECL)
+                 if (getdecls () == NULL_TREE)
                    {
                      do_poplevel ();
                      do_pushlevel ();
@@ -3776,7 +3776,7 @@ simple_stmt:
                  /* If the condition wasn't a declaration, clear out the
                     block we made for it and start a new one here so the
                     optimization in expand_end_loop will work.  */
-                 if ($7 == NULL_TREE || TREE_CODE ($7) != VAR_DECL)
+                 if (getdecls () == NULL_TREE)
                    {
                      do_poplevel ();
                      do_pushlevel ();