From d3a79fcc3cabaf05e551f9b54b3ebd3ca9fc0f09 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 29 Jun 2010 15:29:02 -0400 Subject: [PATCH] re PR c++/44587 (ICE in instantiate_decl) PR c++/44587 * pt.c (has_value_dependent_address): New. (value_dependent_expression_p): Check it. (convert_nontype_argument): Likewise. Call decay_conversion before folding if we want a pointer. * semantics.c (finish_id_expression): Don't add SCOPE_REF if the scope is the current instantiation. From-SVN: r161559 --- gcc/cp/ChangeLog | 10 ++++++ gcc/cp/pt.c | 48 ++++++++++++++++++++++++++- gcc/cp/semantics.c | 8 ++++- gcc/testsuite/ChangeLog | 6 ++++ gcc/testsuite/g++.dg/template/qualified-id2.C | 27 +++++++++++++++ gcc/testsuite/g++.dg/template/qualified-id3.C | 14 ++++++++ 6 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/qualified-id2.C create mode 100644 gcc/testsuite/g++.dg/template/qualified-id3.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a7df7b8..da75d04 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,13 @@ +2010-06-29 Jason Merrill + + PR c++/44587 + * pt.c (has_value_dependent_address): New. + (value_dependent_expression_p): Check it. + (convert_nontype_argument): Likewise. Call decay_conversion before + folding if we want a pointer. + * semantics.c (finish_id_expression): Don't add SCOPE_REF if the + scope is the current instantiation. + 2010-06-28 Jakub Jelinek PR c++/44682 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 863218d..8a447ec 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -4880,6 +4880,36 @@ check_valid_ptrmem_cst_expr (tree type, tree expr) return false; } +/* Returns TRUE iff the address of OP is value-dependent. + + 14.6.2.4 [temp.dep.temp]: + A non-integral non-type template-argument is dependent if its type is + dependent or it has either of the following forms + qualified-id + & qualified-id + and contains a nested-name-specifier which specifies a class-name that + names a dependent type. + + We generalize this to just say that the address of a member of a + dependent class is value-dependent; the above doesn't cover the + address of a static data member named with an unqualified-id. */ + +static bool +has_value_dependent_address (tree op) +{ + /* We could use get_inner_reference here, but there's no need; + this is only relevant for template non-type arguments, which + can only be expressed as &id-expression. */ + if (DECL_P (op)) + { + tree ctx = CP_DECL_CONTEXT (op); + if (TYPE_P (ctx) && dependent_type_p (ctx)) + return true; + } + + return false; +} + /* Attempt to convert the non-type template parameter EXPR to the indicated TYPE. If the conversion is successful, return the converted value. If the conversion is unsuccessful, return @@ -4918,6 +4948,11 @@ convert_nontype_argument (tree type, tree expr) return NULL_TREE; } + /* Add the ADDR_EXPR now for the benefit of + value_dependent_expression_p. */ + if (TYPE_PTROBV_P (type)) + expr = decay_conversion (expr); + /* If we are in a template, EXPR may be non-dependent, but still have a syntactic, rather than semantic, form. For example, EXPR might be a SCOPE_REF, rather than the VAR_DECL to which the @@ -4925,7 +4960,11 @@ convert_nontype_argument (tree type, tree expr) so that access checking can be performed when the template is instantiated -- but here we need the resolved form so that we can convert the argument. */ - expr = fold_non_dependent_expr (expr); + if (TYPE_REF_OBJ_P (type) + && has_value_dependent_address (expr)) + /* If we want the address and it's value-dependent, don't fold. */; + else + expr = fold_non_dependent_expr (expr); if (error_operand_p (expr)) return error_mark_node; expr_type = TREE_TYPE (expr); @@ -17638,6 +17677,13 @@ value_dependent_expression_p (tree expression) return ((value_dependent_expression_p (TREE_OPERAND (expression, 0))) || (value_dependent_expression_p (TREE_OPERAND (expression, 2)))); + case ADDR_EXPR: + { + tree op = TREE_OPERAND (expression, 0); + return (value_dependent_expression_p (op) + || has_value_dependent_address (op)); + } + default: /* A constant expression is value-dependent if any subexpression is value-dependent. */ diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index e750937..8baf76a 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -3097,7 +3097,13 @@ finish_id_expression (tree id_expression, { tree r = convert_from_reference (decl); - if (processing_template_decl && TYPE_P (scope)) + /* In a template, return a SCOPE_REF for most qualified-ids + so that we can check access at instantiation time. But if + we're looking at a member of the current instantiation, we + know we have access and building up the SCOPE_REF confuses + non-type template argument handling. */ + if (processing_template_decl && TYPE_P (scope) + && !currently_open_class (scope)) r = build_qualified_name (TREE_TYPE (r), scope, decl, template_p); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5a23fe0..4ecfcab 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-06-29 Jason Merrill + + PR c++/44587 + * g++.dg/template/qualified-id2.C: New. + * g++.dg/template/qualified-id3.C: New. + 2010-06-29 Janus Weil PR fortran/44696 diff --git a/gcc/testsuite/g++.dg/template/qualified-id2.C b/gcc/testsuite/g++.dg/template/qualified-id2.C new file mode 100644 index 0000000..e88e854 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/qualified-id2.C @@ -0,0 +1,27 @@ +// PR c++/44587 +// { dg-do run } + +template struct A { static const char *p; }; +template const char *A::p = N; +template struct B { static const char c[1]; typedef A::c> C; }; +template const char B::c[1] = ""; +template struct D { static const char c[1]; typedef A C; }; +template const char D::c[1] = ""; + +template struct E { static int *ip; }; +template int* E::ip = &I; +template struct F { static int i; typedef E::i> C; }; +template int F::i; +template struct G { static int i; typedef E C; }; +template int G::i; + +#define AS(X) if (!(X)) return 1; +int main() +{ + AS(B::C::p == B::c); + AS(B::C::p == B::c); + AS(B::C::p != B::c); + AS(D::C::p == D::c); + AS(D::C::p == D::c); + AS(D::C::p != D::c); +} diff --git a/gcc/testsuite/g++.dg/template/qualified-id3.C b/gcc/testsuite/g++.dg/template/qualified-id3.C new file mode 100644 index 0000000..d97ef5c --- /dev/null +++ b/gcc/testsuite/g++.dg/template/qualified-id3.C @@ -0,0 +1,14 @@ +// PR c++/44587 + +template struct A { }; +template struct B { + static const int c; + typedef A::c> C; // { dg-error "non-constant" } +}; +template const int B::c = sizeof (T); + +template struct D { }; +template struct E { + static const int c = sizeof (T); + typedef D::c> F; // OK +}; -- 2.7.4