91th Cygnus<->FSF quick merge

From-SVN: r14266

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 115c4d2204b7c597207fced00db2df7e3767b81f..37a439e68b31f65a196534c751fa3659eb467457 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 acb00b0b8d94214eea64f4843638bcc4af53ad42..941a6776edd9133a05dd9e2b8e7baa6e8c76605e 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 c73e86ffaf104be08f0aea5db33522f1e53485b7..e63659305fe19af03eda19eee48f69571d6c073d 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