Skip to content

Commit fc3cb10

Browse files
committed
---
yaml --- r: 236475 b: refs/heads/auto c: 38f1c47 h: refs/heads/master i: 236473: 1414de5 236471: e939fc5 v: v3
1 parent 8ec02cc commit fc3cb10

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: c21fcac29320c065b184cc30973308982a417445
11+
refs/heads/auto: 38f1c47d18761414cbe69e76b4d76c71afc24789
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/librustc_trans/trans/base.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2616,9 +2616,8 @@ fn internalize_symbols(cx: &SharedCrateContext, reachable: &HashSet<&str>) {
26162616
// when using MSVC linker. We do this only for data, as linker can fix up
26172617
// code references on its own.
26182618
// See #26591, #27438
2619-
fn create_imps(cx: &SharedCrateContext, _reachable: &HashSet<&str>) {
2619+
fn create_imps(cx: &SharedCrateContext) {
26202620
unsafe {
2621-
26222621
for ccx in cx.iter() {
26232622
let exported: Vec<_> = iter_globals(ccx.llmod())
26242623
.filter(|&val| llvm::LLVMGetLinkage(val) == llvm::ExternalLinkage as c_uint &&
@@ -2857,9 +2856,8 @@ pub fn trans_crate(tcx: &ty::ctxt, analysis: ty::CrateAnalysis) -> CrateTranslat
28572856
}
28582857

28592858
if sess.target.target.options.is_like_msvc &&
2860-
sess.crate_types.borrow().iter().any(|ct| *ct == config::CrateTypeRlib ||
2861-
*ct == config::CrateTypeStaticlib) {
2862-
create_imps(&shared_ccx, &reachable_symbols.iter().map(|x| &x[..]).collect());
2859+
sess.crate_types.borrow().iter().any(|ct| *ct == config::CrateTypeRlib) {
2860+
create_imps(&shared_ccx);
28632861
}
28642862

28652863
let metadata_module = ModuleTranslation {

0 commit comments

Comments
 (0)