---

yaml
---
r: 2551
b: refs/heads/master
c: f77c5ba
h: refs/heads/master
i:
  2549: 7744591
  2547: 86535bb
  2543: ce9ee99
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8eaafdaa2d39e7f28885e527aa125759fd146d51
+refs/heads/master: f77c5ba512687835fac4f0f1273c855d6d416c37

trunk/src/comp/middle/trans.rs

@@ -1039,6 +1039,8 @@ fn decl_fastcall_fn(ModuleRef llmod, &str name, TypeRef llty) -> ValueRef {
     ret decl_fn(llmod, name, lib::llvm::LLVMFastCallConv, llty);
 }
 
+// Only use this if you are going to actually define the function. It's
+// not valid to simply declare a function as internal.
 fn decl_internal_fastcall_fn(ModuleRef llmod,
                             &str name, TypeRef llty) -> ValueRef {
     auto llfn = decl_fn(llmod, name, lib::llvm::LLVMFastCallConv, llty);
@@ -1861,7 +1863,7 @@ fn declare_generic_glue(&@local_ctxt cx,
     } else {
         fn_nm = mangle_name_by_seq(cx.ccx, cx.path,  "glue_" + name);
     }
-    auto llfn = decl_internal_fastcall_fn(cx.ccx.llmod, fn_nm, llfnty);
+    auto llfn = decl_fastcall_fn(cx.ccx.llmod, fn_nm, llfnty);
     ret llfn;
 }
 
@@ -1872,6 +1874,9 @@ fn make_generic_glue(&@local_ctxt cx,
                      &vec[uint] ty_params) -> ValueRef {
     auto fcx = new_fn_ctxt(cx, llfn);
 
+    llvm::LLVMSetLinkage(llfn, lib::llvm::LLVMInternalLinkage
+                         as llvm::Linkage);
+
     cx.ccx.stats.n_glues_created += 1u;
 
     // Any nontrivial glue is with values passed *by alias*; this is a