Merge #1190 #1192 #1193

1190: Fix ICE in reachability class and refactor associated types code r=philberty a=philberty

There are several fixes going on to solve these issues which overlap with one
another so it seemed best to pack them within the same PR.

The main issue for #1128 was that we did not resolve a trait when it was unused
leading to us hitting the ICE in the privacy pass. Since the type check context was
empty for the trait since it was not resolved. To fix this we needed to refactor the
trait resolver to resolve the trait as part of iterating the crate. This resulted in some
regressions in the testsuite so this is why we need the the other commits. Which
required us to finally perform the refactor specified in #1105 to fix these.

Fixes #1105 #1128 #1132

1192: Add an assertion to avoid peeking when the stack is empty r=philberty a=philberty

This will ensure we get a proper ICE instead of memory corruption/segv.

Addresses #1130 

1193: Remove unused parameter caller from generating Call expressions r=philberty a=philberty

Within const context the fncontext maybe empty which in turn results in a
segv for generating const calls which will be evaluated by the const-expr
code anyway.

Addresses #1130


Co-authored-by: Philip Herron <[email protected]>

Author: bors[bot]

gcc/rust/backend/rust-compile-context.h

@@ -254,7 +254,11 @@ class Context
   bool in_fn () { return fn_stack.size () != 0; }
 
   // Note: it is undefined behavior to call peek_fn () if fn_stack is empty.
-  fncontext peek_fn () { return fn_stack.back (); }
+  fncontext peek_fn ()
+  {
+    rust_assert (!fn_stack.empty ());
+    return fn_stack.back ();
+  }
 
   void push_type (tree t) { type_decls.push_back (t); }
   void push_var (::Bvariable *v) { var_decls.push_back (v); }

gcc/rust/backend/rust-compile-expr.cc

@@ -497,10 +497,8 @@ CompileExpr::visit (HIR::CallExpr &expr)
 
   // must be a call to a function
   auto fn_address = CompileExpr::Compile (expr.get_fnexpr (), ctx);
-  auto fncontext = ctx->peek_fn ();
-  translated
-    = ctx->get_backend ()->call_expression (fncontext.fndecl, fn_address, args,
-					    nullptr, expr.get_locus ());
+  translated = ctx->get_backend ()->call_expression (fn_address, args, nullptr,
+						     expr.get_locus ());
 }
 
 void
@@ -610,10 +608,8 @@ CompileExpr::visit (HIR::MethodCallExpr &expr)
       args.push_back (rvalue);
     }
 
-  auto fncontext = ctx->peek_fn ();
-  translated
-    = ctx->get_backend ()->call_expression (fncontext.fndecl, fn_expr, args,
-					    nullptr, expr.get_locus ());
+  translated = ctx->get_backend ()->call_expression (fn_expr, args, nullptr,
+						     expr.get_locus ());
 }
 
 tree
@@ -696,8 +692,8 @@ CompileExpr::compile_dyn_dispatch_call (const TyTy::DynamicObjectType *dyn,
   tree fn_expr
     = ctx->get_backend ()->var_expression (fn_convert_expr_tmp, expr_locus);
 
-  return ctx->get_backend ()->call_expression (fnctx.fndecl, fn_expr, args,
-					       nullptr, expr_locus);
+  return ctx->get_backend ()->call_expression (fn_expr, args, nullptr,
+					       expr_locus);
 }
 
 tree
@@ -866,9 +862,8 @@ CompileExpr::resolve_operator_overload (
   if (rhs != nullptr)	 // can be null for negation_expr (unary ones)
     args.push_back (rhs);
 
-  auto fncontext = ctx->peek_fn ();
-  return ctx->get_backend ()->call_expression (fncontext.fndecl, fn_expr, args,
-					       nullptr, expr.get_locus ());
+  return ctx->get_backend ()->call_expression (fn_expr, args, nullptr,
+					       expr.get_locus ());
 }
 
 tree
@@ -1289,10 +1284,8 @@ HIRCompileBase::resolve_deref_adjustment (Resolver::Adjustment &adjustment,
     }
 
   // make the call
-  auto fncontext = ctx->peek_fn ();
-  return ctx->get_backend ()->call_expression (fncontext.fndecl, fn_address,
-					       {adjusted_argument}, nullptr,
-					       locus);
+  return ctx->get_backend ()->call_expression (fn_address, {adjusted_argument},
+					       nullptr, locus);
 }
 
 tree

gcc/rust/backend/rust-compile-implitem.cc

@@ -52,6 +52,7 @@ CompileTraitItem::visit (HIR::TraitItemFunc &func)
 
   rust_assert (concrete->get_kind () == TyTy::TypeKind::FNDEF);
   TyTy::FnType *fntype = static_cast<TyTy::FnType *> (concrete);
+  fntype->monomorphize ();
 
   // items can be forward compiled which means we may not need to invoke this
   // code. We might also have already compiled this generic function as well.

gcc/rust/backend/rust-compile-item.cc

@@ -127,6 +127,7 @@ CompileItem::visit (HIR::Function &function)
 	{
 	  rust_assert (concrete->get_kind () == TyTy::TypeKind::FNDEF);
 	  fntype = static_cast<TyTy::FnType *> (concrete);
+	  fntype->monomorphize ();
 	}
     }
 

gcc/rust/backend/rust-compile-resolve-path.cc

@@ -251,21 +251,6 @@ HIRCompileBase::query_compile (HirId ref, TyTy::BaseType *lookup,
 	      rust_assert (ok);				    // found
 	      rust_assert (trait_item_ref->is_optional ()); // has definition
 
-	      Analysis::NodeMapping trait_mappings
-		= trait_item_ref->get_parent_trait_mappings ();
-
-	      HirId associated_impl_id;
-	      ok = ctx->get_tyctx ()->lookup_associated_impl_mapping_for_self (
-		trait_mappings.get_hirid (), receiver, &associated_impl_id);
-	      rust_assert (ok);
-
-	      Resolver::AssociatedImplTrait *associated = nullptr;
-	      bool found_associated_trait_impl
-		= ctx->get_tyctx ()->lookup_associated_trait_impl (
-		  associated_impl_id, &associated);
-	      rust_assert (found_associated_trait_impl);
-	      associated->setup_associated_types ();
-
 	      return CompileTraitItem::Compile (
 		trait_item_ref->get_hir_trait_item (), ctx, lookup, true,
 		expr_locus);

gcc/rust/rust-backend.h

@@ -285,8 +285,7 @@ class Backend
 
   // Create an expression for a call to FN with ARGS, taking place within
   // caller CALLER.
-  virtual tree call_expression (tree caller, tree fn,
-				const std::vector<tree> &args,
+  virtual tree call_expression (tree fn, const std::vector<tree> &args,
 				tree static_chain, Location)
     = 0;
 

gcc/rust/rust-gcc.cc

@@ -250,7 +250,7 @@ class Gcc_backend : public Backend
 
   tree array_index_expression (tree array, tree index, Location);
 
-  tree call_expression (tree caller, tree fn, const std::vector<tree> &args,
+  tree call_expression (tree fn, const std::vector<tree> &args,
 			tree static_chain, Location);
 
   // Statements.
@@ -1794,8 +1794,7 @@ Gcc_backend::array_index_expression (tree array_tree, tree index_tree,
 
 // Create an expression for a call to FN_EXPR with FN_ARGS.
 tree
-Gcc_backend::call_expression (tree, // containing fcn for call
-			      tree fn, const std::vector<tree> &fn_args,
+Gcc_backend::call_expression (tree fn, const std::vector<tree> &fn_args,
 			      tree chain_expr, Location location)
 {
   if (fn == error_mark_node || TREE_TYPE (fn) == error_mark_node)

gcc/rust/typecheck/rust-hir-path-probe.h

@@ -326,18 +326,6 @@ class PathProbeType : public TypeCheckBase
       }
 
     TyTy::BaseType *trait_item_tyty = trait_item_ref->get_tyty ();
-    if (impl != nullptr && !is_reciever_generic ())
-
-      {
-	HirId impl_block_id = impl->get_mappings ().get_hirid ();
-	AssociatedImplTrait *lookup_associated = nullptr;
-	bool found_impl_trait
-	  = context->lookup_associated_trait_impl (impl_block_id,
-						   &lookup_associated);
-	// see testsuite/rust/compile/torture/traits10.rs this can be false
-	if (found_impl_trait)
-	  lookup_associated->setup_associated_types ();
-      }
 
     // we can substitute the Self with the receiver here
     if (trait_item_tyty->get_kind () == TyTy::TypeKind::FNDEF)

gcc/rust/typecheck/rust-hir-trait-ref.h

@@ -454,18 +454,11 @@ class AssociatedImplTrait
 
   TyTy::BaseType *get_self () { return self; }
 
-  void setup_associated_types ();
-
-  void setup_associated_types2 (const TyTy::BaseType *self,
-				const TyTy::TypeBoundPredicate &bound);
+  void setup_associated_types (const TyTy::BaseType *self,
+			       const TyTy::TypeBoundPredicate &bound);
 
   void reset_associated_types ();
 
-  TyTy::BaseType *get_projected_type (const TraitItemReference *trait_item_ref,
-				      TyTy::BaseType *reciever, HirId ref,
-				      HIR::GenericArgs &trait_generics,
-				      Location expr_locus);
-
 private:
   TraitReference *trait;
   HIR::ImplBlock *impl;