PR c++/46335

	* tree.c (bot_manip): Check TREE_SIDE_EFFECTS as well.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4f08ec3..2408adb 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-08  Jason Merrill  <jason@redhat.com>
 
+       PR c++/46335
+       * tree.c (bot_manip): Check TREE_SIDE_EFFECTS as well.
+
        Correct conversion/overflow behavior.
        * cvt.c (ignore_overflows): Move here from typeck.c.
        (ocp_convert): Use it.

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 5440e10..462e35f 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1763,11 +1763,10 @@ bot_manip (tree* tp, int* walk_subtrees, void* data)
   splay_tree target_remap = ((splay_tree) data);
   tree t = *tp;
 
-  if (!TYPE_P (t) && TREE_CONSTANT (t))
+  if (!TYPE_P (t) && TREE_CONSTANT (t) && !TREE_SIDE_EFFECTS (t))
     {
       /* There can't be any TARGET_EXPRs or their slot variables below
-        this point.  We used to check !TREE_SIDE_EFFECTS, but then we
-        failed to copy an ADDR_EXPR of the slot VAR_DECL.  */
+        this point.  */
       *walk_subtrees = 0;
       return NULL_TREE;
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e94dcef..1211aa2 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-08  Jason Merrill  <jason@redhat.com>
+
+       * g++.dg/cpp0x/constexpr-defarg.C: New.
+
 2010-11-08  Xinliang David Li  <davidxl@google.com>
 
        PR/46316

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-defarg.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-defarg.C
new file mode 100644 (file)
index 0000000..1413b24
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-defarg.C
@@ -0,0 +1,12 @@
+// PR c++/46335
+// { dg-options -std=c++0x }
+
+struct T { };
+struct A {
+    A(const T &tr =T()) {}
+};
+struct B {
+    A k;
+};
+B kk_;
+A fk_;