---

yaml
---
r: 273579
b: refs/heads/beta
c: e8dfaa7
h: refs/heads/master
i:
  273577: e7e8abd
  273575: 4d5d911

Author: nikomatsakis

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 5a681162400b913eaa75eb8de5868db587f4fa35
+refs/heads/beta: e8dfaa71e6a6d9b415011ca4d59e9ab498584e73
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_metadata/decoder.rs

@@ -810,7 +810,7 @@ pub fn maybe_get_item_ast<'tcx>(cdata: Cmd, tcx: &TyCtxt<'tcx>, id: DefIndex)
     let mut parent_path = item_path(item_doc);
     parent_path.pop();
     let mut parent_def_path = def_path(cdata, id);
-    parent_def_path.pop();
+    parent_def_path.data.pop();
     if let Some(ast_doc) = reader::maybe_get_doc(item_doc, tag_ast as usize) {
         let ii = decode_inlined_item(cdata,
                                      tcx,
@@ -830,7 +830,7 @@ pub fn maybe_get_item_ast<'tcx>(cdata: Cmd, tcx: &TyCtxt<'tcx>, id: DefIndex)
         let mut grandparent_path = parent_path;
         grandparent_path.pop();
         let mut grandparent_def_path = parent_def_path;
-        grandparent_def_path.pop();
+        grandparent_def_path.data.pop();
         let parent_doc = cdata.lookup_item(parent_did.index);
         if let Some(ast_doc) = reader::maybe_get_doc(parent_doc, tag_ast as usize) {
             let ii = decode_inlined_item(cdata,

branches/beta/src/librustc_trans/trans/link_guard.rs

@@ -49,12 +49,11 @@ pub fn get_or_insert_link_guard<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>)
     }
 
     let llfty = Type::func(&[], &Type::void(ccx));
-    let guard_function = declare::define_cfn(ccx,
-                                             &guard_name[..],
-                                             llfty,
-                                             ccx.tcx().mk_nil()).unwrap_or_else(|| {
-        ccx.sess().bug("Link guard already defined.");
-    });
+    if declare::get_defined_value(ccx, &guard_name[..]).is_some() {
+        ccx.sess().bug(
+            &format!("Link guard already defined"));
+    }
+    let guard_function = declare::declare_cfn(ccx, &guard_name[..], llfty);
 
     attributes::emit_uwtable(guard_function, true);
     attributes::unwind(guard_function, false);
@@ -76,10 +75,12 @@ pub fn get_or_insert_link_guard<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>)
 
             let dependency_guard_name = link_guard_name(&crate_name[..], &svh);
 
-            let decl = declare::declare_cfn(ccx,
-                                            &dependency_guard_name[..],
-                                            llfty,
-                                            ccx.tcx().mk_nil());
+            if declare::get_defined_value(ccx, &dependency_guard_name[..]).is_some() {
+                ccx.sess().bug(
+                    &format!("Link guard already defined for dependency `{}`",
+                             crate_name));
+            }
+            let decl = declare::declare_cfn(ccx, &dependency_guard_name[..], llfty);
             attributes::unwind(decl, false);
 
             llvm::LLVMPositionBuilderAtEnd(bld, llbb);

branches/beta/src/librustc_trans/trans/symbol_names_test.rs

@@ -21,6 +21,7 @@ use rustc_front::intravisit::{self, Visitor};
 use syntax::ast;
 use syntax::attr::AttrMetaMethods;
 use trans::common::CrateContext;
+use trans::monomorphize::Instance;
 
 const SYMBOL_NAME: &'static str = "rustc_symbol_name";
 const ITEM_PATH: &'static str = "rustc_item_path";
@@ -50,8 +51,9 @@ impl<'a, 'tcx> SymbolNamesTest<'a, 'tcx> {
         let def_id = self.tcx.map.local_def_id(node_id);
         for attr in self.tcx.get_attrs(def_id).iter() {
             if attr.check_name(SYMBOL_NAME) {
-                // for now, just monomorphic names
-                let name = symbol_names::exported_name(self.ccx, def_id, &[]);
+                // for now, can only use on monomorphic names
+                let instance = Instance::mono(self.tcx, def_id);
+                let name = symbol_names::exported_name(self.ccx, &instance);
                 self.tcx.sess.span_err(attr.span, &format!("symbol-name({})", name));
             } else if attr.check_name(ITEM_PATH) {
                 let path = self.tcx.item_path_str(def_id);