Auto merge of #35174 - arielb1:llvm-type-audit, r=eddyb

author bors <bors@rust-lang.org>

Wed, 3 Aug 2016 14:52:08 +0000 (07:52 -0700)

committer GitHub <noreply@github.com>

Wed, 3 Aug 2016 14:52:08 +0000 (07:52 -0700)
author bors <bors@rust-lang.org>
Wed, 3 Aug 2016 14:52:08 +0000 (07:52 -0700)
committer GitHub <noreply@github.com>
Wed, 3 Aug 2016 14:52:08 +0000 (07:52 -0700)
diff --cc src/librustc_trans/base.rs
Simple merge
diff --cc src/librustc_trans/debuginfo/mod.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 3 Aug 2016 14:52:08 +0000 (07:52 -0700)
committer	GitHub <noreply@github.com>
	Wed, 3 Aug 2016 14:52:08 +0000 (07:52 -0700)
		1	2
src/librustc_trans/base.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_trans/debuginfo/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history