Merge #794

794: Fix unhandled type bounds in TypeAlias r=philberty a=philberty

This adds support for trait-object-types and desugars HIR::TraitObjectTypeOneBound into a single
HIR::TraitObjectType. This also adds the missing cases of the generic arguments to the TypeBoundPredicates.

It also contains cleanup for helpers used during monomorphization and a recursion limiter which is likely set too
low but it is good enough for the test-cases we have now to get good back-traces. 

Fixes #786 

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

1 files changed, 8 insertions, 1 deletions

diff --git a/gcc/rust/backend/rust-compile-context.h b/gcc/rust/backend/rust-compile-context.h
index 551e041..396cb10 100644
--- a/gcc/rust/backend/rust-compile-context.h
+++ b/gcc/rust/backend/rust-compile-context.h
@@ -367,6 +367,9 @@ public:
 
   void visit (const TyTy::ParamType &param) override
   {
+    recursion_count++;
+    rust_assert (recursion_count < kDefaultRecusionLimit);
+
     param.resolve ()->accept_vis (*this);
   }
 
@@ -670,12 +673,16 @@ public:
 
 private:
   TyTyResolveCompile (Context *ctx, bool trait_object_mode)
-    : ctx (ctx), trait_object_mode (trait_object_mode), translated (nullptr)
+    : ctx (ctx), trait_object_mode (trait_object_mode), translated (nullptr),
+      recursion_count (0)
   {}
 
   Context *ctx;
   bool trait_object_mode;
   ::Btype *translated;
+  size_t recursion_count;
+
+  static const size_t kDefaultRecusionLimit = 5;
 };
 
 } // namespace Compile