public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-7989] gccrs: resolver: Refactor assertion
@ 2024-01-16 18:11 Arthur Cohen
0 siblings, 0 replies; only message in thread
From: Arthur Cohen @ 2024-01-16 18:11 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:342b071a0fac00d8acf745348c41afcd48cdb4cb
commit r14-7989-g342b071a0fac00d8acf745348c41afcd48cdb4cb
Author: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
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 <pierre-emmanuel.patry@embecosm.com>
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;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-01-16 18:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-16 18:11 [gcc r14-7989] gccrs: resolver: Refactor assertion Arthur Cohen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).