Skip to content

Commit c16a95c

Browse files
committed
auto merge of #10059 : thestinger/rust/glue, r=pcwalton
Closes #10045
2 parents b0c4752 + d497e6e commit c16a95c

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

src/librustc/middle/trans/base.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -534,12 +534,6 @@ pub fn set_no_split_stack(f: ValueRef) {
534534
}
535535
}
536536

537-
pub fn set_glue_inlining(f: ValueRef, t: ty::t) {
538-
if ty::type_is_structural(t) {
539-
set_optimize_for_size(f);
540-
} else { set_always_inline(f); }
541-
}
542-
543537
// Double-check that we never ask LLVM to declare the same symbol twice. It
544538
// silently mangles such symbols, breaking our linkage model.
545539
pub fn note_unique_llvm_symbol(ccx: &mut CrateContext, sym: @str) {

src/librustc/middle/trans/glue.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,6 @@ pub fn declare_generic_glue(ccx: &mut CrateContext, t: ty::t, llfnty: Type,
674674
debug!("{} is for type {}", fn_nm, ppaux::ty_to_str(ccx.tcx, t));
675675
note_unique_llvm_symbol(ccx, fn_nm);
676676
let llfn = decl_cdecl_fn(ccx.llmod, fn_nm, llfnty);
677-
set_glue_inlining(llfn, t);
678677
return llfn;
679678
}
680679

0 commit comments

Comments
 (0)