diff options
| -rw-r--r-- | gcc/rust/backend/rust-compile-expr.cc | 8 | ||||
| -rw-r--r-- | 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 6d88b39..929f3c0 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 127e9b0..778553e 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) { |