From e837df84792d2cbf5c606788c7cab7ea4d1829d0 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Wed, 10 Feb 2021 14:41:54 +0100
Subject: infer: update resolver when descending into block

---
 crates/hir_ty/src/infer/expr.rs | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

(limited to 'crates/hir_ty/src/infer')

diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs
index 12f1591c8..d05c715e7 100644
--- a/crates/hir_ty/src/infer/expr.rs
+++ b/crates/hir_ty/src/infer/expr.rs
@@ -137,24 +137,28 @@ impl<'a> InferenceContext<'a> {
 
                 self.coerce_merge_branch(&then_ty, &else_ty)
             }
-            Expr::Block { statements, tail, label, id: _ } => match label {
-                Some(_) => {
-                    let break_ty = self.table.new_type_var();
-                    self.breakables.push(BreakableContext {
-                        may_break: false,
-                        break_ty: break_ty.clone(),
-                        label: label.map(|label| self.body[label].name.clone()),
-                    });
-                    let ty = self.infer_block(statements, *tail, &Expectation::has_type(break_ty));
-                    let ctxt = self.breakables.pop().expect("breakable stack broken");
-                    if ctxt.may_break {
-                        ctxt.break_ty
-                    } else {
-                        ty
+            Expr::Block { statements, tail, label, id: _ } => {
+                self.resolver = resolver_for_expr(self.db.upcast(), self.owner, tgt_expr);
+                match label {
+                    Some(_) => {
+                        let break_ty = self.table.new_type_var();
+                        self.breakables.push(BreakableContext {
+                            may_break: false,
+                            break_ty: break_ty.clone(),
+                            label: label.map(|label| self.body[label].name.clone()),
+                        });
+                        let ty =
+                            self.infer_block(statements, *tail, &Expectation::has_type(break_ty));
+                        let ctxt = self.breakables.pop().expect("breakable stack broken");
+                        if ctxt.may_break {
+                            ctxt.break_ty
+                        } else {
+                            ty
+                        }
                     }
+                    None => self.infer_block(statements, *tail, expected),
                 }
-                None => self.infer_block(statements, *tail, expected),
-            },
+            }
             Expr::Unsafe { body } | Expr::Const { body } => self.infer_expr(*body, expected),
             Expr::TryBlock { body } => {
                 let _inner = self.infer_expr(*body, expected);
-- 
cgit v1.2.3


From a00fa0c06f70a377279ae77a01f19b05b3cb7437 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Wed, 10 Feb 2021 15:12:45 +0100
Subject: Put the old resolver back

---
 crates/hir_ty/src/infer/expr.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'crates/hir_ty/src/infer')

diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs
index d05c715e7..cb59a6937 100644
--- a/crates/hir_ty/src/infer/expr.rs
+++ b/crates/hir_ty/src/infer/expr.rs
@@ -138,8 +138,11 @@ impl<'a> InferenceContext<'a> {
                 self.coerce_merge_branch(&then_ty, &else_ty)
             }
             Expr::Block { statements, tail, label, id: _ } => {
-                self.resolver = resolver_for_expr(self.db.upcast(), self.owner, tgt_expr);
-                match label {
+                let old_resolver = mem::replace(
+                    &mut self.resolver,
+                    resolver_for_expr(self.db.upcast(), self.owner, tgt_expr),
+                );
+                let ty = match label {
                     Some(_) => {
                         let break_ty = self.table.new_type_var();
                         self.breakables.push(BreakableContext {
@@ -157,7 +160,9 @@ impl<'a> InferenceContext<'a> {
                         }
                     }
                     None => self.infer_block(statements, *tail, expected),
-                }
+                };
+                self.resolver = old_resolver;
+                ty
             }
             Expr::Unsafe { body } | Expr::Const { body } => self.infer_expr(*body, expected),
             Expr::TryBlock { body } => {
-- 
cgit v1.2.3