[gcc r14-8030] gccrs: minor changes (typo and minor refactor)

[Arthur Cohen]

https://gcc.gnu.org/g:08b785601b847280652a0d05c3a06fa9c8d614dc

commit r14-8030-g08b785601b847280652a0d05c3a06fa9c8d614dc
Author: Marc Poulhiès <dkm@kataplop.net>
Date:   Sat Oct 14 00:02:47 2023 +0200

    gccrs: minor changes (typo and minor refactor)
    
    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 <dkm@kataplop.net>

Diff:
---
 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 6d88b398bd3..929f3c0f5e4 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<const TyTy::FnType *> (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<const TyTy::FnType *> (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 127e9b099cc..778553e5b37 100644
--- a/gcc/rust/backend/rust-compile-extern.h
+++ b/gcc/rust/backend/rust-compile-extern.h
@@ -115,10 +115,8 @@ public:
       }
 
     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)
       {