diff options
| author | Andrew Sutton <andrew.n.sutton@gmail.com> | 2015-07-02 23:16:51 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-07-02 19:16:51 -0400 |
| commit | ee00eaeacae53d2b93fecbb7629d166a57fd1834 (patch) | |
| tree | 0c21f88fee21543b6e3dca50bd7979bf8f46b7a9 /gcc/cp | |
| parent | 5209ef3c0ba13d146d69a2d03ced776097a6a72c (diff) | |
| download | gcc-ee00eaeacae53d2b93fecbb7629d166a57fd1834.zip gcc-ee00eaeacae53d2b93fecbb7629d166a57fd1834.tar.gz gcc-ee00eaeacae53d2b93fecbb7629d166a57fd1834.tar.bz2 | |
pt.c (type_dependent_expression_p): Handle expressions that refer to variable templates.
* pt.c (type_dependent_expression_p): Handle expressions
that refer to variable templates.
From-SVN: r225361
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dacc828..12640af 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2015-07-02 Andrew Sutton <andrew.n.sutton@gmail.com> + + * pt.c (type_dependent_expression_p): Handle expressions + that refer to variable templates. + 2015-07-01 Jason Merrill <jason@redhat.com> * lex.c (init_reswords): s/CXX0X/CXX11/. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 38d2e3a..12feeee 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -21606,6 +21606,10 @@ type_dependent_expression_p (tree expression) return true; expression = TREE_OPERAND (expression, 0); } + + if (variable_template_p (expression)) + return dependent_type_p (TREE_TYPE (expression)); + gcc_assert (TREE_CODE (expression) == OVERLOAD || TREE_CODE (expression) == FUNCTION_DECL); |