---

luqmana · luqmana · commit 44447ee5202b · 2013-05-13T04:05:34.000-04:00
yaml --- r: 140746 b: refs/heads/try2 c: 103a68b h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 8a5561bc18b45f3a8930a05c3523d4f341b2462f
+refs/heads/try2: 103a68b2e7d0c12e6d44c43c344ebd10b67a9d79
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustc/middle/trans/adt.rs b/branches/try2/src/librustc/middle/trans/adt.rs
@@ -574,7 +574,7 @@ fn padding(size: u64) -> ValueRef {
 }
 
 // XXX this utility routine should be somewhere more general
-#[always_inline]
+#[inline(always)]
 fn roundup(x: u64, a: u64) -> u64 { ((x + (a - 1)) / a) * a }
 
 /// Get the discriminant of a constant value.  (Not currently used.)
diff --git a/branches/try2/src/rt/rust_globals.h b/branches/try2/src/rt/rust_globals.h
@@ -20,7 +20,7 @@
 #endif
 
 #if defined(__GNUC__)
-#define ALWAYS_INLINE __attribute((always_inline)) INLINE
+#define ALWAYS_INLINE __attribute__((always_inline)) INLINE
 #elif defined(_MSC_VER)
 #define ALWAYS_INLINE __forceinline
 #else

Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,7 @@ fn padding(size: u64) -> ValueRef {`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`// XXX this utility routine should be somewhere more general`
`577`		`-#[always_inline]`
	`577`	`+#[inline(always)]`
`578`	`578`	`fn roundup(x: u64, a: u64) -> u64 { ((x + (a - 1)) / a) * a }`
`579`	`579`
`580`	`580`	`/// Get the discriminant of a constant value. (Not currently used.)`