make inline enabled by default

This commit is contained in:
Niko Matsakis 2012-03-06 06:58:31 -08:00
parent fb61b8f262
commit 712dd23541
5 changed files with 2 additions and 7 deletions

View File

@ -255,7 +255,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
--rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X) \
--aux-base $$(S)src/test/auxiliary/ \
--stage-id stage$(1)-$(2) \
--rustcflags "$$(CFG_RUSTC_FLAGS) --target=$(2) --inline" \
--rustcflags "$$(CFG_RUSTC_FLAGS) --target=$(2)" \
$$(CTEST_TESTARGS)
CFAIL_ARGS$(1)-T-$(2)-H-$(3) := \

View File

@ -361,7 +361,6 @@ fn build_session_options(match: getopts::match,
lint_opts += [(lint::ctypes, false)];
}
let monomorphize = opt_present(match, "monomorphize");
let inline = opt_present(match, "inline");
let output_type =
if parse_only || no_trans {
@ -441,7 +440,6 @@ fn build_session_options(match: getopts::match,
no_trans: no_trans,
no_asm_comments: no_asm_comments,
monomorphize: monomorphize,
inline: inline,
warn_unused_imports: warn_unused_imports,
enforce_mut_vars: enforce_mut_vars};
ret sopts;
@ -513,7 +511,6 @@ fn opts() -> [getopts::opt] {
optflag("no-verify"),
optflag("no-lint-ctypes"),
optflag("monomorphize"),
optflag("inline"),
optmulti("cfg"), optflag("test"),
optflag("lib"), optflag("bin"), optflag("static"), optflag("gc"),
optflag("no-asm-comments"),

View File

@ -46,7 +46,6 @@ type options =
no_trans: bool,
no_asm_comments: bool,
monomorphize: bool,
inline: bool,
warn_unused_imports: bool,
enforce_mut_vars: bool};

View File

@ -2186,7 +2186,7 @@ fn lval_static_fn(bcx: block, fn_id: ast::def_id, id: ast::node_id,
// Check whether this fn has an inlined copy and, if so, redirect fn_id to
// the local id of the inlined copy.
let fn_id = if fn_id.crate != ast::local_crate && ccx.sess.opts.inline {
let fn_id = if fn_id.crate != ast::local_crate {
maybe_instantiate_inline(ccx, fn_id)
} else { fn_id };

View File

@ -145,7 +145,6 @@ fn build_session() -> (session::session, @mutable bool) {
no_trans: false,
no_asm_comments: false,
monomorphize: false,
inline: false,
warn_unused_imports: false,
enforce_mut_vars: false
};