aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-05-25 09:52:15 +0000
committerGitHub <noreply@github.com>2022-05-25 09:52:15 +0000
commitd09b135116f2bd56fbab054a9a0122cc6b59e06e (patch)
tree05092a11d5787ff976acc2578dcdfbeabb6ce550 /gcc
parent986e8e75f0f13d30bafa70fec0517f279501619f (diff)
parenta369360b922a586d9eb532490fb54edfe0019400 (diff)
downloadgcc-d09b135116f2bd56fbab054a9a0122cc6b59e06e.zip
gcc-d09b135116f2bd56fbab054a9a0122cc6b59e06e.tar.gz
gcc-d09b135116f2bd56fbab054a9a0122cc6b59e06e.tar.bz2
Merge #1277
1277: Reuse index_expr_ty type r=philberty a=philberty This is a small refactor to remove duplicating the work in type checking the index expression. Co-authored-by: Philip Herron <philip.herron@embecosm.com>
Diffstat (limited to 'gcc')
-rw-r--r--gcc/rust/typecheck/rust-hir-type-check-expr.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.cc b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
index c499204..394eee0 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-expr.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
@@ -291,8 +291,7 @@ TypeCheckExpr::visit (HIR::ArrayIndexExpr &expr)
bool ok = context->lookup_builtin ("usize", &size_ty);
rust_assert (ok);
- auto resolved_index_expr
- = size_ty->unify (TypeCheckExpr::Resolve (expr.get_index_expr (), false));
+ auto resolved_index_expr = size_ty->unify (index_expr_ty);
if (resolved_index_expr->get_kind () == TyTy::TypeKind::ERROR)
return;