diff options
| author | Jason Merrill <jason@redhat.com> | 2015-08-05 13:51:29 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-08-05 13:51:29 -0400 |
| commit | 85171e7877e60e2af5a76b0961e3ee8903bd084f (patch) | |
| tree | b33563c16aa512d246a6a9ea38a0d146b779bc86 | |
| parent | 76787f70097bb232a9bb4afbd9e8c190e57291f0 (diff) | |
| download | gcc-85171e7877e60e2af5a76b0961e3ee8903bd084f.zip gcc-85171e7877e60e2af5a76b0961e3ee8903bd084f.tar.gz gcc-85171e7877e60e2af5a76b0961e3ee8903bd084f.tar.bz2 | |
re PR c++/65195 (Variable template cannot be used as a function)
PR c++/65195
PR c++/66619
* semantics.c (finish_id_expression): Call convert_from_reference
for variable template.
From-SVN: r226641
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/var-templ37.C | 23 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/var-templ40.C | 9 |
4 files changed, 40 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f51132c..382ad9a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2015-08-05 Jason Merrill <jason@redhat.com> + + PR c++/65195 + PR c++/66619 + * semantics.c (finish_id_expression): Call convert_from_reference + for variable template. + 2015-08-04 Jason Merrill <jason@redhat.com> * pt.c (lookup_template_class_1): Clear elt.spec. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 44f9f7a..d42838e 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -3564,6 +3564,7 @@ finish_id_expression (tree id_expression, { decl = finish_template_variable (decl); mark_used (decl); + decl = convert_from_reference (decl); } else if (scope) { diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ37.C b/gcc/testsuite/g++.dg/cpp1y/var-templ37.C new file mode 100644 index 0000000..11021a3 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/var-templ37.C @@ -0,0 +1,23 @@ +// PR c++/65195 +// { dg-do compile { target c++14 } } + +template<typename T> +T constant {}; + +template<typename T> +struct foo { + int operator()() const + { return 3; } +}; + +template<typename T> +auto& f = constant<foo<T>>; + +int main() +{ + // fine + auto& ref = f<int>; ref(); + + // error: f<int> cannot be used as a function + f<int>(); +} diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ40.C b/gcc/testsuite/g++.dg/cpp1y/var-templ40.C new file mode 100644 index 0000000..0a952c4 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/var-templ40.C @@ -0,0 +1,9 @@ +// PR c++/66619 +// { dg-do compile { target c++14 } } + +int y; +template<class T> T val1 = y; +auto&& x1 = val1<int&>; + +template<class T> T val2 = 0; +auto&& x2 = val2<int&&>; |