diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-10-11 14:18:42 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-10-11 14:18:42 +0000 |
| commit | ddc757fe19adf1b99121fd6c42f6149b8d8cac2e (patch) | |
| tree | f541cb0d4c51c7f32de84b0a74299492539904ec | |
| parent | 3c87b77b1ea5bc5920e846d9c666bf4c1780148b (diff) | |
| download | gcc-ddc757fe19adf1b99121fd6c42f6149b8d8cac2e.zip gcc-ddc757fe19adf1b99121fd6c42f6149b8d8cac2e.tar.gz gcc-ddc757fe19adf1b99121fd6c42f6149b8d8cac2e.tar.bz2 | |
re PR c++/31671 (Non-type template of type const ref accepted as a non-const ref)
/cp
2013-10-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/31671
* pt.c (convert_nontype_argument): Set expr_type to
TREE_TYPE (probe_type).
/testsuite
2013-10-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/31671
* g++.dg/template/nontype26.C: New.
From-SVN: r203444
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/nontype26.C | 20 |
4 files changed, 32 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index da49d12..1e0c46c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-10-11 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/31671 + * pt.c (convert_nontype_argument): Set expr_type to + TREE_TYPE (probe_type). + 2013-10-11 Jakub Jelinek <jakub@redhat.com> * decl.c (duplicate_decls): Error out for redeclaration of UDRs. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 5721a68..57b3ff0 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5611,7 +5611,7 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) TREE_TYPE (TREE_TYPE (addr))))) { expr = TREE_OPERAND (addr, 0); - expr_type = TREE_TYPE (expr); + expr_type = TREE_TYPE (probe_type); } } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f182ad7..c27d500 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-10-11 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/31671 + * g++.dg/template/nontype26.C: New. + 2013-10-11 Thomas Schwinge <thomas@codesourcery.com> * c-c++-common/cpp/openmp-define-1.c: New file. diff --git a/gcc/testsuite/g++.dg/template/nontype26.C b/gcc/testsuite/g++.dg/template/nontype26.C new file mode 100644 index 0000000..763d987 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/nontype26.C @@ -0,0 +1,20 @@ +// PR c++/31671 + +template<int& i> void doit() { + i = 0; +} + +template<const int& i> class X { +public: + void foo() { + doit<i>(); // { dg-error "cv-qualification|no matching" } + } +}; + +int i = 0; + +X<i> x; + +int main() { + x.foo(); +} |