summaryrefslogtreecommitdiff
path: root/gcc/cp/parser.c
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-22 16:16:21 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-22 16:16:21 +0000
commit5352530896605643bb65227f180cf27e924e821e (patch)
tree357da5d82dcc3c51eed36f59c7c9eed17170d8d4 /gcc/cp/parser.c
parentc052a8d50027bdbf0e25570eb77bd75aaec399e1 (diff)
downloadgcc-5352530896605643bb65227f180cf27e924e821e.tar.gz
* parser.c (cp_parser_perform_range_for_lookup): Decay the array.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235370 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/parser.c')
-rw-r--r--gcc/cp/parser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index feb8de76bc3..500a9b39a26 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -11413,12 +11413,12 @@ cp_parser_perform_range_for_lookup (tree range, tree *begin, tree *end)
if (TREE_CODE (TREE_TYPE (range)) == ARRAY_TYPE)
{
/* If RANGE is an array, we will use pointer arithmetic. */
- *begin = range;
+ *begin = decay_conversion (range, tf_warning_or_error);
*end = build_binary_op (input_location, PLUS_EXPR,
range,
array_type_nelts_top (TREE_TYPE (range)),
0);
- return build_pointer_type (TREE_TYPE (TREE_TYPE (range)));
+ return TREE_TYPE (*begin);
}
else
{