Skip to content

Commit 68540d6

Browse files
committed
---
yaml --- r: 63116 b: refs/heads/snap-stage3 c: a99ba11 h: refs/heads/master v: v3
1 parent ca91601 commit 68540d6

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: c74f39782f868e235868126aec7485d23848d2e2
4+
refs/heads/snap-stage3: a99ba1180d16394427fcd0fa74ce6dfff96d5566
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/typeck/check/regionck.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,10 @@ fn constrain_call(rcx: @mut Rcx,
460460
debug!("constrain_call(call_expr=%s, implicitly_ref_args=%?)",
461461
call_expr.repr(tcx), implicitly_ref_args);
462462
let callee_ty = rcx.resolve_node_type(callee_id);
463+
if ty::type_is_error(callee_ty) {
464+
// Bail, as function type is unknown
465+
return;
466+
}
463467
let fn_sig = ty::ty_fn_sig(callee_ty);
464468

465469
// `callee_region` is the scope representing the time in which the

0 commit comments

Comments
 (0)