Skip to content

Commit 8afa184

Browse files
committed
---
yaml --- r: 35384 b: refs/heads/master c: 55aa498 h: refs/heads/master v: v3
1 parent 14e7877 commit 8afa184

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: b60a0be424c9e3ef6266ef4da17397ea90db9694
2+
refs/heads/master: 55aa49882d43f338da48ec870ddfbe99b74ca11e
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/librustc/driver/session.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,10 @@ 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-
self.debugging_opt(no_monomorphic_collapse)
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
250253
}
251254

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

0 commit comments

Comments
 (0)