---

yaml
---
r: 83768
b: refs/heads/try
c: 85deeea
h: refs/heads/master
v: v3

Author: michaelwoerister

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: c9196290af3934481bd413e11057725f248fd104
+refs/heads/try: 85deeeab59e7b5845590b40d8a430b51580f1428
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/lib/llvm.rs

@@ -1968,7 +1968,8 @@ pub mod llvm {
                                              DerivedFrom: DIType,
                                              Elements: DIArray,
                                              RunTimeLang: c_uint,
-                                             VTableHolder: ValueRef)
+                                             VTableHolder: ValueRef,
+                                             UniqueId: *c_char)
                                              -> DICompositeType;
 
         #[fast_ffi]

branches/try/src/librustc/middle/trans/base.rs

@@ -3119,11 +3119,6 @@ pub fn trans_crate(sess: session::Session,
                                      symbol_hasher,
                                      link_meta,
                                      analysis.reachable);
-
-    if ccx.sess.opts.debuginfo {
-        debuginfo::initialize(ccx, &crate);
-    }
-
     {
         let _icx = push_ctxt("text");
         trans_mod(ccx, &crate.module);