---

yaml
---
r: 30053
b: refs/heads/incoming
c: a7a74c7
h: refs/heads/master
i:
  30051: 5609633
v: v3

Author: Elliott Slaughter

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: c2e99ba8265085bde0a80283a68b4010a4a3aa34
+refs/heads/incoming: a7a74c79fa09d918703083f35d22c77351bfc992
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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);
     };
 }