diff options
| author | Richard Guenther <rguenther@suse.de> | 2016-11-14 15:42:40 +0100 |
|---|---|---|
| committer | Richard Guenther <rguenther@suse.de> | 2016-11-14 15:42:40 +0100 |
| commit | ca94f8c64654980144e88fb19b04adf5f023aa55 (patch) | |
| tree | ef90f8461d210f78e7f7b0ba89923a5eda7b3758 /gcc/cp/semantics.c | |
| parent | 9e872f3fe8b4f6624e2edf5ee55a833e53f290c8 (diff) | |
| parent | 5dc46e164993bbf658f61069823a1b37a2d715eb (diff) | |
| download | gcc-gimplefe.tar.gz | |
Merge remote-tracking branch 'trunk' of git://gcc.gnu.org/git/gcc into gimplefegimplefe
Diffstat (limited to 'gcc/cp/semantics.c')
| -rw-r--r-- | gcc/cp/semantics.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 1a7c478d4ec..0164f2e5c74 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -2259,7 +2259,7 @@ perform_koenig_lookup (cp_expr fn, vec<tree, va_gc> *args, } } - if (fn && template_id) + if (fn && template_id && fn != error_mark_node) fn = build2 (TEMPLATE_ID_EXPR, unknown_type_node, fn, tmpl_args); return fn; @@ -8873,6 +8873,9 @@ finish_decltype_type (tree expr, bool id_expression_or_member_access_p, if (identifier_p (expr)) expr = lookup_name (expr); + if (VAR_P (expr) && DECL_HAS_VALUE_EXPR_P (expr)) + expr = DECL_VALUE_EXPR (expr); + if (INDIRECT_REF_P (expr)) /* This can happen when the expression is, e.g., "a.b". Just look at the underlying operand. */ |