---

yaml
---
r: 130615
b: refs/heads/snap-stage3
c: 808e039
h: refs/heads/master
i:
  130613: 037149d
  130611: c3c2541
  130607: eb10f82
v: v3

Author: pczarn

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: ee72e46638f2b2ae92e99df2a7ea92690baa0d07
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 10935de0cdb34b9405c71a813cc89eb1cb44fd01
+refs/heads/snap-stage3: 808e039d401bfa4a5f22484086409e3861511940
 refs/heads/try: a2473a89da106f7dd3be86e9d52fe23f43d5bfa5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/callee.rs

@@ -141,8 +141,10 @@ fn trans<'a>(bcx: &'a Block<'a>, expr: &ast::Expr) -> Callee<'a> {
         let expr_ty = node_id_type(bcx, ref_expr.id);
         match def {
             def::DefFn(did, _) if {
-                let def_id = inline::maybe_instantiate_inline(bcx.ccx(), did);
-                match bcx.tcx().map.find(def_id.node) {
+                let maybe_def_id = inline::get_local_instance(bcx.ccx(), did);
+                let maybe_ast_node = maybe_def_id.and_then(|def_id| bcx.tcx().map
+                                                                             .find(def_id.node));
+                match maybe_ast_node {
                     Some(ast_map::NodeStructCtor(_)) => true,
                     _ => false
                 }