From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 718D13858400; Wed, 31 Aug 2022 14:10:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 718D13858400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1661955005; bh=6MNRN/+6TzbBmLGn3Q8t+AraVVbB0rE81jOxIjeSx/8=; h=From:To:Subject:Date:From; b=jnO/CweRMjkpIgIr8XbAZu4+Is7RIZTaY8EIUT1wnZ4utqs294EAlA8BYMdxa8B6F Oc0AcGS5+HBm8kLrUCOTii1ksm82hw7mc7q89VzPHKmKvKcMu/CvFYtPfLHTGjYyk/ TQlrBm4/ziaapjT5tUje9PA6ZUpv/rySDjXvaBwo= 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] Remove param_use_canonical_types checks ported from c++ front-end X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: ebb127f2aed32f21a37b31e8a5330defc6bfe5e7 X-Git-Newrev: b1cf3a384d41fa34c1eb819696e66fa65625d8db Message-Id: <20220831141005.718D13858400@sourceware.org> Date: Wed, 31 Aug 2022 14:10:05 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b1cf3a384d41fa34c1eb819696e66fa65625d8db commit b1cf3a384d41fa34c1eb819696e66fa65625d8db Author: Philip Herron Date: Wed Aug 31 14:08:43 2022 +0100 Remove param_use_canonical_types checks ported from c++ front-end We are not fully setting TYPE_CANONICAL yet but we don't need to be as strict as the C++ front-end yet. param_use_canonical_types is a command line option we are not using either. Diff: --- gcc/rust/backend/rust-tree.cc | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/gcc/rust/backend/rust-tree.cc b/gcc/rust/backend/rust-tree.cc index 9dac0dce53d..f5878356841 100644 --- a/gcc/rust/backend/rust-tree.cc +++ b/gcc/rust/backend/rust-tree.cc @@ -2916,27 +2916,7 @@ comptypes (tree t1, tree t2, int strict) perform a deep check. */ return structural_comptypes (t1, t2, strict); - if (flag_checking && param_use_canonical_types) - { - bool result = structural_comptypes (t1, t2, strict); - - if (result && TYPE_CANONICAL (t1) != TYPE_CANONICAL (t2)) - /* The two types are structurally equivalent, but their - canonical types were different. This is a failure of the - canonical type propagation code.*/ - internal_error ( - "canonical types differ for identical types %qT and %qT", t1, t2); - else if (!result && TYPE_CANONICAL (t1) == TYPE_CANONICAL (t2)) - /* Two types are structurally different, but the canonical - types are the same. This means we were over-eager in - assigning canonical types. */ - internal_error ( - "same canonical type node for different types %qT and %qT", t1, - t2); - - return result; - } - if (!flag_checking && param_use_canonical_types) + if (!flag_checking) return TYPE_CANONICAL (t1) == TYPE_CANONICAL (t2); else return structural_comptypes (t1, t2, strict);