From 7292e71b61d95c0cec8378555e71a11a6e4120c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= Date: Sat, 14 Oct 2023 00:02:47 +0200 Subject: [PATCH] gccrs: minor changes (typo and minor refactor) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a typo and merge 2 if clauses using the same condition. gcc/rust/ChangeLog: * backend/rust-compile-expr.cc (CompileExpr::visit): Merge 2 if clauses. * backend/rust-compile-extern.h: Fix typo in comment. Signed-off-by: Marc Poulhiès --- gcc/rust/backend/rust-compile-expr.cc | 8 ++------ gcc/rust/backend/rust-compile-extern.h | 6 ++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc index bd91c91c9390..1f0b58e60030 100644 --- a/gcc/rust/backend/rust-compile-expr.cc +++ b/gcc/rust/backend/rust-compile-expr.cc @@ -1635,17 +1635,13 @@ CompileExpr::visit (HIR::CallExpr &expr) return; bool is_variadic = false; - if (tyty->get_kind () == TyTy::TypeKind::FNDEF) - { - const TyTy::FnType *fn = static_cast (tyty); - is_variadic = fn->is_variadic (); - } - size_t required_num_args = expr.get_arguments ().size (); + if (tyty->get_kind () == TyTy::TypeKind::FNDEF) { const TyTy::FnType *fn = static_cast (tyty); required_num_args = fn->num_params (); + is_variadic = fn->is_variadic (); } else if (tyty->get_kind () == TyTy::TypeKind::FNPTR) { diff --git a/gcc/rust/backend/rust-compile-extern.h b/gcc/rust/backend/rust-compile-extern.h index be92529a1acc..1df3875541a3 100644 --- a/gcc/rust/backend/rust-compile-extern.h +++ b/gcc/rust/backend/rust-compile-extern.h @@ -115,10 +115,8 @@ class CompileExternItem : public HIRCompileBase, } if (fntype->has_substitutions_defined ()) - { - // override the Hir Lookups for the substituions in this context - fntype->override_context (); - } + // override the HIR lookups for the substitutions in this context + fntype->override_context (); if (fntype->get_abi () == ABI::INTRINSIC) {