From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 04764385483E; Tue, 31 Jan 2023 13:15:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 04764385483E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675170933; bh=NvhkMghwi+xAWXypmJt4dHA7vk7GhpJQ51068XsUiJw=; h=From:To:Subject:Date:From; b=kn1G3sXUwJ3oodeIic7kC3IJX0Q9vPNnzzTMgNkLYRA2UPGKxMC1K1991O8enIsEs 6jJ0zbQwVWzpltFMuIdMdqbuW2DIy7iunhguPuF+NhXH7rK465L2wUKct3JZQhUCcY ElLUM/VWnXUOfPdAmX/mQCDTWcQ7z3WgIhbXZXiA= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5549] gccrs: 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/master X-Git-Oldrev: 7ad24d802e593dff058874bd81a2d4d4cfcd1b73 X-Git-Newrev: 1eabeb5aecc954d2c237f5997605a73a37dd1c12 Message-Id: <20230131131533.04764385483E@sourceware.org> Date: Tue, 31 Jan 2023 13:15:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1eabeb5aecc954d2c237f5997605a73a37dd1c12 commit r13-5549-g1eabeb5aecc954d2c237f5997605a73a37dd1c12 Author: Philip Herron Date: Wed Aug 31 14:08:43 2022 +0100 gccrs: 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. gcc/rust/ChangeLog: * backend/rust-tree.cc (comptypes): Remove some C++ specific checks in Rust const folder for now. 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 d79cd96f011..d2ddcfd2957 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);