Skip to content

Commit 74bb6ec

Browse files
committed
---
yaml --- r: 33965 b: refs/heads/snap-stage3 c: 55aa498 h: refs/heads/master i: 33963: c47ffe2 v: v3
1 parent a48892e commit 74bb6ec

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,7 +1,7 @@
11
---
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: b60a0be424c9e3ef6266ef4da17397ea90db9694
4+
refs/heads/snap-stage3: 55aa49882d43f338da48ec870ddfbe99b74ca11e
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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