about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-12-06 15:09:51 -0800
committerBrian Anderson <banderson@mozilla.com>2012-12-06 15:26:22 -0800
commit55aa49882d43f338da48ec870ddfbe99b74ca11e (patch)
tree8ed6f697c09684b722b9c8c0b2d34edd81a71af0
parentb60a0be424c9e3ef6266ef4da17397ea90db9694 (diff)
downloadrust-55aa49882d43f338da48ec870ddfbe99b74ca11e.tar.gz
rust-55aa49882d43f338da48ec870ddfbe99b74ca11e.zip
Turn off type_use on x86. #4127
-rw-r--r--src/librustc/driver/session.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/librustc/driver/session.rs b/src/librustc/driver/session.rs
index 38594ea2c17..f2d888008c6 100644
--- a/src/librustc/driver/session.rs
+++ b/src/librustc/driver/session.rs
@@ -246,7 +246,10 @@ impl Session {
     fn borrowck_note_pure() -> bool { self.debugging_opt(borrowck_note_pure) }
     fn borrowck_note_loan() -> bool { self.debugging_opt(borrowck_note_loan) }
     fn no_monomorphic_collapse() -> bool {
-        self.debugging_opt(no_monomorphic_collapse)
+        // FIXME #4127: Type use is causing mysterious bustage on 32-bit archs
+        let type_use_unreliable = self.targ_cfg.arch == arch_x86;
+
+        self.debugging_opt(no_monomorphic_collapse) || type_use_unreliable
     }
 
     fn str_of(id: ast::ident) -> ~str {