diff options
| author | Jason Merrill <jason@redhat.com> | 2016-05-13 15:18:35 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2016-05-13 15:18:35 -0400 |
| commit | 23cb72663051cd3f5a8952d4aa2186d50243b7d0 (patch) | |
| tree | e9aad0aad6326cf9be486f34c8cb1608f3166a1f /gcc/cp/typeck2.c | |
| parent | 827e5d3f706ff07400025488c76e1ad7b3300d83 (diff) | |
| download | gcc-23cb72663051cd3f5a8952d4aa2186d50243b7d0.zip gcc-23cb72663051cd3f5a8952d4aa2186d50243b7d0.tar.gz gcc-23cb72663051cd3f5a8952d4aa2186d50243b7d0.tar.bz2 | |
Fix type-dependence and the current instantiation.
PR c++/10200
PR c++/69753
* pt.c (tsubst_decl): Use uses_template_parms.
(instantiate_template_1): Handle non-dependent calls in templates.
(value_dependent_expression_p): Handle BASELINK, FUNCTION_DECL.
(type_dependent_expression_p): Only consider innermost template args.
(dependent_template_arg_p): Check enclosing class of a template here.
(dependent_template_p): Not here.
(type_dependent_object_expression_p): New.
* typeck.c (finish_class_member_access_expr): Use it.
* parser.c (cp_parser_postfix_expression): Use it.
(cp_parser_postfix_dot_deref_expression): Use it. Use comptypes
to detect the current instantiation.
(cp_parser_lookup_name): Really implement DR 141.
* search.c (lookup_field_r): Prefer a dependent using-declaration.
(any_dependent_bases_p): Split out from...
* name-lookup.c (do_class_using_decl): ...here.
* call.c (build_new_method_call_1): Use it.
* semantics.c (finish_call_expr): 'this' doesn't make a call dependent.
* tree.c (non_static_member_function_p): Remove.
* typeck2.c (build_x_arrow): Use dependent_scope_p.
From-SVN: r236221
Diffstat (limited to 'gcc/cp/typeck2.c')
| -rw-r--r-- | gcc/cp/typeck2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 1c4e832f..833be20 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -1703,7 +1703,10 @@ build_x_arrow (location_t loc, tree expr, tsubst_flags_t complain) if (processing_template_decl) { - if (type_dependent_expression_p (expr)) + if (type && TREE_CODE (type) == POINTER_TYPE + && !dependent_scope_p (TREE_TYPE (type))) + /* Pointer to current instantiation, don't treat as dependent. */; + else if (type_dependent_expression_p (expr)) return build_min_nt_loc (loc, ARROW_EXPR, expr); expr = build_non_dependent_expr (expr); } |