bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Avoid looping past bounds of args

Browse source 
There might be more type params than args to a method call, which leads to an
index out of bounds panic.
This commit is contained in:
Martin Gammelsæter 2023-02-14 16:11:15 +01:00
parent a3c9eede5d
commit 22f853c620
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_hir_typeck/src/demand.rs
View file

@ -323,13 +323,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let mut param_found = FxHashMap::default(); let mut param_found = FxHashMap::default();
if self.can_eq(self.param_env, ty, found).is_ok() { if self.can_eq(self.param_env, ty, found).is_ok() {
// We only point at the first place where the found type was inferred. // We only point at the first place where the found type was inferred.
for (i, param_ty) in sig.inputs().skip_binder().iter().skip(1).enumerate() { for (param_ty, arg) in sig.inputs().skip_binder().iter().skip(1).zip(args) {
if def_self_ty.contains(*param_ty) && let ty::Param(_) = param_ty.kind() { if def_self_ty.contains(*param_ty) && let ty::Param(_) = param_ty.kind() {
// We found an argument that references a type parameter in `Self`, // We found an argument that references a type parameter in `Self`,
// so we assume that this is the argument that caused the found // so we assume that this is the argument that caused the found
// type, which we know already because of `can_eq` above was first // type, which we know already because of `can_eq` above was first
// inferred in this method call. // inferred in this method call.
let arg = &args[i];
let arg_ty = self.node_ty(arg.hir_id); let arg_ty = self.node_ty(arg.hir_id);
if !arg.span.overlaps(mismatch_span) { if !arg.span.overlaps(mismatch_span) {
err.span_label( err.span_label(