From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 794253857B9D; Tue, 16 Jan 2024 18:11:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 794253857B9D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1705428686; bh=ZL1i4niz9P3tuIv+CVouOwMMotp7nCOQ2l0IeRGlrlA=; h=From:To:Subject:Date:From; b=LuH9znOayhVg0N7BUqSIhFa/+URmSPLMRv8imAUU2LvRCr6MNnBUumfXIR2Gldk4O /KavUtgfQCkVb5DfAQa3zS/cbc/N7xVe2cxL1VKqvAGcZKKBWkeRgLxihksQx1v1Hr NE+Z8KXsgXCzpWxaTUhbXxGpWwhWfjlSXdiaTxiA= 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 r14-7989] gccrs: resolver: Refactor assertion X-Act-Checkin: gcc X-Git-Author: Pierre-Emmanuel Patry X-Git-Refname: refs/heads/trunk X-Git-Oldrev: c8911dde92a98f1c9230a04c62a5287b562bc720 X-Git-Newrev: 342b071a0fac00d8acf745348c41afcd48cdb4cb Message-Id: <20240116181126.794253857B9D@sourceware.org> Date: Tue, 16 Jan 2024 18:11:26 +0000 (GMT) List-Id: https://gcc.gnu.org/g:342b071a0fac00d8acf745348c41afcd48cdb4cb commit r14-7989-g342b071a0fac00d8acf745348c41afcd48cdb4cb Author: Pierre-Emmanuel Patry Date: Mon Aug 28 10:54:12 2023 +0200 gccrs: resolver: Refactor assertion Change the condition with rust_unreachable to an assertion. This will keep the code clean and concise. Some styling issues appeared during review, this commit make the code more readable. gcc/rust/ChangeLog: * resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::visit): Change to assertion. * util/rust-hir-map.cc (Mappings::lookup_derive_proc_macros): Add empty line. (Mappings::lookup_bang_proc_macros): Likewise. (Mappings::lookup_attribute_proc_macros): Likewise. Signed-off-by: Pierre-Emmanuel Patry Diff: --- gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc | 5 ++--- gcc/rust/util/rust-hir-map.cc | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc index 61252988673..a09c738267e 100644 --- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc @@ -75,9 +75,8 @@ void TopLevel::visit (AST::ExternCrate &crate) { CrateNum num; - if (!Analysis::Mappings::get ()->lookup_crate_name ( - crate.get_referenced_crate (), num)) - rust_unreachable (); + rust_assert (Analysis::Mappings::get ()->lookup_crate_name ( + crate.get_referenced_crate (), num)); auto attribute_macros = Analysis::Mappings::get ()->lookup_attribute_proc_macros (num); diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc index 8ac957fd87d..7041aaa9945 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -978,6 +978,7 @@ Mappings::lookup_derive_proc_macros (CrateNum num) auto it = procmacrosDeriveMappings.find (num); if (it == procmacrosDeriveMappings.end ()) return tl::nullopt; + return it->second; } @@ -987,6 +988,7 @@ Mappings::lookup_bang_proc_macros (CrateNum num) auto it = procmacrosBangMappings.find (num); if (it == procmacrosBangMappings.end ()) return tl::nullopt; + return it->second; } @@ -996,6 +998,7 @@ Mappings::lookup_attribute_proc_macros (CrateNum num) auto it = procmacrosAttributeMappings.find (num); if (it == procmacrosAttributeMappings.end ()) return tl::nullopt; + return it->second; }