From 476e904fc3cf1525c7e93ebc6acf9e01adcac701 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 23 Dec 2010 00:55:31 +0000 Subject: Fix append with no extra arguments. From-SVN: r168195 --- gcc/go/gofrontend/expressions.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gcc') diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc index 23f6e2b..09d79a0 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -7926,10 +7926,16 @@ Builtin_call_expression::do_get_tree(Translate_context* context) if (arg1_tree == error_mark_node || arg2_tree == error_mark_node) return error_mark_node; - Array_type* at2 = arg2->type()->array_type(); + arg2_tree = Expression::convert_for_assignment(context, at, + arg2->type(), + arg2_tree, + location); + if (arg2_tree == error_mark_node) + return error_mark_node; + arg2_tree = save_expr(arg2_tree); - tree arg2_val = at2->value_pointer_tree(gogo, arg2_tree); - tree arg2_len = at2->length_tree(gogo, arg2_tree); + tree arg2_val = at->value_pointer_tree(gogo, arg2_tree); + tree arg2_len = at->length_tree(gogo, arg2_tree); if (arg2_val == error_mark_node || arg2_len == error_mark_node) return error_mark_node; arg2_val = fold_convert_loc(location, ptr_type_node, arg2_val); -- cgit v1.1