summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-04 18:00:28 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-04 18:00:28 +0000
commit951c45c58cac31ac03dbd7b9e554ffeab1a65c98 (patch)
treee826707699f6cbc54adc85d95f6eb30223363229 /gcc
parenta31beac3d3a4627beca1ccf252b213dd81a0089a (diff)
downloadgcc-951c45c58cac31ac03dbd7b9e554ffeab1a65c98.tar.gz
PR c++/59268
* pt.c (tsubst_copy_and_build): Handle POINTER_PLUS_EXPR. * g++.dg/cpp0x/constexpr-template6.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205674 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/pt.c4
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/constexpr-template6.C20
4 files changed, 34 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e2fc2a2d125..119f309b15c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-04 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/59268
+ * pt.c (tsubst_copy_and_build): Handle POINTER_PLUS_EXPR.
+
2013-11-29 Marek Polacek <polacek@redhat.com>
PR sanitizer/59331
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index b58c7556e2e..25d940c695a 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -14159,6 +14159,10 @@ tsubst_copy_and_build (tree t,
RETURN (r);
}
+ case POINTER_PLUS_EXPR:
+ return fold_build_pointer_plus (RECUR (TREE_OPERAND (t, 0)),
+ RECUR (TREE_OPERAND (t, 1)));
+
case SCOPE_REF:
RETURN (tsubst_qualified_id (t, args, complain, in_decl, /*done=*/true,
/*address_p=*/false));
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3fe3212dd73..b2331560b24 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-04 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/59268
+ * g++.dg/cpp0x/constexpr-template6.C: New test.
+
2013-12-04 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/pack19.adb: New test.
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-template6.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-template6.C
new file mode 100644
index 00000000000..eac6004aeb3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-template6.C
@@ -0,0 +1,20 @@
+// PR c++/59268
+// { dg-do compile }
+// { dg-options "-std=c++11" }
+
+template <typename>
+struct A
+{
+ constexpr A (int) {}
+ virtual void foo ()
+ {
+ constexpr A<void> a (0);
+ }
+};
+
+void
+bar ()
+{
+ A<int> a (3);
+ a.foo ();
+}