Merge #1197

1197: Support recursive coercion sites r=philberty a=philberty

There are two changes are part of this PR one where we update the address_expression
helper to take a ptrtype tree. Since the default build_address_expr_loc was automatically
building a pointer type of the TREE_TYPE of the operand which is not correct since we
sometimes want REFERENCE_TYPES instead of POINTER_TYPES. 

The 2nd commit enhances the coercion_site code to recursively walk the tree and their
types to handle coercions to dyn traits or do array bounds checking etc. This gets rid of
the get_root hack used and cleans up the code in general.


Fixes #1146 

Co-authored-by: Philip Herron <philip.herron@embecosm.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/gcc/rust/backend/rust-compile-implitem.cc b/gcc/rust/backend/rust-compile-implitem.cc
index 9dc6d14..c13556a 100644
--- a/gcc/rust/backend/rust-compile-implitem.cc
+++ b/gcc/rust/backend/rust-compile-implitem.cc
@@ -68,7 +68,10 @@ CompileTraitItem::visit (HIR::TraitItemFunc &func)
 	    {
 	      ctx->insert_function_decl (fntype, lookup);
 	    }
-	  reference = address_expression (lookup, ref_locus);
+	  reference
+	    = address_expression (lookup,
+				  build_pointer_type (TREE_TYPE (lookup)),
+				  ref_locus);
 	  return;
 	}
     }
@@ -95,7 +98,9 @@ CompileTraitItem::visit (HIR::TraitItemFunc &func)
 			func.get_outer_attrs (), func.get_locus (),
 			func.get_block_expr ().get (), canonical_path, fntype,
 			function.has_return_type ());
-  reference = address_expression (fndecl, ref_locus);
+  reference
+    = address_expression (fndecl, build_pointer_type (TREE_TYPE (fndecl)),
+			  ref_locus);
 }
 
 } // namespace Compile