Skip to content

Commit 8e16358

Browse files
committed
---
yaml --- r: 37868 b: refs/heads/try c: 791f976 h: refs/heads/master v: v3
1 parent b91ea43 commit 8e16358

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: cf3972e95af2ec4c142b3593d697292259741e53
5+
refs/heads/try: 791f976e8ca95b00febbaf32b653d12cccb6132d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/driver/session.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,7 @@ impl Session {
246246
fn borrowck_note_pure() -> bool { self.debugging_opt(borrowck_note_pure) }
247247
fn borrowck_note_loan() -> bool { self.debugging_opt(borrowck_note_loan) }
248248
fn no_monomorphic_collapse() -> bool {
249-
// FIXME #4127: Type use is causing mysterious bustage on 32-bit archs
250-
let type_use_unreliable = self.targ_cfg.arch == arch_x86;
251-
252-
self.debugging_opt(no_monomorphic_collapse) || type_use_unreliable
249+
self.debugging_opt(no_monomorphic_collapse)
253250
}
254251

255252
fn str_of(id: ast::ident) -> ~str {

0 commit comments

Comments
 (0)