From fd849953da2d5a39aa311b5e298bb92cd4b25be4 Mon Sep 17 00:00:00 2001 From: Philip Herron Date: Sun, 26 Feb 2023 22:36:20 +0000 Subject: gccrs: Fix ICE in ADTType::is_concrete Signed-off-by: Philip Herron gcc/rust/ChangeLog: * typecheck/rust-tyty.cc (ADTType::is_concrete): need to consider if is a num_variant * typecheck/rust-tyty.h: refactor to cc file --- gcc/rust/typecheck/rust-tyty.cc | 24 ++++++++++++++++++++++++ gcc/rust/typecheck/rust-tyty.h | 18 +----------------- 2 files changed, 25 insertions(+), 17 deletions(-) (limited to 'gcc') diff --git a/gcc/rust/typecheck/rust-tyty.cc b/gcc/rust/typecheck/rust-tyty.cc index d0d36ac..28d03ce 100644 --- a/gcc/rust/typecheck/rust-tyty.cc +++ b/gcc/rust/typecheck/rust-tyty.cc @@ -1111,6 +1111,30 @@ ADTType::as_string () const } bool +ADTType::is_concrete () const +{ + if (is_unit ()) + { + return !needs_substitution (); + } + + for (auto &variant : variants) + { + bool is_num_variant + = variant->get_variant_type () == VariantDef::VariantType::NUM; + if (is_num_variant) + continue; + + for (auto &field : variant->get_fields ()) + { + if (!field->is_concrete ()) + return false; + } + } + return true; +} + +bool ADTType::can_eq (const BaseType *other, bool emit_errors) const { ADTCmp r (this, emit_errors); diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h index 64b9379..05cd3a7 100644 --- a/gcc/rust/typecheck/rust-tyty.h +++ b/gcc/rust/typecheck/rust-tyty.h @@ -604,23 +604,7 @@ public: return identifier + subst_as_string (); } - bool is_concrete () const override final - { - if (is_unit ()) - { - return !needs_substitution (); - } - - for (auto &variant : variants) - { - for (auto &field : variant->get_fields ()) - { - if (!field->is_concrete ()) - return false; - } - } - return true; - } + bool is_concrete () const override final; BaseType *clone () const final override; BaseType *monomorphized_clone () const final override; -- cgit v1.1