From a647c005908d79bc6b50739c43b7ac105bc193a9 Mon Sep 17 00:00:00 2001 From: Philip Herron Date: Fri, 20 May 2022 17:35:35 +0100 Subject: Make TyTy::BaseType::destructure recursive In the case of Generic Associated Types we end up placeholders->projections->generic-param->i32 This means we need to keep destructuring the TyTy object until we finally get the real type at the end. In order to do this safely we need to ensure we add in recursion limits and apply this where it matters such as compiling types in general too. --- gcc/rust/backend/rust-compile-type.cc | 12 +++++++++--- gcc/rust/backend/rust-compile-type.h | 7 ++----- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'gcc/rust/backend') diff --git a/gcc/rust/backend/rust-compile-type.cc b/gcc/rust/backend/rust-compile-type.cc index 3874027..102bc0a 100644 --- a/gcc/rust/backend/rust-compile-type.cc +++ b/gcc/rust/backend/rust-compile-type.cc @@ -112,9 +112,15 @@ TyTyResolveCompile::visit (const TyTy::PlaceholderType &type) void TyTyResolveCompile::visit (const TyTy::ParamType ¶m) { - // FIXME make this reuse the same machinery from constexpr code - recursion_count++; - rust_assert (recursion_count < kDefaultRecusionLimit); + if (recurisve_ops++ >= rust_max_recursion_depth) + { + rust_error_at (Location (), + "% count exceeds limit of %i (use " + "% to increase the limit)", + rust_max_recursion_depth); + translated = error_mark_node; + return; + } param.resolve ()->accept_vis (*this); } diff --git a/gcc/rust/backend/rust-compile-type.h b/gcc/rust/backend/rust-compile-type.h index 3e1f903..262b8fc 100644 --- a/gcc/rust/backend/rust-compile-type.h +++ b/gcc/rust/backend/rust-compile-type.h @@ -63,16 +63,13 @@ public: private: TyTyResolveCompile (Context *ctx, bool trait_object_mode) : ctx (ctx), trait_object_mode (trait_object_mode), - translated (error_mark_node), recursion_count (0) + translated (error_mark_node), recurisve_ops (0) {} Context *ctx; bool trait_object_mode; tree translated; - - // FIXME this needs to be derived from the gcc config option - size_t recursion_count; - static const size_t kDefaultRecusionLimit = 5; + int recurisve_ops; }; } // namespace Compile -- cgit v1.1