diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-22 23:38:34 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-22 23:38:34 +0000 |
| commit | 54b5ad5cf2278bcda67ec6c8cb4c6714f1df5d5c (patch) | |
| tree | 9375b680ccf2bdab7b509e73ec50e710a7fd519a | |
| parent | 7b686ee18676478d4c644118315aab8da9b940ef (diff) | |
/cp
2013-01-22 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/55944
* decl.c (check_initializer): Use TARGET_EXPR_DIRECT_INIT_P only
on TARGET_EXPR nodes.
/testsuite
2013-01-22 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/55944
* g++.dg/cpp0x/constexpr-static10.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195391 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-static10.C | 19 |
4 files changed, 31 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7da2b4aa569..9a25935adff 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-01-22 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/55944 + * decl.c (check_initializer): Use TARGET_EXPR_DIRECT_INIT_P only + on TARGET_EXPR nodes. + 2013-01-22 Jason Merrill <jason@redhat.com> PR c++/56071 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 768573f7ed5..9b40018370f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5693,7 +5693,7 @@ check_initializer (tree decl, tree init, int flags, vec<tree, va_gc> **cleanups) && (!init || TREE_CODE (init) == TREE_LIST)) { init = build_functional_cast (type, init, tf_none); - if (init != error_mark_node) + if (TREE_CODE (init) == TARGET_EXPR) TARGET_EXPR_DIRECT_INIT_P (init) = true; } init_code = NULL_TREE; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c0fe13bf0d1..6ed2b3e8904 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-01-22 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/55944 + * g++.dg/cpp0x/constexpr-static10.C: New. + 2013-01-22 Uros Bizjak <ubizjak@gmail.com> PR target/56028 diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-static10.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-static10.C new file mode 100644 index 00000000000..9b76e6fb354 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-static10.C @@ -0,0 +1,19 @@ +// PR c++/55944 +// { dg-options -std=c++11 } + +template<class T> +struct Test +{ + constexpr Test(T val) : value(val) {} + static void test() + { + static constexpr Test<int> x(42); // ICE + } + T value; +}; + +int main() +{ + static constexpr Test<int> x(42); // OK + Test<double>::test(); +} |