Refactor indirect_expression from the gcc-backend wrapper

This brings out the indirect expression out of our gcc wrapper, it also
just simplifies down to the normal build_indirect_expr_loc calls. Which
does not require specifiying the type since we can reuse TREE_TYPE. This
also simplifies the address_expression to just address_expr_with_loc and
grabs the type from TREE_TYPE as well.

1 files changed, 0 insertions, 24 deletions

diff --git a/gcc/rust/rust-gcc.cc b/gcc/rust/rust-gcc.cc
index 4fea6fb..27196e8 100644
--- a/gcc/rust/rust-gcc.cc
+++ b/gcc/rust/rust-gcc.cc
@@ -201,8 +201,6 @@ public:
 
   tree var_expression (Bvariable *var, Location);
 
-  tree indirect_expression (tree, tree expr, bool known_valid, Location);
-
   tree integer_constant_expression (tree type, mpz_t val);
 
   tree float_constant_expression (tree type, mpfr_t val);
@@ -1053,28 +1051,6 @@ Gcc_backend::var_expression (Bvariable *var, Location location)
   return var->get_tree (location);
 }
 
-// An expression that indirectly references an expression.
-
-tree
-Gcc_backend::indirect_expression (tree type_tree, tree expr_tree,
-				  bool known_valid, Location location)
-{
-  if (expr_tree == error_mark_node || type_tree == error_mark_node)
-    return error_mark_node;
-
-  // If the type of EXPR is a recursive pointer type, then we
-  // need to insert a cast before indirecting.
-  tree target_type_tree = TREE_TYPE (TREE_TYPE (expr_tree));
-  if (VOID_TYPE_P (target_type_tree))
-    expr_tree = fold_convert_loc (location.gcc_location (),
-				  build_pointer_type (type_tree), expr_tree);
-
-  tree ret = build_fold_indirect_ref_loc (location.gcc_location (), expr_tree);
-  if (known_valid)
-    TREE_THIS_NOTRAP (ret) = 1;
-  return ret;
-}
-
 // Return a typed value as a constant integer.
 
 tree