Skip to content

Remove -Z no-opt flag, allow --opt-level override, and add -O<n> flag #14336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Remove -Z no-opt flag, allow --opt-level override, and add -O<n> flag #14336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0299b52
Remove -Z no-opt flag. Fix #13649
May 21, 2014
799ca17
Allow override of --opt-level flag. Fixes #7493. Add -O0, -O1, -O2
May 21, 2014
aa0fed0
Fix tests (remove -Z no-opt flag)
May 21, 2014
fb53e51
Remove hacks for -O defaulting to -O2
May 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions src/librustc/driver/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use syntax::parse;
use syntax::parse::token::InternedString;

use collections::HashSet;
use getopts::{optopt, optmulti, optflag, optflagopt};
use getopts::{opt, optopt, optmulti, optflag, optflagopt};
use getopts;
use lib::llvm::llvm;
use std::cell::{RefCell};
Expand Down Expand Up @@ -165,7 +165,6 @@ debugging_opts!(
SHOW_SPAN,
COUNT_TYPE_SIZES,
META_STATS,
NO_OPT,
GC,
PRINT_LINK_ARGS,
PRINT_LLVM_PASSES,
Expand Down Expand Up @@ -196,7 +195,6 @@ pub fn debugging_opts_map() -> Vec<(&'static str, &'static str, u64)> {
("count-type-sizes", "count the sizes of aggregate types",
COUNT_TYPE_SIZES),
("meta-stats", "gather metadata statistics", META_STATS),
("no-opt", "do not optimize, even if -O is passed", NO_OPT),
("print-link-args", "Print the arguments passed to the linker",
PRINT_LINK_ARGS),
("gc", "Garbage collect shared data (experimental)", GC),
Expand Down Expand Up @@ -513,9 +511,9 @@ pub fn optgroups() -> Vec<getopts::OptGroup> {
optflag("", "no-trans", "Run all passes except translation; no output"),
optflag("", "no-analysis",
"Parse and expand the source, but run no analysis and produce no output"),
optflag("O", "", "Equivalent to --opt-level=2"),
opt("O", "opt-level", "Optimize with possible levels 0-3", "LEVEL", getopts::Maybe,
getopts::Multi),
optopt("o", "", "Write output to <filename>", "FILENAME"),
optopt("", "opt-level", "Optimize with possible levels 0-3", "LEVEL"),
optopt( "", "out-dir", "Write output to compiler-chosen filename in <dir>", "DIR"),
optflag("", "parse-only", "Parse only; do not compile, assemble, or link"),
optflagopt("", "pretty",
Expand Down Expand Up @@ -653,16 +651,11 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
None => driver::host_triple().to_strbuf(),
};
let opt_level = {
if (debugging_opts & NO_OPT) != 0 {
if debugging_opts != 0 {
No
} else if matches.opt_present("O") {
if matches.opt_present("opt-level") {
early_error("-O and --opt-level both provided");
}
Default
} else if matches.opt_present("opt-level") {
match matches.opt_str("opt-level").as_ref().map(|s| s.as_slice()) {
None |
match matches.opt_strs("O").last().as_ref().map(|s| s.as_slice()) {
None => Default, // This provides support for -O defaulting to -O2.
Some("0") => No,
Some("1") => Less,
Some("2") => Default,
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/capture_nil.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// compile-flags:-Z no-opt
// compile-flags:-O0

// This test has to be setup just so to trigger
// the condition which was causing us a crash.
Expand Down