---

yaml
---
r: 23453
b: refs/heads/master
c: a7a74c7
h: refs/heads/master
i:
  23451: 580beb8
v: v3

Author: Elliott Slaughter

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c2e99ba8265085bde0a80283a68b4010a4a3aa34
+refs/heads/master: a7a74c79fa09d918703083f35d22c77351bfc992
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

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

@@ -657,6 +657,16 @@ fn emit_tydescs(ccx: @crate_ctxt) {
         llvm::LLVMSetInitializer(gvar, tydesc);
         llvm::LLVMSetGlobalConstant(gvar, True);
         lib::llvm::SetLinkage(gvar, lib::llvm::InternalLinkage);
+
+        // Index tydesc by addrspace.
+        let llty = T_ptr(ccx.tydesc_type);
+        let addrspace_name = #fmt("_gc_addrspace_metadata_%u",
+                                  ti.addrspace as uint);
+        let addrspace_gvar = str::as_c_str(addrspace_name, |buf| {
+            llvm::LLVMAddGlobal(ccx.llmod, llty, buf)
+        });
+        lib::llvm::SetLinkage(addrspace_gvar, lib::llvm::InternalLinkage);
+        llvm::LLVMSetInitializer(addrspace_gvar, gvar);
     };
 }