Skip to content

Commit

Permalink
debuginfo: Unified namespace generation approach for crate-local and …
Browse files Browse the repository at this point in the history
…external items. Fixed bug related to LLVM metadata uniquing.
  • Loading branch information
michaelwoerister committed Oct 8, 2013
1 parent c919629 commit 85deeea
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 222 deletions.
3 changes: 2 additions & 1 deletion src/librustc/lib/llvm.rs
Expand Up @@ -1968,7 +1968,8 @@ pub mod llvm {
DerivedFrom: DIType,
Elements: DIArray,
RunTimeLang: c_uint,
VTableHolder: ValueRef)
VTableHolder: ValueRef,
UniqueId: *c_char)
-> DICompositeType;

#[fast_ffi]
Expand Down
5 changes: 0 additions & 5 deletions src/librustc/middle/trans/base.rs
Expand Up @@ -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);
Expand Down

5 comments on commit 85deeea

@bors
Copy link
Contributor

@bors bors commented on 85deeea Oct 8, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from jdm
at michaelwoerister@85deeea

@bors
Copy link
Contributor

@bors bors commented on 85deeea Oct 8, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging michaelwoerister/rust/namespace_fixes = 85deeea into auto

@bors
Copy link
Contributor

@bors bors commented on 85deeea Oct 8, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

michaelwoerister/rust/namespace_fixes = 85deeea merged ok, testing candidate = e87205c

@bors
Copy link
Contributor

@bors bors commented on 85deeea Oct 8, 2013

@bors
Copy link
Contributor

@bors bors commented on 85deeea Oct 8, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = e87205c

Please sign in to comment.