Skip to content

Commit

Permalink
Auto merge of rust-lang#52212 - kennytm:o3-again, r=alexcrichton
Browse files Browse the repository at this point in the history
Set opt-level = 3 the third time.

This PR reverts rust-lang#51165 (set -O2 for fixing rust-lang#50867),
which reverted rust-lang#50329 (set -O3),
which was second attempt of rust-lang#48204 (set -O3, closed due to Windows segfault that is fixed now),
which reverted rust-lang#42123 (set -O2 to fix spurious Windows segfaults),
which reverted rust-lang#41967 (set -O3).

Since we have found the root cause of rust-lang#50867, this optimization could be tried again.

Last time we've found that setting -O3 regressed the wall time of NLL (rust-lang#50329 (comment)), so we may need another perf run to confirm. I'd like to check this *after* the LLVM 7 upgrade rust-lang#51966 has been merged, so marking this as <kbd>S-blocked</kbd> for now.
  • Loading branch information
bors committed Jul 14, 2018
2 parents 0a8275f + 6c635b7 commit 1731f0a
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions src/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@ members = [
"tools/rls/test_data/workspace_symbol",
]

# Curiously, libtest will segfault if compiled with opt-level=3
# with some versions of XCode: https://github.com/rust-lang/rust/issues/50867
[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]
Expand Down

0 comments on commit 1731f0a

Please sign in to comment.