From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 86917385841D; Tue, 28 Feb 2023 22:36:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 86917385841D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677623819; bh=9CaTjytb/pjKkGCmxPXWR23yhjGNZktUjbBlQ1nrHcI=; h=From:To:Subject:Date:From; b=W6xmGPGcOuwf4+MzyRtV8G3rfrdvnom5gEa6pE1YvVBAA0XCgWfE0021bx3Z1ptLP j0TQlUdtcSQu3hWoaZYPNeoDdhxG3f9FkE//vadVn7OUsKdGAQi7W/ab22cUtmZb0f hOkPHRcKh8wSwZm2L/8iiTjSMvSJs8WUs2sWyiFk= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] gccrs: Fix ICE in ADTType::is_concrete X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: b50b73e3922081d4896cd10216c4c8f89388828f X-Git-Newrev: fd849953da2d5a39aa311b5e298bb92cd4b25be4 Message-Id: <20230228223659.86917385841D@sourceware.org> Date: Tue, 28 Feb 2023 22:36:59 +0000 (GMT) List-Id: https://gcc.gnu.org/g:fd849953da2d5a39aa311b5e298bb92cd4b25be4 commit fd849953da2d5a39aa311b5e298bb92cd4b25be4 Author: Philip Herron Date: Sun Feb 26 22:36:20 2023 +0000 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 Diff: --- gcc/rust/typecheck/rust-tyty.cc | 24 ++++++++++++++++++++++++ gcc/rust/typecheck/rust-tyty.h | 18 +----------------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/gcc/rust/typecheck/rust-tyty.cc b/gcc/rust/typecheck/rust-tyty.cc index d0d36ac0a11..28d03ce52c5 100644 --- a/gcc/rust/typecheck/rust-tyty.cc +++ b/gcc/rust/typecheck/rust-tyty.cc @@ -1110,6 +1110,30 @@ ADTType::as_string () const return identifier + subst_as_string () + "{" + variants_buffer + "}"; } +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 { diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h index 64b9379a1c0..05cd3a78dd8 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;