about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-20 18:26:53 +0000
committerbors <bors@rust-lang.org>2017-05-20 18:26:53 +0000
commit1cda810970186cf01a8134db53b13f8177cc56ab (patch)
tree88bf17969242f1db61d56b140c018cdc9bfc6697
parent272e77f035d8cca43f228764c2028c09eeaca20e (diff)
parent409d40f8af3fc458352237d1527fcf2791806ab2 (diff)
downloadrust-1cda810970186cf01a8134db53b13f8177cc56ab.tar.gz
rust-1cda810970186cf01a8134db53b13f8177cc56ab.zip
Auto merge of #42123 - Mark-Simulacrum:revert-41967, r=alexcrichton
Revert "Reenable opt-level 3"

This reverts commit 30383b2384864173b9238a121f8e83f8968f1e51, from #41967.

We believe that this is causing the failures when compiling rustc on 64 bit (which are probably segfaults).

cc @ishitatsuyuki
-rw-r--r--src/Cargo.toml8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Cargo.toml b/src/Cargo.toml
index 023627fda99..85a6df3573a 100644
--- a/src/Cargo.toml
+++ b/src/Cargo.toml
@@ -18,6 +18,14 @@ members = [
   "tools/rls",
 ]
 
+# Curiously, compiletest will segfault if compiled with opt-level=3 on 64-bit
+# MSVC when running the compile-fail test suite when a should-fail test panics.
+# But hey if this is removed and it gets past the bots, sounds good to me.
+[profile.release]
+opt-level = 2
+[profile.bench]
+opt-level = 2
+
 # These options are controlled from our rustc wrapper script, so turn them off
 # here and have them controlled elsewhere.
 [profile.dev]