Skip to content

Commit 9d3a85b

Browse files
committed
---
yaml --- r: 95641 b: refs/heads/dist-snap c: d497e6e h: refs/heads/master i: 95639: 6ed0413 v: v3
1 parent 4acaac8 commit 9d3a85b

File tree

4 files changed

+1
-13
lines changed

4 files changed

+1
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: b0c475229a286542b0a94bf33598cc53a525d8da
9+
refs/heads/dist-snap: d497e6e954c13dae04d7de4e6c3f6a8171a626df
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libextra/arc.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,10 @@ pub struct Arc<T> { priv x: UnsafeArc<T> }
117117
*/
118118
impl<T:Freeze+Send> Arc<T> {
119119
/// Create an atomically reference counted wrapper.
120-
#[inline]
121120
pub fn new(data: T) -> Arc<T> {
122121
Arc { x: UnsafeArc::new(data) }
123122
}
124123

125-
#[inline]
126124
pub fn get<'a>(&'a self) -> &'a T {
127125
unsafe { &*self.x.get_immut() }
128126
}
@@ -150,7 +148,6 @@ impl<T:Freeze + Send> Clone for Arc<T> {
150148
* object. However, one of the `arc` objects can be sent to another task,
151149
* allowing them to share the underlying data.
152150
*/
153-
#[inline]
154151
fn clone(&self) -> Arc<T> {
155152
Arc { x: self.x.clone() }
156153
}
@@ -170,7 +167,6 @@ pub struct MutexArc<T> { priv x: UnsafeArc<MutexArcInner<T>> }
170167

171168
impl<T:Send> Clone for MutexArc<T> {
172169
/// Duplicate a mutex-protected Arc. See arc::clone for more details.
173-
#[inline]
174170
fn clone(&self) -> MutexArc<T> {
175171
// NB: Cloning the underlying mutex is not necessary. Its reference
176172
// count would be exactly the same as the shared state's.
@@ -353,7 +349,6 @@ pub struct RWArc<T> {
353349

354350
impl<T:Freeze + Send> Clone for RWArc<T> {
355351
/// Duplicate a rwlock-protected Arc. See arc::clone for more details.
356-
#[inline]
357352
fn clone(&self) -> RWArc<T> {
358353
RWArc { x: self.x.clone() }
359354
}

branches/dist-snap/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) {

branches/dist-snap/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)