From d497e6e954c13dae04d7de4e6c3f6a8171a626df Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Thu, 24 Oct 2013 20:41:23 -0400
Subject: [PATCH] stop trying to outsmart LLVM inline heuristics

Closes #10045
---
 src/librustc/middle/trans/base.rs | 6 ------
 src/librustc/middle/trans/glue.rs | 1 -
 2 files changed, 7 deletions(-)

diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs
index 8b5167b7e8fa5..f00fa3e70e1bf 100644
--- a/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@@ -534,12 +534,6 @@ pub fn set_no_split_stack(f: ValueRef) {
     }
 }
 
-pub fn set_glue_inlining(f: ValueRef, t: ty::t) {
-    if ty::type_is_structural(t) {
-        set_optimize_for_size(f);
-    } else { set_always_inline(f); }
-}
-
 // Double-check that we never ask LLVM to declare the same symbol twice. It
 // silently mangles such symbols, breaking our linkage model.
 pub fn note_unique_llvm_symbol(ccx: &mut CrateContext, sym: @str) {
diff --git a/src/librustc/middle/trans/glue.rs b/src/librustc/middle/trans/glue.rs
index aaa187931c967..2b0f13d2a7cd8 100644
--- a/src/librustc/middle/trans/glue.rs
+++ b/src/librustc/middle/trans/glue.rs
@@ -674,7 +674,6 @@ pub fn declare_generic_glue(ccx: &mut CrateContext, t: ty::t, llfnty: Type,
     debug!("{} is for type {}", fn_nm, ppaux::ty_to_str(ccx.tcx, t));
     note_unique_llvm_symbol(ccx, fn_nm);
     let llfn = decl_cdecl_fn(ccx.llmod, fn_nm, llfnty);
-    set_glue_inlining(llfn, t);
     return llfn;
 }