C++ PATCH for a fixme in build_functional_cast

Message ID 4E53CC40.1090503@redhat.com
State New
Headers show

Commit Message

Jason Merrill Aug. 23, 2011, 3:50 p.m.
While looking at another issue I noticed this fixme.  A TARGET_EXPR of 
literal type should have TREE_CONSTANT set iff the initializer is 
constant, and this patch implements that.

Tested x86_64-pc-linux-gnu, applying to trunk.


commit 21aebcf68d774827647731368a5708e1c60c31af
Author: Jason Merrill <jason@redhat.com>
Date:   Fri Aug 19 10:14:12 2011 -0400

    	* tree.c (build_target_expr): Set TREE_CONSTANT on
    	literal TARGET_EXPR if the value is constant.
    	* typeck2.c (build_functional_cast): Don't set it here.

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 4ef89c4..00598ce 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -288,6 +288,7 @@  static tree
 build_target_expr (tree decl, tree value, tsubst_flags_t complain)
   tree t;
+  tree type = TREE_TYPE (decl);
   gcc_assert (VOID_TYPE_P (TREE_TYPE (value))
@@ -302,12 +303,14 @@  build_target_expr (tree decl, tree value, tsubst_flags_t complain)
   t = cxx_maybe_build_cleanup (decl, complain);
   if (t == error_mark_node)
     return error_mark_node;
-  t = build4 (TARGET_EXPR, TREE_TYPE (decl), decl, value, t, NULL_TREE);
+  t = build4 (TARGET_EXPR, type, decl, value, t, NULL_TREE);
   /* We always set TREE_SIDE_EFFECTS so that expand_expr does not
      ignore the TARGET_EXPR.  If there really turn out to be no
      side-effects, then the optimizer should be able to get rid of
      whatever code is generated anyhow.  */
+  if (literal_type_p (type))
   return t;
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 79aa354..97f98ab 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1684,9 +1684,6 @@  build_functional_cast (tree exp, tree parms, tsubst_flags_t complain)
       exp = build_value_init (type, complain);
       exp = get_target_expr_sfinae (exp, complain);
-      /* FIXME this is wrong */
-      if (literal_type_p (type))
-	TREE_CONSTANT (exp) = true;
       return exp;