---

yaml
---
r: 23159
b: refs/heads/master
c: b1ec0a5
h: refs/heads/master
i:
  23157: 851bac4
  23155: 7faeeca
  23151: 14e2277
v: v3

Author: lkuper

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0e0833e0b038ea3015a2036e0c9431f6c60db82f
+refs/heads/master: b1ec0a582e16cb6e21d9199c9b6df0f8c4c8f00c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/trans/base.rs

@@ -5217,12 +5217,13 @@ fn get_dtor_symbol(ccx: @crate_ctxt, path: path, id: ast::node_id,
 }
 
 fn get_item_val(ccx: @crate_ctxt, id: ast::node_id) -> ValueRef {
+    debug!{"get_item_val(id=`%?`)", id};
     let tcx = ccx.tcx;
     match ccx.item_vals.find(id) {
       some(v) => v,
       none => {
         let mut exprt = false;
-        let val = match check ccx.tcx.items.get(id) {
+        let val = match ccx.tcx.items.get(id) {
           ast_map::node_item(i, pth) => {
             let my_path = vec::append(*pth, ~[path_name(i.ident)]);
             match check i.node {
@@ -5246,11 +5247,33 @@ fn get_item_val(ccx: @crate_ctxt, id: ast::node_id) -> ValueRef {
               }
             }
           }
+          ast_map::node_trait_method(trait_method, _, pth) => {
+            debug!{"get_item_val(): processing a node_trait_method"};
+            match *trait_method {
+              ast::required(_) => {
+                ccx.sess.bug(~"unexpected variant: required trait method in \
+                               get_item_val()");
+              }
+              ast::provided(m) => {
+                // FIXME (#2794): Default methods currently compiling but not
+                // linking successfully; not sure if this is correct.  It's
+                // just copypasta from the node_method case.
+                exprt = true;
+                let mty = ty::node_id_to_type(ccx.tcx, id);
+                let pth =
+                    vec::append(*pth, ~[path_name(@ccx.names(~"meth")),
+                                        path_name(m.ident)]);
+                let llfn = register_fn_full(ccx, m.span, pth, id, mty);
+                set_inline_hint_if_appr(m.attrs, llfn);
+                llfn
+              }
+            }
+          }
           ast_map::node_method(m, impl_id, pth) => {
             exprt = true;
             let mty = ty::node_id_to_type(ccx.tcx, id);
             let pth = vec::append(*pth, ~[path_name(@ccx.names(~"meth")),
-                                         path_name(m.ident)]);
+                                          path_name(m.ident)]);
             let llfn = register_fn_full(ccx, m.span, pth, id, mty);
             set_inline_hint_if_appr(m.attrs, llfn);
             llfn
@@ -5310,6 +5333,9 @@ fn get_item_val(ccx: @crate_ctxt, id: ast::node_id) -> ValueRef {
             set_inline_hint(llfn);
             llfn
           }
+          _ => {
+            ccx.sess.bug(~"get_item_val(): unexpected variant");
+          }
         };
         if !(exprt || ccx.reachable.contains_key(id)) {
             lib::llvm::SetLinkage(val, lib::llvm::InternalLinkage);