---

yaml
---
r: 3863
b: refs/heads/master
c: 41a3888
h: refs/heads/master
i:
  3861: b115af4
  3859: 7d73b2b
  3855: af06fba
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a38ba01fa41c31279321bf765d3384a533edf709
+refs/heads/master: 41a3888da7fbcff128f03c16a8cefe4d74ab5a58

trunk/src/comp/middle/typeck.rs

@@ -2603,18 +2603,19 @@ fn check_fn(&@crate_ctxt ccx, &ast::fn_decl decl, ast::proto proto,
         case (_) { }
     }
 
-    auto success = writeback::resolve_type_vars_in_block(fcx, body);
-
-    if (success && option::is_some(body.node.expr)) {
+    if (option::is_some(body.node.expr)) {
         auto tail_expr = option::get(body.node.expr);
         auto tail_expr_ty = expr_ty(ccx.tcx, tail_expr);
         // Have to exclude ty_nil to allow functions to end in
         // while expressions, etc.
-        if (!ty::type_is_nil(ccx.tcx, tail_expr_ty)) {
+        auto nil = ty::mk_nil(fcx.ccx.tcx);
+        if (!are_compatible(fcx, nil, tail_expr_ty)) {
             demand::simple(fcx, tail_expr.span,
                            fcx.ret_ty, tail_expr_ty);
         }
     }
+
+    writeback::resolve_type_vars_in_block(fcx, body);
 }
 
 fn check_method(&@crate_ctxt ccx, &@ast::method method) {

trunk/src/test/run-pass/infer-fn-tail-expr.rs

@@ -0,0 +1,9 @@
+// xfail-stage0
+// issue #680
+
+fn f() -> int[] {
+  ~[]
+}
+
+fn main() {
+}