revert

From-SVN: r33531

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 42c63fca7a933014c1bc70f48e06095018e163dd..87a279d8a78bbf71a459d02666eeb1c5b25e8856 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -2,11 +2,6 @@
 
        * decl.c (grok_op_properties): Add an extra check of argtypes.
 
-2000-04-28  Jason Merrill  <jason@casey.cygnus.com>
-
-       * optimize.c (initialize_inlined_parameters): Call 
-       c_apply_type_quals_to_decl.  Set DECL_INITIAL.
-
 2000-04-27  Mark Mitchell  <mark@codesourcery.com>
 
        * optimize.c (copy_body_r): Use STRIP_TYPE_NOPS when copying

diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index 39f8247f8d0acf8162607d600375b6c06909457c..9863d4abfe1f683bed64832ea701ed635f416a85 100644 (file)
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -419,8 +419,6 @@ initialize_inlined_parameters (id, args, fn)
        
       /* Make an equivalent VAR_DECL.  */
       var = copy_decl_for_inlining (p, fn, VARRAY_TREE (id->fns, 0));
-      c_apply_type_quals_to_decl (TYPE_QUALS (p), var);
-
       /* Register the VAR_DECL as the equivalent for the PARM_DECL;
         that way, when the PARM_DECL is encountered, it will be
         automatically replaced by the VAR_DECL.  */
@@ -432,8 +430,6 @@ initialize_inlined_parameters (id, args, fn)
         this will not result in an extra copy: the TARGET_EXPR
         representing the argument will be bound to VAR, and the
         object will be constructed in VAR.  */
-      if (! TYPE_NEEDS_CONSTRUCTING (TREE_TYPE (p)))
-       DECL_INITIAL (var) = TREE_VALUE (a);
       init_stmt = build_min_nt (EXPR_STMT,
                                build (INIT_EXPR, TREE_TYPE (p),
                                       var, value));