decl.c (add_decl_to_level): Remove TREE_PERMANENT assertion.

[gcc.git] / gcc / cp / expr.c

diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 3dc8eae26e62c62ac982b85a7d807c5cc28b7646..a7b823fa347ba4b28bcdc3a5c9cc53fef179de93 100644 (file)
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -36,6 +36,62 @@ static tree extract_scalar_init PROTO((tree, tree));
 static rtx cplus_expand_expr PROTO((tree, rtx, enum machine_mode,
                                    enum expand_modifier));
 
+/* Hook used by output_constant to expand language-specific
+   constants.  */
+
+tree
+cplus_expand_constant (cst)
+     tree cst;
+{
+  switch (TREE_CODE (cst))
+    {
+    case PTRMEM_CST:
+      {
+       tree type = TREE_TYPE (cst);
+       tree member;
+       tree offset;
+      
+       /* Find the member.  */
+       member = PTRMEM_CST_MEMBER (cst);
+
+       if (TREE_CODE (member) == FIELD_DECL) 
+         {
+           /* Find the offset for the field.  */
+           offset = convert (sizetype,
+                             size_binop (EASY_DIV_EXPR,
+                                         DECL_FIELD_BITPOS (member),
+                                         size_int (BITS_PER_UNIT)));
+
+           /* We offset all pointer to data members by 1 so that we
+              can distinguish between a null pointer to data member
+              and the first data member of a structure.  */
+           offset = size_binop (PLUS_EXPR, offset, size_int (1));
+       
+           cst = cp_convert (type, offset);
+         }
+       else
+         {
+           tree delta;
+           tree idx;
+           tree pfn;
+           tree delta2;
+
+           expand_ptrmemfunc_cst (cst, &delta, &idx, &pfn, &delta2);
+
+           cst = build_ptrmemfunc1 (type, delta, idx,
+                                    pfn, delta2);
+         }
+      }
+      break;
+
+    default:
+      /* There's nothing to do.  */
+      break;
+    }
+
+  return cst;
+}
+
 /* Hook used by expand_expr to expand language-specific tree codes.  */
 
 static rtx
@@ -98,19 +154,13 @@ cplus_expand_expr (exp, target, tmode, modifier)
           initialization.  It is left here to show the choices that
           exist for C++.  */
           
-       if (TREE_CODE (func) == ADDR_EXPR
-           && TREE_CODE (TREE_OPERAND (func, 0)) == FUNCTION_DECL
-           && DECL_CONSTRUCTOR_P (TREE_OPERAND (func, 0)))
+       if (AGGR_INIT_VIA_CTOR_P (exp))
          {
            type = build_pointer_type (type);
-           /* Don't clobber a value that might be part of a default
-              parameter value.  */
            mark_addressable (slot);
-           if (TREE_PERMANENT (args))
-             args = expr_tree_cons (0, build1 (ADDR_EXPR, type, slot),
-                               TREE_CHAIN (args));
-           else
-             TREE_VALUE (args) = build1 (ADDR_EXPR, type, slot);
+           args = tree_cons (NULL_TREE, 
+                             build1 (ADDR_EXPR, type, slot),
+                             TREE_CHAIN (args));
            call_target = 0;
          }
        else
@@ -148,7 +198,9 @@ cplus_expand_expr (exp, target, tmode, modifier)
            init = convert_from_reference (init);
 
            flag_access_control = 0;
-           expand_aggr_init (slot, init, LOOKUP_ONLYCONVERTING);
+           expand_expr (build_aggr_init (slot, init,
+                                         LOOKUP_ONLYCONVERTING), 
+                        target, tmode, EXPAND_NORMAL);
            flag_access_control = old_ac;
 
            if (TYPE_NEEDS_DESTRUCTOR (type))
@@ -163,37 +215,8 @@ cplus_expand_expr (exp, target, tmode, modifier)
       }
 
     case PTRMEM_CST:
-      {
-       tree member;
-       tree offset;
-       
-       /* Find the member.  */
-       member = PTRMEM_CST_MEMBER (exp);
-
-       if (TREE_CODE (member) == FIELD_DECL) 
-         {
-           /* Find the offset for the field.  */
-           offset = convert (sizetype,
-                             size_binop (EASY_DIV_EXPR,
-                                         DECL_FIELD_BITPOS (member),
-                                         size_int (BITS_PER_UNIT)));
-
-           /* We offset all pointer to data members by 1 so that we
-              can distinguish between a null pointer to data member
-              and the first data member of a structure.  */
-           offset = size_binop (PLUS_EXPR, offset, size_int (1));
-       
-           return expand_expr (cp_convert (type, offset), target, tmode,
-                               modifier);
-         }
-       else
-         {
-           /* We don't yet handle pointer-to-member functions this
-              way.  */
-           my_friendly_abort (0);
-           return 0;
-         }
-      }
+      return expand_expr (cplus_expand_constant (exp),
+                         target, tmode, modifier);
 
     case OFFSET_REF:
       {
@@ -210,15 +233,24 @@ cplus_expand_expr (exp, target, tmode, modifier)
 
     case VEC_INIT_EXPR:
       return expand_expr
-       (expand_vec_init
+       (build_vec_init
         (NULL_TREE, TREE_OPERAND (exp, 0),
          build_binary_op (MINUS_EXPR, TREE_OPERAND (exp, 2),
-                          integer_one_node, 1),
+                          integer_one_node),
          TREE_OPERAND (exp, 1), 0), target, tmode, modifier);
 
     case NEW_EXPR:
       return expand_expr (build_new_1 (exp), target, tmode, modifier);
 
+    case STMT_EXPR:
+      {
+       tree rtl_expr = begin_stmt_expr ();
+       tree block = expand_stmt (STMT_EXPR_STMT (exp));
+       finish_stmt_expr (rtl_expr, block);
+       return expand_expr (rtl_expr, target, tmode, modifier);
+      }
+      break;
+
     default:
       break;
     }
@@ -231,6 +263,7 @@ void
 init_cplus_expand ()
 {
   lang_expand_expr = cplus_expand_expr;
+  lang_expand_constant = cplus_expand_constant;
 }
 
 /* If DECL had its rtl moved from where callers expect it
@@ -360,12 +393,6 @@ do_case (start, end)
   if (end && pedantic)
     pedwarn ("ANSI C++ forbids range expressions in switch statement");
 
-  if (processing_template_decl)
-    {
-      add_tree (build_min_nt (CASE_LABEL, start, end));
-      return;
-    }
-
   if (start)
     value1 = check_cp_case_value (start);
   if (end)