commit 2ecc48ffa17d55ec02f3beb5bb17c718cb439202
author Yuki Okushi <huyuumi.dev@gmail.com> Fri Jan 10 05:08:02 2020 +0900
committer Yuki Okushi <huyuumi.dev@gmail.com> Mon Jan 20 07:06:27 2020 +0900
tree 1e3d45f8eecb520e288f523cd5389b5187c13a46
parent c0e02ad724f05f73b957b3d6f6314a9a2e5c284e

Fix ICE #68025

src/librustc_typeck/expr_use_visitor.rs

diff --git a/src/librustc_typeck/expr_use_visitor.rs b/src/librustc_typeck/expr_use_visitor.rs
index be00c57..4763520 100644
--- a/src/librustc_typeck/expr_use_visitor.rs
+++ b/src/librustc_typeck/expr_use_visitor.rs
@@ -327,10 +327,10 @@
     }
 
     fn walk_callee(&mut self, call: &hir::Expr<'_>, callee: &hir::Expr<'_>) {
-        let callee_ty = return_if_err!(self.mc.expr_ty_adjusted(callee));
+        let callee_ty = self.mc.tables.expr_ty_adjusted(callee);
         debug!("walk_callee: callee={:?} callee_ty={:?}", callee, callee_ty);
         match callee_ty.kind {
-            ty::FnDef(..) | ty::FnPtr(_) => {
+            ty::FnDef(..) | ty::FnPtr(_) | ty::Closure(..) => {
                 self.consume_expr(callee);
             }
             ty::Error => {}

src/test/ui/closures/issue-68025.rs

diff --git a/src/test/ui/closures/issue-68025.rs b/src/test/ui/closures/issue-68025.rs
new file mode 100644
index 0000000..261bfd6
--- /dev/null
+++ b/src/test/ui/closures/issue-68025.rs
@@ -0,0 +1,12 @@
+// check-pass
+
+fn foo<F, G>(_: G, _: Box<F>)
+where
+    F: Fn(),
+    G: Fn(Box<F>),
+{
+}
+
+fn main() {
+    foo(|f| (*f)(), Box::new(|| {}));
+}