91th Cygnus<->FSF quick merge

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 115c4d2..37a439e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jun 19 16:49:28 1997  Mike Stump  <mrs@cygnus.com>
+
+       * typeck.c (c_expand_return): Make sure we clean up temporaries at
+       the end of return x;
+
+Thu Jun 19 12:28:43 1997  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+       * lex.c (check_for_missing_semicolon): Also check for CV_QUALIFIER.
+
 Tue Jun 17 18:35:57 1997  Mike Stump  <mrs@cygnus.com>
 
        * except.c (expand_builtin_throw): Add support

diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index acb00b0..941a677 100644 (file)
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -1780,6 +1780,7 @@ check_for_missing_semicolon (type)
        && yychar != SCSPEC
        && yychar != IDENTIFIER
        && yychar != TYPENAME
+       && yychar != CV_QUALIFIER
        && yychar != SELFNAME)
       || end_of_file)
     {

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index c73e86f..e636593 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -7325,7 +7325,13 @@ c_expand_return (retval)
       result = build (INIT_EXPR, TREE_TYPE (result), result, retval);
       TREE_SIDE_EFFECTS (result) = 1;
     }
+
+  expand_start_target_temps ();
+
   expand_return (result);
+
+  expand_end_target_temps ();
+
   current_function_returns_value = 1;
 }
 \f