2013-08-06 23:50:23 -05:00
|
|
|
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
|
2012-12-03 18:48:01 -06:00
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2013-05-17 17:28:44 -05:00
|
|
|
|
2012-12-23 16:41:37 -06:00
|
|
|
use back::link;
|
2013-01-29 08:28:08 -06:00
|
|
|
use back::{arm, x86, x86_64, mips};
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
use driver::session::{Aggressive, OutputExecutable};
|
2013-03-26 15:38:07 -05:00
|
|
|
use driver::session::{Session, Session_, No, Less, Default};
|
2013-03-01 12:44:43 -06:00
|
|
|
use driver::session;
|
2012-12-23 16:41:37 -06:00
|
|
|
use front;
|
|
|
|
use lib::llvm::llvm;
|
2013-07-27 01:49:38 -05:00
|
|
|
use lib::llvm::{ContextRef, ModuleRef};
|
|
|
|
use metadata::common::LinkMeta;
|
2013-12-25 14:08:04 -06:00
|
|
|
use metadata::{creader, filesearch};
|
|
|
|
use metadata::cstore::CStore;
|
2012-12-23 16:41:37 -06:00
|
|
|
use metadata;
|
2013-06-14 20:21:47 -05:00
|
|
|
use middle::{trans, freevars, kind, ty, typeck, lint, astencode, reachable};
|
2012-12-23 16:41:37 -06:00
|
|
|
use middle;
|
2013-03-21 04:50:02 -05:00
|
|
|
use util::common::time;
|
2012-09-04 13:54:36 -05:00
|
|
|
use util::ppaux;
|
2012-12-23 16:41:37 -06:00
|
|
|
|
2013-12-21 19:25:27 -06:00
|
|
|
use std::cell::{Cell, RefCell};
|
2013-07-27 01:49:38 -05:00
|
|
|
use std::hashmap::{HashMap,HashSet};
|
2013-11-11 00:46:32 -06:00
|
|
|
use std::io;
|
|
|
|
use std::io::fs;
|
|
|
|
use std::io::mem::MemReader;
|
2013-06-28 17:32:26 -05:00
|
|
|
use std::os;
|
|
|
|
use std::vec;
|
2013-05-23 11:39:10 -05:00
|
|
|
use extra::getopts::groups::{optopt, optmulti, optflag, optflagopt};
|
2013-05-18 14:39:17 -05:00
|
|
|
use extra::getopts;
|
2012-12-23 16:41:37 -06:00
|
|
|
use syntax::ast;
|
2013-03-13 21:25:28 -05:00
|
|
|
use syntax::abi;
|
2012-12-23 16:41:37 -06:00
|
|
|
use syntax::attr;
|
2013-07-19 06:51:37 -05:00
|
|
|
use syntax::attr::{AttrMetaMethods};
|
2012-12-23 16:41:37 -06:00
|
|
|
use syntax::codemap;
|
|
|
|
use syntax::diagnostic;
|
|
|
|
use syntax::parse;
|
2013-05-14 19:27:27 -05:00
|
|
|
use syntax::parse::token;
|
2012-12-23 16:41:37 -06:00
|
|
|
use syntax::print::{pp, pprust};
|
|
|
|
use syntax;
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2013-08-31 11:13:04 -05:00
|
|
|
pub enum PpMode {
|
|
|
|
PpmNormal,
|
|
|
|
PpmExpanded,
|
|
|
|
PpmTyped,
|
|
|
|
PpmIdentified,
|
|
|
|
PpmExpandedIdentified
|
2012-12-23 16:41:37 -06:00
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/**
|
|
|
|
* The name used for source code that doesn't originate in a file
|
|
|
|
* (e.g. source from stdin or a string)
|
|
|
|
*/
|
2013-06-12 12:02:55 -05:00
|
|
|
pub fn anon_src() -> @str { @"<anon>" }
|
2012-05-09 21:41:24 -05:00
|
|
|
|
2013-06-12 12:02:55 -05:00
|
|
|
pub fn source_name(input: &input) -> @str {
|
2013-04-17 11:15:37 -05:00
|
|
|
match *input {
|
2013-09-26 19:21:59 -05:00
|
|
|
// FIXME (#9639): This needs to handle non-utf8 paths
|
|
|
|
file_input(ref ifile) => ifile.as_str().unwrap().to_managed(),
|
2012-08-03 21:59:04 -05:00
|
|
|
str_input(_) => anon_src()
|
2012-05-09 21:41:24 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-13 19:06:27 -05:00
|
|
|
pub fn default_configuration(sess: Session) ->
|
2013-07-19 00:38:55 -05:00
|
|
|
ast::CrateConfig {
|
2013-08-13 19:06:27 -05:00
|
|
|
let tos = match sess.targ_cfg.os {
|
2013-11-08 13:06:57 -06:00
|
|
|
abi::OsWin32 => @"win32",
|
|
|
|
abi::OsMacos => @"macos",
|
|
|
|
abi::OsLinux => @"linux",
|
|
|
|
abi::OsAndroid => @"android",
|
|
|
|
abi::OsFreebsd => @"freebsd"
|
2012-01-26 03:52:08 -06:00
|
|
|
};
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2013-02-16 05:58:21 -06:00
|
|
|
// ARM is bi-endian, however using NDK seems to default
|
|
|
|
// to little-endian unless a flag is provided.
|
|
|
|
let (end,arch,wordsz) = match sess.targ_cfg.arch {
|
2013-06-15 02:43:19 -05:00
|
|
|
abi::X86 => (@"little", @"x86", @"32"),
|
|
|
|
abi::X86_64 => (@"little", @"x86_64", @"64"),
|
|
|
|
abi::Arm => (@"little", @"arm", @"32"),
|
|
|
|
abi::Mips => (@"big", @"mips", @"32")
|
2011-12-20 04:17:13 -06:00
|
|
|
};
|
|
|
|
|
2013-11-20 00:30:51 -06:00
|
|
|
let fam = match sess.targ_cfg.os {
|
|
|
|
abi::OsWin32 => @"windows",
|
|
|
|
_ => @"unix"
|
|
|
|
};
|
|
|
|
|
2013-06-15 02:43:19 -05:00
|
|
|
let mk = attr::mk_name_value_item_str;
|
2012-08-01 19:30:05 -05:00
|
|
|
return ~[ // Target bindings.
|
2013-11-20 00:30:51 -06:00
|
|
|
attr::mk_word_item(fam),
|
2013-06-12 12:02:55 -05:00
|
|
|
mk(@"target_os", tos),
|
2013-11-20 00:30:51 -06:00
|
|
|
mk(@"target_family", fam),
|
2013-06-12 12:02:55 -05:00
|
|
|
mk(@"target_arch", arch),
|
|
|
|
mk(@"target_endian", end),
|
|
|
|
mk(@"target_word_size", wordsz),
|
2013-08-13 19:06:27 -05:00
|
|
|
];
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2013-07-19 00:38:55 -05:00
|
|
|
pub fn append_configuration(cfg: &mut ast::CrateConfig, name: @str) {
|
2013-07-19 06:51:37 -05:00
|
|
|
if !cfg.iter().any(|mi| mi.name() == name) {
|
|
|
|
cfg.push(attr::mk_word_item(name))
|
2012-08-28 12:58:04 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-13 19:06:27 -05:00
|
|
|
pub fn build_configuration(sess: Session) ->
|
2013-07-19 00:38:55 -05:00
|
|
|
ast::CrateConfig {
|
2011-12-20 04:17:13 -06:00
|
|
|
// Combine the configuration requested by the session (command line) with
|
|
|
|
// some default and generated configuration items
|
2013-08-13 19:06:27 -05:00
|
|
|
let default_cfg = default_configuration(sess);
|
2013-07-19 06:51:37 -05:00
|
|
|
let mut user_cfg = sess.opts.cfg.clone();
|
2011-12-20 04:17:13 -06:00
|
|
|
// If the user wants a test runner, then add the test cfg
|
2013-07-19 06:51:37 -05:00
|
|
|
if sess.opts.test { append_configuration(&mut user_cfg, @"test") }
|
2012-08-28 12:58:04 -05:00
|
|
|
// If the user requested GC, then add the GC cfg
|
2013-07-19 06:51:37 -05:00
|
|
|
append_configuration(&mut user_cfg, if sess.opts.gc { @"gc" } else { @"nogc" });
|
2012-08-28 12:58:04 -05:00
|
|
|
return vec::append(user_cfg, default_cfg);
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
// Convert strings provided as --cfg [cfgspec] into a crate_cfg
|
2013-08-29 20:34:09 -05:00
|
|
|
fn parse_cfgspecs(cfgspecs: ~[~str], demitter: @diagnostic::Emitter)
|
|
|
|
-> ast::CrateConfig {
|
2013-11-21 17:42:55 -06:00
|
|
|
cfgspecs.move_iter().map(|s| {
|
2013-01-19 09:52:06 -06:00
|
|
|
let sess = parse::new_parse_sess(Some(demitter));
|
2013-06-12 12:02:55 -05:00
|
|
|
parse::parse_meta_from_source_str(@"cfgspec", s.to_managed(), ~[], sess)
|
2013-11-21 17:42:55 -06:00
|
|
|
}).collect::<ast::CrateConfig>()
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2013-01-29 17:16:07 -06:00
|
|
|
pub enum input {
|
2012-07-04 16:53:12 -05:00
|
|
|
/// Load source from file
|
2012-08-24 17:28:43 -05:00
|
|
|
file_input(Path),
|
2012-07-04 16:53:12 -05:00
|
|
|
/// The string is the source
|
2013-06-12 12:02:55 -05:00
|
|
|
// FIXME (#2319): Don't really want to box the source string
|
|
|
|
str_input(@str)
|
2012-05-09 21:41:24 -05:00
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
pub fn phase_1_parse_input(sess: Session, cfg: ast::CrateConfig, input: &input)
|
2013-09-27 21:46:09 -05:00
|
|
|
-> ast::Crate {
|
2013-10-04 12:46:53 -05:00
|
|
|
time(sess.time_passes(), "parsing", (), |_| {
|
2013-07-27 01:49:38 -05:00
|
|
|
match *input {
|
|
|
|
file_input(ref file) => {
|
|
|
|
parse::parse_crate_from_file(&(*file), cfg.clone(), sess.parse_sess)
|
|
|
|
}
|
|
|
|
str_input(src) => {
|
|
|
|
parse::parse_crate_from_source_str(
|
|
|
|
anon_src(), src, cfg.clone(), sess.parse_sess)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
2012-01-17 09:42:45 -06:00
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2013-01-22 19:19:13 -06:00
|
|
|
// For continuing compilation after a parsed crate has been
|
|
|
|
// modified
|
2013-05-28 17:31:32 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
/// Run the "early phases" of the compiler: initial `cfg` processing,
|
|
|
|
/// syntax expansion, secondary `cfg` expansion, synthesis of a test
|
|
|
|
/// harness if one is to be provided and injection of a dependency on the
|
|
|
|
/// standard library and prelude.
|
|
|
|
pub fn phase_2_configure_and_expand(sess: Session,
|
|
|
|
cfg: ast::CrateConfig,
|
2014-01-06 06:00:46 -06:00
|
|
|
mut crate: ast::Crate)
|
2014-01-09 07:05:33 -06:00
|
|
|
-> (ast::Crate, syntax::ast_map::Map) {
|
2012-05-17 23:53:49 -05:00
|
|
|
let time_passes = sess.time_passes();
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2013-12-22 16:40:03 -06:00
|
|
|
sess.building_library.set(session::building_library(sess.opts, &crate));
|
2014-01-01 15:26:07 -06:00
|
|
|
sess.outputs.set(session::collect_outputs(&sess, crate.attrs));
|
2013-05-09 00:15:54 -05:00
|
|
|
|
2013-10-02 22:00:54 -05:00
|
|
|
time(time_passes, "gated feature checking", (), |_|
|
2013-10-02 20:10:16 -05:00
|
|
|
front::feature_gate::check_crate(sess, &crate));
|
2012-06-30 18:19:07 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
// strip before expansion to allow macros to depend on
|
|
|
|
// configuration variables e.g/ in
|
|
|
|
//
|
|
|
|
// #[macro_escape] #[cfg(foo)]
|
|
|
|
// mod bar { macro_rules! baz!(() => {{}}) }
|
|
|
|
//
|
|
|
|
// baz! should not use this definition unless foo is enabled.
|
2013-10-04 12:46:53 -05:00
|
|
|
crate = time(time_passes, "std macros injection", crate, |crate|
|
2013-07-27 01:49:38 -05:00
|
|
|
syntax::ext::expand::inject_std_macros(sess.parse_sess,
|
|
|
|
cfg.clone(),
|
|
|
|
crate));
|
2013-07-16 00:05:50 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
crate = time(time_passes, "configuration 1", crate, |crate|
|
2013-07-27 01:49:38 -05:00
|
|
|
front::config::strip_unconfigured_items(crate));
|
2013-06-21 22:20:00 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
crate = time(time_passes, "expansion", crate, |crate|
|
2013-07-27 01:49:38 -05:00
|
|
|
syntax::ext::expand::expand_crate(sess.parse_sess, cfg.clone(),
|
|
|
|
crate));
|
2013-05-27 19:45:16 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
// strip again, in case expansion added anything with a #[cfg].
|
2013-10-04 12:46:53 -05:00
|
|
|
crate = time(time_passes, "configuration 2", crate, |crate|
|
2013-07-27 01:49:38 -05:00
|
|
|
front::config::strip_unconfigured_items(crate));
|
2013-05-27 19:45:16 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
crate = time(time_passes, "maybe building test harness", crate, |crate|
|
2013-07-27 01:49:38 -05:00
|
|
|
front::test::modify_for_testing(sess, crate));
|
2013-07-19 06:51:37 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
crate = time(time_passes, "std injection", crate, |crate|
|
2013-07-27 01:49:38 -05:00
|
|
|
front::std_inject::maybe_inject_libstd_ref(sess, crate));
|
2012-06-30 18:19:07 -05:00
|
|
|
|
2014-01-06 06:00:46 -06:00
|
|
|
time(time_passes, "assinging node ids and indexing ast", crate, |crate|
|
|
|
|
front::assign_node_ids_and_map::assign_node_ids_and_map(sess, crate))
|
2013-07-27 01:49:38 -05:00
|
|
|
}
|
2012-01-26 17:20:29 -06:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
pub struct CrateAnalysis {
|
|
|
|
exp_map2: middle::resolve::ExportMap2,
|
2013-10-12 16:40:41 -05:00
|
|
|
exported_items: middle::privacy::ExportedItems,
|
2014-01-07 20:46:16 -06:00
|
|
|
public_items: middle::privacy::PublicItems,
|
2013-07-27 01:49:38 -05:00
|
|
|
ty_cx: ty::ctxt,
|
|
|
|
maps: astencode::Maps,
|
2013-12-20 22:14:51 -06:00
|
|
|
reachable: @RefCell<HashSet<ast::NodeId>>
|
2013-07-27 01:49:38 -05:00
|
|
|
}
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
/// Run the resolution, typechecking, region checking and other
|
|
|
|
/// miscellaneous analysis passes on the crate. Return various
|
|
|
|
/// structures carrying the results of the analysis.
|
|
|
|
pub fn phase_3_run_analysis_passes(sess: Session,
|
2014-01-06 06:00:46 -06:00
|
|
|
crate: &ast::Crate,
|
2014-01-09 07:05:33 -06:00
|
|
|
ast_map: syntax::ast_map::Map) -> CrateAnalysis {
|
2012-05-22 12:54:12 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
let time_passes = sess.time_passes();
|
2013-09-06 21:11:55 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "external crate/lib resolution", (), |_|
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
creader::read_crates(sess, crate,
|
2013-07-27 01:49:38 -05:00
|
|
|
session::sess_os_to_meta_os(sess.targ_cfg.os),
|
|
|
|
token::get_ident_interner()));
|
2012-06-30 18:19:07 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
let lang_items = time(time_passes, "language item collection", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
middle::lang_items::collect_language_items(crate, sess));
|
2013-04-29 16:56:05 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
let middle::resolve::CrateMap {
|
|
|
|
def_map: def_map,
|
|
|
|
exp_map2: exp_map2,
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
trait_map: trait_map,
|
|
|
|
external_exports: external_exports,
|
|
|
|
last_private_map: last_private_map
|
2013-07-27 01:49:38 -05:00
|
|
|
} =
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "resolution", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
middle::resolve::resolve_crate(sess, lang_items, crate));
|
2012-06-30 18:19:07 -05:00
|
|
|
|
2013-10-28 16:37:10 -05:00
|
|
|
let named_region_map = time(time_passes, "lifetime resolution", (),
|
|
|
|
|_| middle::resolve_lifetime::crate(sess, crate));
|
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "looking for entry point", (),
|
2013-09-27 21:46:09 -05:00
|
|
|
|_| middle::entry::find_entry_point(sess, crate, ast_map));
|
2012-06-30 18:19:07 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
let freevars = time(time_passes, "freevar finding", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
freevars::annotate_freevars(def_map, crate));
|
2012-07-11 12:28:30 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
let region_map = time(time_passes, "region resolution", (), |_|
|
2013-10-29 05:14:59 -05:00
|
|
|
middle::region::resolve_crate(sess, crate));
|
2012-01-17 09:42:45 -06:00
|
|
|
|
2013-10-28 16:37:10 -05:00
|
|
|
let ty_cx = ty::mk_ctxt(sess, def_map, named_region_map, ast_map, freevars,
|
|
|
|
region_map, lang_items);
|
2012-09-04 16:48:32 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
// passes are timed inside typeck
|
2014-01-06 06:00:46 -06:00
|
|
|
let (method_map, vtable_map) = typeck::check_crate(ty_cx, trait_map, crate);
|
2012-06-30 18:19:07 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
// These next two const passes can probably be merged
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "const marking", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
middle::const_eval::process_crate(crate, ty_cx));
|
2012-06-30 18:19:07 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "const checking", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
middle::check_const::check_crate(sess, crate, ast_map, def_map,
|
|
|
|
method_map, ty_cx));
|
2012-06-30 18:19:07 -05:00
|
|
|
|
Extract privacy checking from name resolution
This commit is the culmination of my recent effort to refine Rust's notion of
privacy and visibility among crates. The major goals of this commit were to
remove privacy checking from resolve for the sake of sane error messages, and to
attempt a much more rigid and well-tested implementation of visibility
throughout rust. The implemented rules for name visibility are:
1. Everything pub from the root namespace is visible to anyone
2. You may access any private item of your ancestors.
"Accessing a private item" depends on what the item is, so for a function this
means that you can call it, but for a module it means that you can look inside
of it. Once you look inside a private module, any accessed item must be "pub
from the root" where the new root is the private module that you looked into.
These rules required some more analysis results to get propagated from trans to
privacy in the form of a few hash tables.
I added a new test in which my goal was to showcase all of the privacy nuances
of the language, and I hope to place any new bugs into this file to prevent
regressions.
Overall, I was unable to completely remove the notion of privacy from resolve.
One use of privacy is for dealing with glob imports. Essentially a glob import
can only import *public* items from the destination, and because this must be
done at namespace resolution time, resolve must maintain the notion of "what
items are public in a module". There are some sad approximations of privacy, but
I unfortunately can't see clear methods to extract them outside.
The other use case of privacy in resolve now is one that must stick around
regardless of glob imports. When dealing with privacy, checking a private path
needs to know "what the last private thing was" when looking at a path. Resolve
is the only compiler pass which knows the answer to this question, so it
maintains the answer on a per-path resolution basis (works similarly to the
def_map generated).
Closes #8215
2013-10-05 16:37:39 -05:00
|
|
|
let maps = (external_exports, last_private_map);
|
2014-01-07 20:46:16 -06:00
|
|
|
let (exported_items, public_items) =
|
|
|
|
time(time_passes, "privacy checking", maps, |(a, b)|
|
|
|
|
middle::privacy::check_crate(ty_cx, &method_map, &exp_map2,
|
|
|
|
a, b, crate));
|
2012-06-30 18:19:07 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "effect checking", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
middle::effect::check_crate(ty_cx, method_map, crate));
|
2013-05-23 21:12:16 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "loop checking", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
middle::check_loop::check_crate(ty_cx, crate));
|
2012-06-30 18:19:07 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
let middle::moves::MoveMaps {moves_map, moved_variables_set,
|
|
|
|
capture_map} =
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "compute moves", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
middle::moves::compute_moves(ty_cx, method_map, crate));
|
2012-12-04 17:38:04 -06:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "match checking", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
middle::check_match::check_crate(ty_cx, method_map,
|
|
|
|
moves_map, crate));
|
2012-12-07 21:34:57 -06:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "liveness checking", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
middle::liveness::check_crate(ty_cx, method_map,
|
|
|
|
capture_map, crate));
|
2012-11-14 20:05:07 -06:00
|
|
|
|
2013-12-30 20:57:48 -06:00
|
|
|
let root_map =
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "borrow checking", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
middle::borrowck::check_crate(ty_cx, method_map,
|
|
|
|
moves_map, moved_variables_set,
|
2013-05-27 19:45:16 -05:00
|
|
|
capture_map, crate));
|
2012-11-14 20:05:07 -06:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "kind checking", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
kind::check_crate(ty_cx, method_map, crate));
|
2013-06-14 00:38:17 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
let reachable_map =
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "reachability checking", (), |_|
|
2013-11-11 22:17:47 -06:00
|
|
|
reachable::find_reachable(ty_cx, method_map, &exported_items));
|
2013-06-14 00:38:17 -05:00
|
|
|
|
2013-12-20 22:14:51 -06:00
|
|
|
{
|
|
|
|
let reachable_map = reachable_map.borrow();
|
|
|
|
time(time_passes, "death checking", (), |_| {
|
|
|
|
middle::dead::check_crate(ty_cx,
|
|
|
|
method_map,
|
|
|
|
&exported_items,
|
|
|
|
reachable_map.get(),
|
|
|
|
crate)
|
|
|
|
});
|
|
|
|
}
|
2013-12-08 01:55:27 -06:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
time(time_passes, "lint checking", (), |_|
|
2013-12-15 20:52:48 -06:00
|
|
|
lint::check_crate(ty_cx, method_map, &exported_items, crate));
|
2013-06-14 20:21:47 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
CrateAnalysis {
|
|
|
|
exp_map2: exp_map2,
|
|
|
|
ty_cx: ty_cx,
|
2013-10-12 16:40:41 -05:00
|
|
|
exported_items: exported_items,
|
2014-01-07 20:46:16 -06:00
|
|
|
public_items: public_items,
|
2013-07-27 01:49:38 -05:00
|
|
|
maps: astencode::Maps {
|
2013-06-14 00:38:17 -05:00
|
|
|
root_map: root_map,
|
|
|
|
method_map: method_map,
|
|
|
|
vtable_map: vtable_map,
|
|
|
|
capture_map: capture_map
|
2013-07-27 01:49:38 -05:00
|
|
|
},
|
|
|
|
reachable: reachable_map
|
|
|
|
}
|
|
|
|
}
|
2013-06-14 00:38:17 -05:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
pub struct CrateTranslation {
|
|
|
|
context: ContextRef,
|
|
|
|
module: ModuleRef,
|
Store metadata separately in rlib files
Right now whenever an rlib file is linked against, all of the metadata from the
rlib is pulled in to the final staticlib or binary. The reason for this is that
the metadata is currently stored in a section of the object file. Note that this
is intentional for dynamic libraries in order to distribute metadata bundled
with static libraries.
This commit alters the situation for rlib libraries to instead store the
metadata in a separate file in the archive. In doing so, when the archive is
passed to the linker, none of the metadata will get pulled into the result
executable. Furthermore, the metadata file is skipped when assembling rlibs into
an archive.
The snag in this implementation comes with multiple output formats. When
generating a dylib, the metadata needs to be in the object file, but when
generating an rlib this needs to be separate. In order to accomplish this, the
metadata variable is inserted into an entirely separate LLVM Module which is
then codegen'd into a different location (foo.metadata.o). This is then linked
into dynamic libraries and silently ignored for rlib files.
While changing how metadata is inserted into archives, I have also stopped
compressing metadata when inserted into rlib files. We have wanted to stop
compressing metadata, but the sections it creates in object file sections are
apparently too large. Thankfully if it's just an arbitrary file it doesn't
matter how large it is.
I have seen massive reductions in executable sizes, as well as staticlib output
sizes (to confirm that this is all working).
2013-12-03 19:41:01 -06:00
|
|
|
metadata_module: ModuleRef,
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
link: LinkMeta,
|
Store metadata separately in rlib files
Right now whenever an rlib file is linked against, all of the metadata from the
rlib is pulled in to the final staticlib or binary. The reason for this is that
the metadata is currently stored in a section of the object file. Note that this
is intentional for dynamic libraries in order to distribute metadata bundled
with static libraries.
This commit alters the situation for rlib libraries to instead store the
metadata in a separate file in the archive. In doing so, when the archive is
passed to the linker, none of the metadata will get pulled into the result
executable. Furthermore, the metadata file is skipped when assembling rlibs into
an archive.
The snag in this implementation comes with multiple output formats. When
generating a dylib, the metadata needs to be in the object file, but when
generating an rlib this needs to be separate. In order to accomplish this, the
metadata variable is inserted into an entirely separate LLVM Module which is
then codegen'd into a different location (foo.metadata.o). This is then linked
into dynamic libraries and silently ignored for rlib files.
While changing how metadata is inserted into archives, I have also stopped
compressing metadata when inserted into rlib files. We have wanted to stop
compressing metadata, but the sections it creates in object file sections are
apparently too large. Thankfully if it's just an arbitrary file it doesn't
matter how large it is.
I have seen massive reductions in executable sizes, as well as staticlib output
sizes (to confirm that this is all working).
2013-12-03 19:41:01 -06:00
|
|
|
metadata: ~[u8],
|
Implement LTO
This commit implements LTO for rust leveraging LLVM's passes. What this means
is:
* When compiling an rlib, in addition to insdering foo.o into the archive, also
insert foo.bc (the LLVM bytecode) of the optimized module.
* When the compiler detects the -Z lto option, it will attempt to perform LTO on
a staticlib or binary output. The compiler will emit an error if a dylib or
rlib output is being generated.
* The actual act of performing LTO is as follows:
1. Force all upstream libraries to have an rlib version available.
2. Load the bytecode of each upstream library from the rlib.
3. Link all this bytecode into the current LLVM module (just using llvm
apis)
4. Run an internalization pass which internalizes all symbols except those
found reachable for the local crate of compilation.
5. Run the LLVM LTO pass manager over this entire module
6a. If assembling an archive, then add all upstream rlibs into the output
archive. This ignores all of the object/bitcode/metadata files rust
generated and placed inside the rlibs.
6b. If linking a binary, create copies of all upstream rlibs, remove the
rust-generated object-file, and then link everything as usual.
As I have explained in #10741, this process is excruciatingly slow, so this is
*not* turned on by default, and it is also why I have decided to hide it behind
a -Z flag for now. The good news is that the binary sizes are about as small as
they can be as a result of LTO, so it's definitely working.
Closes #10741
Closes #10740
2013-12-03 01:19:29 -06:00
|
|
|
reachable: ~[~str],
|
2013-07-27 01:49:38 -05:00
|
|
|
}
|
2012-02-14 17:21:53 -06:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
/// Run the translation phase to LLVM, after which the AST and analysis can
|
|
|
|
/// be discarded.
|
|
|
|
pub fn phase_4_translate_to_llvm(sess: Session,
|
2013-09-27 21:46:09 -05:00
|
|
|
crate: ast::Crate,
|
2013-07-27 01:49:38 -05:00
|
|
|
analysis: &CrateAnalysis,
|
|
|
|
outputs: &OutputFilenames) -> CrateTranslation {
|
2013-10-04 12:46:53 -05:00
|
|
|
time(sess.time_passes(), "translation", crate, |crate|
|
2013-07-27 01:49:38 -05:00
|
|
|
trans::base::trans_crate(sess, crate, analysis,
|
|
|
|
&outputs.obj_filename))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Run LLVM itself, producing a bitcode file, assembly file or object file
|
|
|
|
/// as a side effect.
|
|
|
|
pub fn phase_5_run_llvm_passes(sess: Session,
|
|
|
|
trans: &CrateTranslation,
|
|
|
|
outputs: &OutputFilenames) {
|
2013-04-28 21:54:41 -05:00
|
|
|
|
2013-12-08 22:13:10 -06:00
|
|
|
if sess.no_integrated_as() {
|
2014-01-09 19:42:08 -06:00
|
|
|
let output_type = link::OutputTypeAssembly;
|
2013-10-05 21:49:32 -05:00
|
|
|
let asm_filename = outputs.obj_filename.with_extension("s");
|
2013-03-15 03:32:39 -05:00
|
|
|
|
2013-10-04 12:46:53 -05:00
|
|
|
time(sess.time_passes(), "LLVM passes", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
link::write::run_passes(sess,
|
Store metadata separately in rlib files
Right now whenever an rlib file is linked against, all of the metadata from the
rlib is pulled in to the final staticlib or binary. The reason for this is that
the metadata is currently stored in a section of the object file. Note that this
is intentional for dynamic libraries in order to distribute metadata bundled
with static libraries.
This commit alters the situation for rlib libraries to instead store the
metadata in a separate file in the archive. In doing so, when the archive is
passed to the linker, none of the metadata will get pulled into the result
executable. Furthermore, the metadata file is skipped when assembling rlibs into
an archive.
The snag in this implementation comes with multiple output formats. When
generating a dylib, the metadata needs to be in the object file, but when
generating an rlib this needs to be separate. In order to accomplish this, the
metadata variable is inserted into an entirely separate LLVM Module which is
then codegen'd into a different location (foo.metadata.o). This is then linked
into dynamic libraries and silently ignored for rlib files.
While changing how metadata is inserted into archives, I have also stopped
compressing metadata when inserted into rlib files. We have wanted to stop
compressing metadata, but the sections it creates in object file sections are
apparently too large. Thankfully if it's just an arbitrary file it doesn't
matter how large it is.
I have seen massive reductions in executable sizes, as well as staticlib output
sizes (to confirm that this is all working).
2013-12-03 19:41:01 -06:00
|
|
|
trans,
|
2013-07-27 01:49:38 -05:00
|
|
|
output_type,
|
2013-08-19 17:21:30 -05:00
|
|
|
&asm_filename));
|
2013-03-15 03:32:39 -05:00
|
|
|
|
2013-08-19 17:21:30 -05:00
|
|
|
link::write::run_assembler(sess, &asm_filename, &outputs.obj_filename);
|
|
|
|
|
2013-12-08 22:13:10 -06:00
|
|
|
// Remove assembly source, unless --save-temps was specified
|
2013-08-19 17:21:30 -05:00
|
|
|
if !sess.opts.save_temps {
|
2013-10-31 17:15:30 -05:00
|
|
|
fs::unlink(&asm_filename);
|
2013-08-19 17:21:30 -05:00
|
|
|
}
|
2013-03-15 03:32:39 -05:00
|
|
|
} else {
|
2013-10-04 12:46:53 -05:00
|
|
|
time(sess.time_passes(), "LLVM passes", (), |_|
|
2013-07-27 01:49:38 -05:00
|
|
|
link::write::run_passes(sess,
|
Store metadata separately in rlib files
Right now whenever an rlib file is linked against, all of the metadata from the
rlib is pulled in to the final staticlib or binary. The reason for this is that
the metadata is currently stored in a section of the object file. Note that this
is intentional for dynamic libraries in order to distribute metadata bundled
with static libraries.
This commit alters the situation for rlib libraries to instead store the
metadata in a separate file in the archive. In doing so, when the archive is
passed to the linker, none of the metadata will get pulled into the result
executable. Furthermore, the metadata file is skipped when assembling rlibs into
an archive.
The snag in this implementation comes with multiple output formats. When
generating a dylib, the metadata needs to be in the object file, but when
generating an rlib this needs to be separate. In order to accomplish this, the
metadata variable is inserted into an entirely separate LLVM Module which is
then codegen'd into a different location (foo.metadata.o). This is then linked
into dynamic libraries and silently ignored for rlib files.
While changing how metadata is inserted into archives, I have also stopped
compressing metadata when inserted into rlib files. We have wanted to stop
compressing metadata, but the sections it creates in object file sections are
apparently too large. Thankfully if it's just an arbitrary file it doesn't
matter how large it is.
I have seen massive reductions in executable sizes, as well as staticlib output
sizes (to confirm that this is all working).
2013-12-03 19:41:01 -06:00
|
|
|
trans,
|
2013-07-27 01:49:38 -05:00
|
|
|
sess.opts.output_type,
|
2013-06-13 23:25:18 -05:00
|
|
|
&outputs.obj_filename));
|
2013-03-15 03:32:39 -05:00
|
|
|
}
|
2013-07-27 01:49:38 -05:00
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
/// Run the linker on any artifacts that resulted from the LLVM run.
|
|
|
|
/// This should produce either a finished executable or library.
|
|
|
|
pub fn phase_6_link_output(sess: Session,
|
|
|
|
trans: &CrateTranslation,
|
|
|
|
outputs: &OutputFilenames) {
|
2013-12-26 13:55:10 -06:00
|
|
|
time(sess.time_passes(), "linking", (), |_|
|
2012-09-18 13:46:39 -05:00
|
|
|
link::link_binary(sess,
|
Store metadata separately in rlib files
Right now whenever an rlib file is linked against, all of the metadata from the
rlib is pulled in to the final staticlib or binary. The reason for this is that
the metadata is currently stored in a section of the object file. Note that this
is intentional for dynamic libraries in order to distribute metadata bundled
with static libraries.
This commit alters the situation for rlib libraries to instead store the
metadata in a separate file in the archive. In doing so, when the archive is
passed to the linker, none of the metadata will get pulled into the result
executable. Furthermore, the metadata file is skipped when assembling rlibs into
an archive.
The snag in this implementation comes with multiple output formats. When
generating a dylib, the metadata needs to be in the object file, but when
generating an rlib this needs to be separate. In order to accomplish this, the
metadata variable is inserted into an entirely separate LLVM Module which is
then codegen'd into a different location (foo.metadata.o). This is then linked
into dynamic libraries and silently ignored for rlib files.
While changing how metadata is inserted into archives, I have also stopped
compressing metadata when inserted into rlib files. We have wanted to stop
compressing metadata, but the sections it creates in object file sections are
apparently too large. Thankfully if it's just an arbitrary file it doesn't
matter how large it is.
I have seen massive reductions in executable sizes, as well as staticlib output
sizes (to confirm that this is all working).
2013-12-03 19:41:01 -06:00
|
|
|
trans,
|
2012-09-18 13:46:39 -05:00
|
|
|
&outputs.obj_filename,
|
2013-12-09 15:56:53 -06:00
|
|
|
&outputs.out_filename,
|
|
|
|
&trans.link));
|
2013-12-26 13:55:10 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn stop_after_phase_3(sess: Session) -> bool {
|
|
|
|
if sess.opts.no_trans {
|
|
|
|
debug!("invoked with --no-trans, returning early from compile_input");
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn stop_after_phase_1(sess: Session) -> bool {
|
|
|
|
if sess.opts.parse_only {
|
|
|
|
debug!("invoked with --parse-only, returning early from compile_input");
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-12-26 16:39:36 -06:00
|
|
|
pub fn stop_after_phase_2(sess: Session) -> bool {
|
|
|
|
if sess.opts.no_analysis {
|
|
|
|
debug!("invoked with --no-analysis, returning early from compile_input");
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-12-26 13:55:10 -06:00
|
|
|
pub fn stop_after_phase_5(sess: Session) -> bool {
|
2014-01-09 19:42:08 -06:00
|
|
|
if sess.opts.output_type != link::OutputTypeExe {
|
2013-12-26 13:55:10 -06:00
|
|
|
debug!("not building executable, returning early from compile_input");
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
fn write_out_deps(sess: Session, input: &input, outputs: &OutputFilenames, crate: &ast::Crate)
|
|
|
|
{
|
|
|
|
let lm = link::build_link_meta(sess, crate.attrs, &outputs.obj_filename,
|
|
|
|
&mut ::util::sha2::Sha256::new());
|
|
|
|
|
|
|
|
let sess_outputs = sess.outputs.borrow();
|
|
|
|
let out_filenames = sess_outputs.get().iter()
|
|
|
|
.map(|&output| link::filename_for_input(&sess, output, &lm, &outputs.out_filename))
|
|
|
|
.to_owned_vec();
|
2013-11-27 21:06:35 -06:00
|
|
|
|
2013-12-22 14:38:55 -06:00
|
|
|
// Write out dependency rules to the dep-info file if requested with --dep-info
|
|
|
|
let deps_filename = match sess.opts.write_dependency_info {
|
|
|
|
// Use filename from --dep-file argument if given
|
|
|
|
(true, Some(ref filename)) => filename.clone(),
|
|
|
|
// Use default filename: crate source filename with extension replaced by ".d"
|
|
|
|
(true, None) => match *input {
|
2013-11-27 21:06:35 -06:00
|
|
|
file_input(ref input_path) => {
|
|
|
|
let filestem = input_path.filestem().expect("input file must have stem");
|
2013-12-26 13:55:10 -06:00
|
|
|
let filename = out_filenames[0].dir_path().join(filestem).with_extension("d");
|
2013-12-22 14:38:55 -06:00
|
|
|
filename
|
|
|
|
},
|
|
|
|
str_input(..) => {
|
|
|
|
sess.warn("can not write --dep-info without a filename when compiling stdin.");
|
|
|
|
return;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
_ => return,
|
|
|
|
};
|
2013-12-26 13:55:10 -06:00
|
|
|
|
2013-12-22 14:38:55 -06:00
|
|
|
// Build a list of files used to compile the output and
|
|
|
|
// write Makefile-compatible dependency rules
|
2013-12-30 18:30:33 -06:00
|
|
|
let files: ~[@str] = {
|
|
|
|
let files = sess.codemap.files.borrow();
|
|
|
|
files.get()
|
|
|
|
.iter()
|
|
|
|
.filter_map(|fmap| {
|
|
|
|
if fmap.is_real_file() {
|
|
|
|
Some(fmap.name)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.collect()
|
|
|
|
};
|
2013-12-22 14:38:55 -06:00
|
|
|
let mut file = io::File::create(&deps_filename);
|
2013-12-26 13:55:10 -06:00
|
|
|
for path in out_filenames.iter() {
|
2013-12-22 14:38:55 -06:00
|
|
|
write!(&mut file as &mut Writer,
|
2013-12-26 13:55:10 -06:00
|
|
|
"{}: {}\n\n", path.display(), files.connect(" "));
|
2013-07-27 01:49:38 -05:00
|
|
|
}
|
2013-01-22 19:19:13 -06:00
|
|
|
}
|
|
|
|
|
2013-07-19 00:38:55 -05:00
|
|
|
pub fn compile_input(sess: Session, cfg: ast::CrateConfig, input: &input,
|
2013-01-29 17:16:07 -06:00
|
|
|
outdir: &Option<Path>, output: &Option<Path>) {
|
2013-07-28 12:56:05 -05:00
|
|
|
// We need nested scopes here, because the intermediate results can keep
|
|
|
|
// large chunks of memory alive and we want to free them as soon as
|
|
|
|
// possible to keep the peak memory usage low
|
2013-07-30 17:40:19 -05:00
|
|
|
let (outputs, trans) = {
|
2014-01-06 06:00:46 -06:00
|
|
|
let (expanded_crate, ast_map) = {
|
2013-07-28 12:56:05 -05:00
|
|
|
let crate = phase_1_parse_input(sess, cfg.clone(), input);
|
|
|
|
if stop_after_phase_1(sess) { return; }
|
|
|
|
phase_2_configure_and_expand(sess, cfg, crate)
|
|
|
|
};
|
2013-11-04 01:30:06 -06:00
|
|
|
let outputs = build_output_filenames(input, outdir, output,
|
|
|
|
expanded_crate.attrs, sess);
|
2013-12-26 13:55:10 -06:00
|
|
|
|
|
|
|
write_out_deps(sess, input, outputs, &expanded_crate);
|
|
|
|
|
2013-12-26 16:39:36 -06:00
|
|
|
if stop_after_phase_2(sess) { return; }
|
|
|
|
|
2014-01-06 06:00:46 -06:00
|
|
|
let analysis = phase_3_run_analysis_passes(sess, &expanded_crate, ast_map);
|
2013-12-19 09:18:37 -06:00
|
|
|
if stop_after_phase_3(sess) { return; }
|
2013-07-30 17:40:19 -05:00
|
|
|
let trans = phase_4_translate_to_llvm(sess, expanded_crate,
|
|
|
|
&analysis, outputs);
|
|
|
|
(outputs, trans)
|
2013-07-28 12:56:05 -05:00
|
|
|
};
|
2013-07-27 01:49:38 -05:00
|
|
|
phase_5_run_llvm_passes(sess, &trans, outputs);
|
|
|
|
if stop_after_phase_5(sess) { return; }
|
2013-12-26 13:55:10 -06:00
|
|
|
phase_6_link_output(sess, &trans, outputs);
|
2012-01-17 09:42:45 -06:00
|
|
|
}
|
|
|
|
|
2013-08-29 17:24:33 -05:00
|
|
|
struct IdentifiedAnnotation {
|
|
|
|
contents: (),
|
|
|
|
}
|
2013-07-27 01:49:38 -05:00
|
|
|
|
2014-01-09 07:05:33 -06:00
|
|
|
impl pprust::PpAnn for IdentifiedAnnotation {
|
|
|
|
fn pre(&self, node: pprust::AnnNode) {
|
2012-08-06 14:34:08 -05:00
|
|
|
match node {
|
2014-01-09 07:05:33 -06:00
|
|
|
pprust::NodeExpr(s, _) => pprust::popen(s),
|
2013-08-29 17:24:33 -05:00
|
|
|
_ => ()
|
|
|
|
}
|
|
|
|
}
|
2014-01-09 07:05:33 -06:00
|
|
|
fn post(&self, node: pprust::AnnNode) {
|
2013-08-29 17:24:33 -05:00
|
|
|
match node {
|
2014-01-09 07:05:33 -06:00
|
|
|
pprust::NodeItem(s, item) => {
|
2013-12-27 16:11:01 -06:00
|
|
|
pp::space(&mut s.s);
|
2013-08-29 17:24:33 -05:00
|
|
|
pprust::synth_comment(s, item.id.to_str());
|
|
|
|
}
|
2014-01-09 07:05:33 -06:00
|
|
|
pprust::NodeBlock(s, blk) => {
|
2013-12-27 16:11:01 -06:00
|
|
|
pp::space(&mut s.s);
|
2013-08-29 17:24:33 -05:00
|
|
|
pprust::synth_comment(s, ~"block " + blk.id.to_str());
|
|
|
|
}
|
2014-01-09 07:05:33 -06:00
|
|
|
pprust::NodeExpr(s, expr) => {
|
2013-12-27 16:11:01 -06:00
|
|
|
pp::space(&mut s.s);
|
2013-08-29 17:24:33 -05:00
|
|
|
pprust::synth_comment(s, expr.id.to_str());
|
|
|
|
pprust::pclose(s);
|
|
|
|
}
|
2014-01-09 07:05:33 -06:00
|
|
|
pprust::NodePat(s, pat) => {
|
2013-12-27 16:11:01 -06:00
|
|
|
pp::space(&mut s.s);
|
2013-08-29 17:24:33 -05:00
|
|
|
pprust::synth_comment(s, ~"pat " + pat.id.to_str());
|
|
|
|
}
|
2012-08-03 21:59:04 -05:00
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
2013-08-29 17:24:33 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
struct TypedAnnotation {
|
|
|
|
analysis: CrateAnalysis,
|
|
|
|
}
|
|
|
|
|
2014-01-09 07:05:33 -06:00
|
|
|
impl pprust::PpAnn for TypedAnnotation {
|
|
|
|
fn pre(&self, node: pprust::AnnNode) {
|
2013-08-29 17:24:33 -05:00
|
|
|
match node {
|
2014-01-09 07:05:33 -06:00
|
|
|
pprust::NodeExpr(s, _) => pprust::popen(s),
|
2013-08-29 17:24:33 -05:00
|
|
|
_ => ()
|
|
|
|
}
|
|
|
|
}
|
2014-01-09 07:05:33 -06:00
|
|
|
fn post(&self, node: pprust::AnnNode) {
|
2013-08-29 17:24:33 -05:00
|
|
|
let tcx = self.analysis.ty_cx;
|
|
|
|
match node {
|
2014-01-09 07:05:33 -06:00
|
|
|
pprust::NodeExpr(s, expr) => {
|
2013-12-27 16:11:01 -06:00
|
|
|
pp::space(&mut s.s);
|
|
|
|
pp::word(&mut s.s, "as");
|
|
|
|
pp::space(&mut s.s);
|
|
|
|
pp::word(&mut s.s, ppaux::ty_to_str(tcx, ty::expr_ty(tcx, expr)));
|
2013-08-29 17:24:33 -05:00
|
|
|
pprust::pclose(s);
|
|
|
|
}
|
|
|
|
_ => ()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn pretty_print_input(sess: Session,
|
|
|
|
cfg: ast::CrateConfig,
|
|
|
|
input: &input,
|
|
|
|
ppm: PpMode) {
|
2013-07-27 01:49:38 -05:00
|
|
|
let crate = phase_1_parse_input(sess, cfg.clone(), input);
|
|
|
|
|
2014-01-06 06:00:46 -06:00
|
|
|
let (crate, ast_map, is_expanded) = match ppm {
|
2013-08-31 11:13:04 -05:00
|
|
|
PpmExpanded | PpmExpandedIdentified | PpmTyped => {
|
2014-01-06 06:00:46 -06:00
|
|
|
let (crate, ast_map) = phase_2_configure_and_expand(sess, cfg, crate);
|
|
|
|
(crate, Some(ast_map), true)
|
2013-07-27 01:49:38 -05:00
|
|
|
}
|
2014-01-06 06:00:46 -06:00
|
|
|
_ => (crate, None, false)
|
2012-01-17 09:42:45 -06:00
|
|
|
};
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
let annotation = match ppm {
|
2013-08-31 11:13:04 -05:00
|
|
|
PpmIdentified | PpmExpandedIdentified => {
|
2013-08-29 17:24:33 -05:00
|
|
|
@IdentifiedAnnotation {
|
|
|
|
contents: (),
|
2014-01-09 07:05:33 -06:00
|
|
|
} as @pprust::PpAnn
|
2013-07-27 01:49:38 -05:00
|
|
|
}
|
2013-08-31 11:13:04 -05:00
|
|
|
PpmTyped => {
|
2014-01-06 06:00:46 -06:00
|
|
|
let ast_map = ast_map.expect("--pretty=typed missing ast_map");
|
|
|
|
let analysis = phase_3_run_analysis_passes(sess, &crate, ast_map);
|
2013-08-29 17:24:33 -05:00
|
|
|
@TypedAnnotation {
|
|
|
|
analysis: analysis
|
2014-01-09 07:05:33 -06:00
|
|
|
} as @pprust::PpAnn
|
2013-07-27 01:49:38 -05:00
|
|
|
}
|
2014-01-09 07:05:33 -06:00
|
|
|
_ => @pprust::NoAnn as @pprust::PpAnn,
|
2012-06-28 17:29:15 -05:00
|
|
|
};
|
2013-07-27 01:49:38 -05:00
|
|
|
|
2012-11-12 20:24:56 -06:00
|
|
|
let src = sess.codemap.get_filemap(source_name(input)).src;
|
2013-12-30 18:39:26 -06:00
|
|
|
let mut rdr = MemReader::new(src.as_bytes().to_owned());
|
2013-12-21 17:24:10 -06:00
|
|
|
let stdout = io::stdout();
|
2013-10-13 20:48:47 -05:00
|
|
|
pprust::print_crate(sess.codemap,
|
|
|
|
token::get_ident_interner(),
|
|
|
|
sess.span_diagnostic,
|
|
|
|
&crate,
|
|
|
|
source_name(input),
|
2013-12-30 18:39:26 -06:00
|
|
|
&mut rdr,
|
2013-12-27 16:28:54 -06:00
|
|
|
~stdout as ~io::Writer,
|
2013-10-13 20:48:47 -05:00
|
|
|
annotation,
|
|
|
|
is_expanded);
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2013-11-08 13:06:57 -06:00
|
|
|
pub fn get_os(triple: &str) -> Option<abi::Os> {
|
2013-08-03 11:45:23 -05:00
|
|
|
for &(name, os) in os_names.iter() {
|
2013-06-15 02:43:19 -05:00
|
|
|
if triple.contains(name) { return Some(os) }
|
|
|
|
}
|
|
|
|
None
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
2013-11-08 13:06:57 -06:00
|
|
|
static os_names : &'static [(&'static str, abi::Os)] = &'static [
|
|
|
|
("mingw32", abi::OsWin32),
|
|
|
|
("win32", abi::OsWin32),
|
|
|
|
("darwin", abi::OsMacos),
|
|
|
|
("android", abi::OsAndroid),
|
|
|
|
("linux", abi::OsLinux),
|
|
|
|
("freebsd", abi::OsFreebsd)];
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2013-03-13 21:25:28 -05:00
|
|
|
pub fn get_arch(triple: &str) -> Option<abi::Architecture> {
|
2013-08-03 11:45:23 -05:00
|
|
|
for &(arch, abi) in architecture_abis.iter() {
|
2013-06-15 02:43:19 -05:00
|
|
|
if triple.contains(arch) { return Some(abi) }
|
|
|
|
}
|
|
|
|
None
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
2013-06-15 02:43:19 -05:00
|
|
|
static architecture_abis : &'static [(&'static str, abi::Architecture)] = &'static [
|
|
|
|
("i386", abi::X86),
|
|
|
|
("i486", abi::X86),
|
|
|
|
("i586", abi::X86),
|
|
|
|
("i686", abi::X86),
|
|
|
|
("i786", abi::X86),
|
|
|
|
|
|
|
|
("x86_64", abi::X86_64),
|
|
|
|
|
|
|
|
("arm", abi::Arm),
|
|
|
|
("xscale", abi::Arm),
|
|
|
|
|
|
|
|
("mips", abi::Mips)];
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2013-01-29 17:16:07 -06:00
|
|
|
pub fn build_target_config(sopts: @session::options,
|
2013-08-29 20:34:09 -05:00
|
|
|
demitter: @diagnostic::Emitter)
|
|
|
|
-> @session::config {
|
2012-08-06 14:34:08 -05:00
|
|
|
let os = match get_os(sopts.target_triple) {
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(os) => os,
|
2013-10-04 12:46:53 -05:00
|
|
|
None => early_error(demitter, "unknown operating system")
|
2012-01-14 01:03:37 -06:00
|
|
|
};
|
2012-08-06 14:34:08 -05:00
|
|
|
let arch = match get_arch(sopts.target_triple) {
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(arch) => arch,
|
|
|
|
None => early_error(demitter,
|
2013-10-04 12:46:53 -05:00
|
|
|
"unknown architecture: " + sopts.target_triple)
|
2012-01-14 01:03:37 -06:00
|
|
|
};
|
2013-09-26 01:26:09 -05:00
|
|
|
let (int_type, uint_type) = match arch {
|
2014-01-09 07:05:33 -06:00
|
|
|
abi::X86 => (ast::TyI32, ast::TyU32),
|
|
|
|
abi::X86_64 => (ast::TyI64, ast::TyU64),
|
|
|
|
abi::Arm => (ast::TyI32, ast::TyU32),
|
|
|
|
abi::Mips => (ast::TyI32, ast::TyU32)
|
2011-12-20 04:17:13 -06:00
|
|
|
};
|
2013-08-24 12:54:42 -05:00
|
|
|
let target_triple = sopts.target_triple.clone();
|
2012-08-06 14:34:08 -05:00
|
|
|
let target_strs = match arch {
|
2013-08-24 12:54:42 -05:00
|
|
|
abi::X86 => x86::get_target_strs(target_triple, os),
|
|
|
|
abi::X86_64 => x86_64::get_target_strs(target_triple, os),
|
|
|
|
abi::Arm => arm::get_target_strs(target_triple, os),
|
|
|
|
abi::Mips => mips::get_target_strs(target_triple, os)
|
2011-12-20 04:17:13 -06:00
|
|
|
};
|
2013-02-19 01:40:42 -06:00
|
|
|
let target_cfg = @session::config {
|
|
|
|
os: os,
|
|
|
|
arch: arch,
|
|
|
|
target_strs: target_strs,
|
|
|
|
int_type: int_type,
|
|
|
|
uint_type: uint_type,
|
|
|
|
};
|
2012-08-01 19:30:05 -05:00
|
|
|
return target_cfg;
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2013-08-06 23:50:23 -05:00
|
|
|
pub fn host_triple() -> ~str {
|
|
|
|
// Get the host triple out of the build environment. This ensures that our
|
|
|
|
// idea of the host triple is the same as for the set of libraries we've
|
|
|
|
// actually built. We can't just take LLVM's host triple because they
|
|
|
|
// normalize all ix86 architectures to i386.
|
|
|
|
//
|
|
|
|
// Instead of grabbing the host triple (for the current host), we grab (at
|
|
|
|
// compile time) the target triple that this rustc is built with and
|
|
|
|
// calling that (at runtime) the host triple.
|
2013-10-21 04:18:21 -05:00
|
|
|
(env!("CFG_COMPILER")).to_owned()
|
2013-08-06 23:50:23 -05:00
|
|
|
}
|
|
|
|
|
2013-12-26 23:48:35 -06:00
|
|
|
pub fn build_session_options(binary: ~str,
|
2013-01-29 17:16:07 -06:00
|
|
|
matches: &getopts::Matches,
|
2013-08-29 20:34:09 -05:00
|
|
|
demitter: @diagnostic::Emitter)
|
|
|
|
-> @session::options {
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
let mut outputs = ~[];
|
|
|
|
if matches.opt_present("rlib") {
|
|
|
|
outputs.push(session::OutputRlib)
|
|
|
|
}
|
|
|
|
if matches.opt_present("staticlib") {
|
|
|
|
outputs.push(session::OutputStaticlib)
|
|
|
|
}
|
|
|
|
// dynamic libraries are the "compiler blesssed" default library
|
|
|
|
if matches.opt_present("dylib") || matches.opt_present("lib") {
|
|
|
|
outputs.push(session::OutputDylib)
|
|
|
|
}
|
|
|
|
if matches.opt_present("bin") {
|
|
|
|
outputs.push(session::OutputExecutable)
|
|
|
|
}
|
|
|
|
|
2013-09-17 20:42:23 -05:00
|
|
|
let parse_only = matches.opt_present("parse-only");
|
|
|
|
let no_trans = matches.opt_present("no-trans");
|
2013-12-26 16:39:36 -06:00
|
|
|
let no_analysis = matches.opt_present("no-analysis");
|
2012-04-12 19:30:52 -05:00
|
|
|
|
Nomenclature fixes in the lint checker. Fewer double-negatives.
New style is allow(foo), warn(foo), deny(foo) and forbid(foo),
mirrored by -A foo, -W foo, -D foo and -F foo on command line.
These replace -W no-foo, -W foo, -W err-foo, respectively.
Forbid is new, and means "deny, and you can't override it".
2012-07-26 19:08:21 -05:00
|
|
|
let lint_levels = [lint::allow, lint::warn,
|
|
|
|
lint::deny, lint::forbid];
|
|
|
|
let mut lint_opts = ~[];
|
2012-04-12 19:30:52 -05:00
|
|
|
let lint_dict = lint::get_lint_dict();
|
2013-08-03 11:45:23 -05:00
|
|
|
for level in lint_levels.iter() {
|
2012-09-19 18:55:01 -05:00
|
|
|
let level_name = lint::level_to_str(*level);
|
2013-04-23 04:08:13 -05:00
|
|
|
|
2013-06-11 06:37:22 -05:00
|
|
|
let level_short = level_name.slice_chars(0, 1);
|
2013-11-07 01:59:40 -06:00
|
|
|
let level_short = level_short.to_ascii().to_upper().into_str();
|
2013-09-17 20:42:23 -05:00
|
|
|
let flags = vec::append(matches.opt_strs(level_short),
|
|
|
|
matches.opt_strs(level_name));
|
2013-08-03 11:45:23 -05:00
|
|
|
for lint_name in flags.iter() {
|
2013-06-11 06:46:40 -05:00
|
|
|
let lint_name = lint_name.replace("-", "_");
|
2013-06-12 12:02:55 -05:00
|
|
|
match lint_dict.find_equiv(&lint_name) {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2013-09-28 00:38:08 -05:00
|
|
|
early_error(demitter, format!("unknown {} flag: {}",
|
2013-03-22 21:26:41 -05:00
|
|
|
level_name, lint_name));
|
Nomenclature fixes in the lint checker. Fewer double-negatives.
New style is allow(foo), warn(foo), deny(foo) and forbid(foo),
mirrored by -A foo, -W foo, -D foo and -F foo on command line.
These replace -W no-foo, -W foo, -W err-foo, respectively.
Forbid is new, and means "deny, and you can't override it".
2012-07-26 19:08:21 -05:00
|
|
|
}
|
2012-08-20 14:23:37 -05:00
|
|
|
Some(lint) => {
|
2012-09-26 19:33:34 -05:00
|
|
|
lint_opts.push((lint.lint, *level));
|
Nomenclature fixes in the lint checker. Fewer double-negatives.
New style is allow(foo), warn(foo), deny(foo) and forbid(foo),
mirrored by -A foo, -W foo, -D foo and -F foo on command line.
These replace -W no-foo, -W foo, -W err-foo, respectively.
Forbid is new, and means "deny, and you can't override it".
2012-07-26 19:08:21 -05:00
|
|
|
}
|
|
|
|
}
|
2012-04-12 19:30:52 -05:00
|
|
|
}
|
Nomenclature fixes in the lint checker. Fewer double-negatives.
New style is allow(foo), warn(foo), deny(foo) and forbid(foo),
mirrored by -A foo, -W foo, -D foo and -F foo on command line.
These replace -W no-foo, -W foo, -W err-foo, respectively.
Forbid is new, and means "deny, and you can't override it".
2012-07-26 19:08:21 -05:00
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2012-05-17 23:53:49 -05:00
|
|
|
let mut debugging_opts = 0u;
|
2013-09-17 20:42:23 -05:00
|
|
|
let debug_flags = matches.opt_strs("Z");
|
2012-05-17 23:53:49 -05:00
|
|
|
let debug_map = session::debugging_opts_map();
|
2013-08-03 11:45:23 -05:00
|
|
|
for debug_flag in debug_flags.iter() {
|
2012-05-17 23:53:49 -05:00
|
|
|
let mut this_bit = 0u;
|
2013-08-03 11:45:23 -05:00
|
|
|
for tuple in debug_map.iter() {
|
2013-03-20 00:17:42 -05:00
|
|
|
let (name, bit) = match *tuple { (ref a, _, b) => (a, b) };
|
2013-10-04 12:46:53 -05:00
|
|
|
if *name == *debug_flag { this_bit = bit; break; }
|
2012-05-17 23:53:49 -05:00
|
|
|
}
|
|
|
|
if this_bit == 0u {
|
2013-09-28 00:38:08 -05:00
|
|
|
early_error(demitter, format!("unknown debug flag: {}", *debug_flag))
|
2012-05-17 23:53:49 -05:00
|
|
|
}
|
|
|
|
debugging_opts |= this_bit;
|
|
|
|
}
|
2013-08-14 20:41:40 -05:00
|
|
|
|
2012-07-25 14:06:03 -05:00
|
|
|
if debugging_opts & session::debug_llvm != 0 {
|
2013-11-06 17:16:04 -06:00
|
|
|
unsafe { llvm::LLVMSetDebug(1); }
|
2012-07-25 14:06:03 -05:00
|
|
|
}
|
2012-05-17 23:53:49 -05:00
|
|
|
|
2011-12-20 04:17:13 -06:00
|
|
|
let output_type =
|
|
|
|
if parse_only || no_trans {
|
2014-01-09 19:42:08 -06:00
|
|
|
link::OutputTypeNone
|
2013-09-17 20:42:23 -05:00
|
|
|
} else if matches.opt_present("S") &&
|
|
|
|
matches.opt_present("emit-llvm") {
|
2014-01-09 19:42:08 -06:00
|
|
|
link::OutputTypeLlvmAssembly
|
2013-09-17 20:42:23 -05:00
|
|
|
} else if matches.opt_present("S") {
|
2014-01-09 19:42:08 -06:00
|
|
|
link::OutputTypeAssembly
|
2013-09-17 20:42:23 -05:00
|
|
|
} else if matches.opt_present("c") {
|
2014-01-09 19:42:08 -06:00
|
|
|
link::OutputTypeObject
|
2013-09-17 20:42:23 -05:00
|
|
|
} else if matches.opt_present("emit-llvm") {
|
2014-01-09 19:42:08 -06:00
|
|
|
link::OutputTypeBitcode
|
|
|
|
} else { link::OutputTypeExe };
|
2013-12-03 21:15:12 -06:00
|
|
|
let sysroot_opt = matches.opt_str("sysroot").map(|m| @Path::new(m));
|
2013-09-17 20:42:23 -05:00
|
|
|
let target = matches.opt_str("target").unwrap_or(host_triple());
|
|
|
|
let target_cpu = matches.opt_str("target-cpu").unwrap_or(~"generic");
|
|
|
|
let target_feature = matches.opt_str("target-feature").unwrap_or(~"");
|
|
|
|
let save_temps = matches.opt_present("save-temps");
|
2012-09-07 14:06:42 -05:00
|
|
|
let opt_level = {
|
|
|
|
if (debugging_opts & session::no_opt) != 0 {
|
|
|
|
No
|
2013-09-17 20:42:23 -05:00
|
|
|
} else if matches.opt_present("O") {
|
|
|
|
if matches.opt_present("opt-level") {
|
2013-10-04 12:46:53 -05:00
|
|
|
early_error(demitter, "-O and --opt-level both provided");
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
2012-08-21 19:22:45 -05:00
|
|
|
Default
|
2013-09-17 20:42:23 -05:00
|
|
|
} else if matches.opt_present("opt-level") {
|
|
|
|
match matches.opt_str("opt-level").unwrap() {
|
2012-08-21 19:22:45 -05:00
|
|
|
~"0" => No,
|
|
|
|
~"1" => Less,
|
|
|
|
~"2" => Default,
|
|
|
|
~"3" => Aggressive,
|
2012-08-03 21:59:04 -05:00
|
|
|
_ => {
|
2013-10-04 12:46:53 -05:00
|
|
|
early_error(demitter, "optimization level needs to be between 0-3")
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
}
|
2012-09-07 14:06:42 -05:00
|
|
|
} else { No }
|
|
|
|
};
|
2013-02-07 17:14:17 -06:00
|
|
|
let gc = debugging_opts & session::gc != 0;
|
|
|
|
let extra_debuginfo = debugging_opts & session::extra_debug_info != 0;
|
|
|
|
let debuginfo = debugging_opts & session::debug_info != 0 ||
|
|
|
|
extra_debuginfo;
|
2013-08-13 09:31:42 -05:00
|
|
|
|
2013-10-26 00:13:23 -05:00
|
|
|
let addl_lib_search_paths = matches.opt_strs("L").map(|s| {
|
2013-12-03 21:15:12 -06:00
|
|
|
Path::new(s.as_slice())
|
2013-10-26 00:13:23 -05:00
|
|
|
}).move_iter().collect();
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
let ar = matches.opt_str("ar");
|
2013-09-17 20:42:23 -05:00
|
|
|
let linker = matches.opt_str("linker");
|
|
|
|
let linker_args = matches.opt_strs("link-args").flat_map( |a| {
|
2013-12-01 04:08:46 -06:00
|
|
|
a.split(' ').filter_map(|arg| {
|
|
|
|
if arg.is_empty() {
|
|
|
|
None
|
|
|
|
} else {
|
|
|
|
Some(arg.to_owned())
|
|
|
|
}
|
|
|
|
}).collect()
|
2013-04-28 19:57:49 -05:00
|
|
|
});
|
|
|
|
|
2013-09-17 20:42:23 -05:00
|
|
|
let cfg = parse_cfgspecs(matches.opt_strs("cfg"), demitter);
|
|
|
|
let test = matches.opt_present("test");
|
|
|
|
let android_cross_path = matches.opt_str("android-cross-path");
|
2013-12-22 14:38:55 -06:00
|
|
|
let write_dependency_info = (matches.opt_present("dep-info"),
|
|
|
|
matches.opt_str("dep-info").map(|p| Path::new(p)));
|
2013-04-28 21:54:41 -05:00
|
|
|
|
2013-09-17 20:42:23 -05:00
|
|
|
let custom_passes = match matches.opt_str("passes") {
|
2013-05-29 03:08:20 -05:00
|
|
|
None => ~[],
|
|
|
|
Some(s) => {
|
2013-11-23 04:18:51 -06:00
|
|
|
s.split(|c: char| c == ' ' || c == ',').map(|s| {
|
2013-06-09 08:10:50 -05:00
|
|
|
s.trim().to_owned()
|
|
|
|
}).collect()
|
2013-05-29 03:08:20 -05:00
|
|
|
}
|
|
|
|
};
|
2013-09-17 20:42:23 -05:00
|
|
|
let llvm_args = match matches.opt_str("llvm-args") {
|
2013-08-30 19:56:04 -05:00
|
|
|
None => ~[],
|
|
|
|
Some(s) => {
|
2013-11-23 04:18:51 -06:00
|
|
|
s.split(|c: char| c == ' ' || c == ',').map(|s| {
|
2013-08-30 19:56:04 -05:00
|
|
|
s.trim().to_owned()
|
|
|
|
}).collect()
|
|
|
|
}
|
|
|
|
};
|
2013-12-19 09:18:37 -06:00
|
|
|
let print_metas = (matches.opt_present("crate-id"),
|
|
|
|
matches.opt_present("crate-name"),
|
|
|
|
matches.opt_present("crate-file-name"));
|
2013-05-29 03:08:20 -05:00
|
|
|
|
2013-02-19 01:40:42 -06:00
|
|
|
let sopts = @session::options {
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
outputs: outputs,
|
2013-02-19 01:40:42 -06:00
|
|
|
gc: gc,
|
|
|
|
optimize: opt_level,
|
2013-05-29 03:08:20 -05:00
|
|
|
custom_passes: custom_passes,
|
2013-08-30 19:56:04 -05:00
|
|
|
llvm_args: llvm_args,
|
2013-02-19 01:40:42 -06:00
|
|
|
debuginfo: debuginfo,
|
|
|
|
extra_debuginfo: extra_debuginfo,
|
|
|
|
lint_opts: lint_opts,
|
|
|
|
save_temps: save_temps,
|
|
|
|
output_type: output_type,
|
2013-12-21 16:28:04 -06:00
|
|
|
addl_lib_search_paths: @RefCell::new(addl_lib_search_paths),
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
ar: ar,
|
2013-05-02 16:12:47 -05:00
|
|
|
linker: linker,
|
2013-04-28 19:57:49 -05:00
|
|
|
linker_args: linker_args,
|
2013-02-19 01:40:42 -06:00
|
|
|
maybe_sysroot: sysroot_opt,
|
|
|
|
target_triple: target,
|
2013-08-08 21:16:00 -05:00
|
|
|
target_cpu: target_cpu,
|
2013-04-22 06:54:12 -05:00
|
|
|
target_feature: target_feature,
|
2013-02-19 01:40:42 -06:00
|
|
|
cfg: cfg,
|
|
|
|
binary: binary,
|
|
|
|
test: test,
|
|
|
|
parse_only: parse_only,
|
|
|
|
no_trans: no_trans,
|
2013-12-26 16:39:36 -06:00
|
|
|
no_analysis: no_analysis,
|
2013-03-04 22:12:23 -06:00
|
|
|
debugging_opts: debugging_opts,
|
2013-11-27 21:06:35 -06:00
|
|
|
android_cross_path: android_cross_path,
|
|
|
|
write_dependency_info: write_dependency_info,
|
2013-12-19 09:18:37 -06:00
|
|
|
print_metas: print_metas,
|
2013-02-19 01:40:42 -06:00
|
|
|
};
|
2012-08-01 19:30:05 -05:00
|
|
|
return sopts;
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2013-08-29 20:34:09 -05:00
|
|
|
pub fn build_session(sopts: @session::options, demitter: @diagnostic::Emitter)
|
|
|
|
-> Session {
|
2012-11-12 20:24:56 -06:00
|
|
|
let codemap = @codemap::CodeMap::new();
|
2012-02-17 16:15:09 -06:00
|
|
|
let diagnostic_handler =
|
2012-08-20 14:23:37 -05:00
|
|
|
diagnostic::mk_handler(Some(demitter));
|
2012-02-17 16:15:09 -06:00
|
|
|
let span_diagnostic_handler =
|
|
|
|
diagnostic::mk_span_handler(diagnostic_handler, codemap);
|
2012-03-21 17:56:20 -05:00
|
|
|
build_session_(sopts, codemap, demitter, span_diagnostic_handler)
|
2012-02-17 16:15:09 -06:00
|
|
|
}
|
|
|
|
|
2013-01-29 17:16:07 -06:00
|
|
|
pub fn build_session_(sopts: @session::options,
|
|
|
|
cm: @codemap::CodeMap,
|
2013-08-29 20:34:09 -05:00
|
|
|
demitter: @diagnostic::Emitter,
|
2013-12-27 15:48:00 -06:00
|
|
|
span_diagnostic_handler: @diagnostic::SpanHandler)
|
2013-08-29 20:34:09 -05:00
|
|
|
-> Session {
|
2012-01-14 01:18:01 -06:00
|
|
|
let target_cfg = build_target_config(sopts, demitter);
|
2012-07-18 18:18:02 -05:00
|
|
|
let p_s = parse::new_parse_sess_special_handler(span_diagnostic_handler,
|
|
|
|
cm);
|
2013-12-20 22:00:58 -06:00
|
|
|
let cstore = @CStore::new(token::get_ident_interner());
|
2011-12-20 04:17:13 -06:00
|
|
|
let filesearch = filesearch::mk_filesearch(
|
2013-04-17 11:15:37 -05:00
|
|
|
&sopts.maybe_sysroot,
|
2011-12-20 04:17:13 -06:00
|
|
|
sopts.target_triple,
|
2013-05-27 19:45:16 -05:00
|
|
|
sopts.addl_lib_search_paths);
|
2013-02-04 16:02:01 -06:00
|
|
|
@Session_ {
|
|
|
|
targ_cfg: target_cfg,
|
|
|
|
opts: sopts,
|
|
|
|
cstore: cstore,
|
|
|
|
parse_sess: p_s,
|
|
|
|
codemap: cm,
|
|
|
|
// For a library crate, this is always none
|
2013-12-21 19:25:27 -06:00
|
|
|
entry_fn: RefCell::new(None),
|
|
|
|
entry_type: Cell::new(None),
|
2013-02-04 16:02:01 -06:00
|
|
|
span_diagnostic: span_diagnostic_handler,
|
|
|
|
filesearch: filesearch,
|
2013-12-22 16:40:03 -06:00
|
|
|
building_library: Cell::new(false),
|
2013-02-04 16:02:01 -06:00
|
|
|
working_dir: os::getcwd(),
|
2013-12-20 22:04:17 -06:00
|
|
|
lints: RefCell::new(HashMap::new()),
|
2013-12-22 16:36:50 -06:00
|
|
|
node_id: Cell::new(1),
|
2013-12-22 16:51:06 -06:00
|
|
|
outputs: @RefCell::new(~[]),
|
2013-02-04 16:02:01 -06:00
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2013-08-31 11:13:04 -05:00
|
|
|
pub fn parse_pretty(sess: Session, name: &str) -> PpMode {
|
2012-08-06 14:34:08 -05:00
|
|
|
match name {
|
2013-08-31 11:13:04 -05:00
|
|
|
&"normal" => PpmNormal,
|
|
|
|
&"expanded" => PpmExpanded,
|
|
|
|
&"typed" => PpmTyped,
|
|
|
|
&"expanded,identified" => PpmExpandedIdentified,
|
|
|
|
&"identified" => PpmIdentified,
|
2012-08-02 17:42:56 -05:00
|
|
|
_ => {
|
2013-05-19 00:07:44 -05:00
|
|
|
sess.fatal("argument to `pretty` must be one of `normal`, \
|
|
|
|
`expanded`, `typed`, `identified`, \
|
|
|
|
or `expanded,identified`");
|
2012-08-02 17:42:56 -05:00
|
|
|
}
|
2012-03-12 12:19:35 -05:00
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2012-10-11 18:54:31 -05:00
|
|
|
// rustc command line options
|
2013-01-29 17:16:07 -06:00
|
|
|
pub fn optgroups() -> ~[getopts::groups::OptGroup] {
|
2012-10-11 18:54:31 -05:00
|
|
|
~[
|
2013-04-28 19:57:49 -05:00
|
|
|
optflag("c", "", "Compile and assemble, but do not link"),
|
|
|
|
optmulti("", "cfg", "Configure the compilation
|
|
|
|
environment", "SPEC"),
|
|
|
|
optflag("", "emit-llvm",
|
2013-08-05 17:49:01 -05:00
|
|
|
"Produce an LLVM assembly file if used with -S option;
|
|
|
|
produce an LLVM bitcode file otherwise"),
|
2013-04-28 19:57:49 -05:00
|
|
|
optflag("h", "help","Display this message"),
|
|
|
|
optmulti("L", "", "Add a directory to the library search path",
|
|
|
|
"PATH"),
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
optflag("", "bin", "Compile an executable crate (default)"),
|
|
|
|
optflag("", "lib", "Compile a rust library crate using the compiler's default"),
|
|
|
|
optflag("", "rlib", "Compile a rust library crate as an rlib file"),
|
|
|
|
optflag("", "staticlib", "Compile a static library crate"),
|
|
|
|
optflag("", "dylib", "Compile a dynamic library crate"),
|
2013-05-02 16:12:47 -05:00
|
|
|
optopt("", "linker", "Program to use for linking instead of the default.", "LINKER"),
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
optopt("", "ar", "Program to use for managing archives instead of the default.", "AR"),
|
2013-12-19 09:18:37 -06:00
|
|
|
optflag("", "crate-id", "Output the crate id and exit"),
|
|
|
|
optflag("", "crate-name", "Output the crate name and exit"),
|
|
|
|
optflag("", "crate-file-name", "Output the file(s) that would be written if compilation \
|
|
|
|
continued and exit"),
|
2013-05-02 11:46:58 -05:00
|
|
|
optmulti("", "link-args", "FLAGS is a space-separated list of flags
|
2013-04-28 19:57:49 -05:00
|
|
|
passed to the linker", "FLAGS"),
|
|
|
|
optflag("", "ls", "List the symbols defined by a library crate"),
|
|
|
|
optflag("", "no-trans",
|
|
|
|
"Run all passes except translation; no output"),
|
2013-12-26 16:39:36 -06:00
|
|
|
optflag("", "no-analysis",
|
|
|
|
"Parse and expand the output, but run no analysis or produce \
|
|
|
|
output"),
|
2013-04-28 19:57:49 -05:00
|
|
|
optflag("O", "", "Equivalent to --opt-level=2"),
|
|
|
|
optopt("o", "", "Write output to <filename>", "FILENAME"),
|
|
|
|
optopt("", "opt-level",
|
|
|
|
"Optimize with possible levels 0-3", "LEVEL"),
|
2013-05-29 03:08:20 -05:00
|
|
|
optopt("", "passes", "Comma or space separated list of pass names to use. \
|
2013-08-22 22:58:42 -05:00
|
|
|
Appends to the default list of passes to run for the \
|
|
|
|
specified current optimization level. A value of \
|
|
|
|
\"list\" will list all of the available passes", "NAMES"),
|
2013-08-30 19:56:04 -05:00
|
|
|
optopt("", "llvm-args", "A list of arguments to pass to llvm, comma \
|
|
|
|
separated", "ARGS"),
|
2013-04-28 19:57:49 -05:00
|
|
|
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",
|
|
|
|
"Pretty-print the input instead of compiling;
|
2012-10-11 18:54:31 -05:00
|
|
|
valid types are: normal (un-annotated source),
|
|
|
|
expanded (crates expanded),
|
|
|
|
typed (crates expanded, with type annotations),
|
|
|
|
or identified (fully parenthesized,
|
2013-04-28 19:57:49 -05:00
|
|
|
AST nodes and blocks with IDs)", "TYPE"),
|
|
|
|
optflag("S", "", "Compile only; do not assemble or link"),
|
2013-12-22 14:38:55 -06:00
|
|
|
optflagopt("", "dep-info",
|
|
|
|
"Output dependency info to <filename> after compiling", "FILENAME"),
|
2013-04-28 19:57:49 -05:00
|
|
|
optflag("", "save-temps",
|
|
|
|
"Write intermediate files (.bc, .opt.bc, .o)
|
2012-10-11 18:54:31 -05:00
|
|
|
in addition to normal output"),
|
2013-04-28 19:57:49 -05:00
|
|
|
optopt("", "sysroot",
|
|
|
|
"Override the system root", "PATH"),
|
|
|
|
optflag("", "test", "Build a test harness"),
|
|
|
|
optopt("", "target",
|
|
|
|
"Target triple cpu-manufacturer-kernel[-os]
|
2013-03-28 15:44:46 -05:00
|
|
|
to compile for (see chapter 3.4 of http://www.sourceware.org/autobook/
|
2013-08-08 21:16:00 -05:00
|
|
|
for details)", "TRIPLE"),
|
|
|
|
optopt("", "target-cpu",
|
|
|
|
"Select target processor (llc -mcpu=help
|
|
|
|
for details)", "CPU"),
|
2013-04-28 19:57:49 -05:00
|
|
|
optopt("", "target-feature",
|
|
|
|
"Target specific attributes (llc -mattr=help
|
2013-08-08 21:16:00 -05:00
|
|
|
for details)", "FEATURE"),
|
2013-04-28 19:57:49 -05:00
|
|
|
optopt("", "android-cross-path",
|
|
|
|
"The path to the Android NDK", "PATH"),
|
2013-05-24 14:32:30 -05:00
|
|
|
optflagopt("W", "warn",
|
2013-04-28 19:57:49 -05:00
|
|
|
"Set lint warnings", "OPT"),
|
|
|
|
optmulti("A", "allow",
|
|
|
|
"Set lint allowed", "OPT"),
|
|
|
|
optmulti("D", "deny",
|
|
|
|
"Set lint denied", "OPT"),
|
|
|
|
optmulti("F", "forbid",
|
|
|
|
"Set lint forbidden", "OPT"),
|
|
|
|
optmulti("Z", "", "Set internal debugging options", "FLAG"),
|
|
|
|
optflag( "v", "version",
|
|
|
|
"Print version info and exit"),
|
2012-10-11 18:54:31 -05:00
|
|
|
]
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2013-02-19 01:40:42 -06:00
|
|
|
pub struct OutputFilenames {
|
|
|
|
out_filename: Path,
|
|
|
|
obj_filename: Path
|
|
|
|
}
|
2012-01-17 09:42:45 -06:00
|
|
|
|
2013-04-17 11:15:37 -05:00
|
|
|
pub fn build_output_filenames(input: &input,
|
2013-01-29 17:16:07 -06:00
|
|
|
odir: &Option<Path>,
|
|
|
|
ofile: &Option<Path>,
|
2013-07-19 06:51:37 -05:00
|
|
|
attrs: &[ast::Attribute],
|
2013-01-29 17:16:07 -06:00
|
|
|
sess: Session)
|
2013-07-27 01:49:38 -05:00
|
|
|
-> ~OutputFilenames {
|
2012-06-14 14:40:49 -05:00
|
|
|
let obj_path;
|
|
|
|
let out_path;
|
2012-01-12 10:59:49 -06:00
|
|
|
let sopts = sess.opts;
|
2014-01-09 19:42:08 -06:00
|
|
|
let stop_after_codegen = sopts.output_type != link::OutputTypeExe;
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
|
|
|
|
let obj_suffix = match sopts.output_type {
|
2014-01-09 19:42:08 -06:00
|
|
|
link::OutputTypeNone => ~"none",
|
|
|
|
link::OutputTypeBitcode => ~"bc",
|
|
|
|
link::OutputTypeAssembly => ~"s",
|
|
|
|
link::OutputTypeLlvmAssembly => ~"ll",
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
// Object and exe output both use the '.o' extension here
|
2014-01-09 19:42:08 -06:00
|
|
|
link::OutputTypeObject | link::OutputTypeExe => ~"o"
|
Add generation of static libraries to rustc
This commit implements the support necessary for generating both intermediate
and result static rust libraries. This is an implementation of my thoughts in
https://mail.mozilla.org/pipermail/rust-dev/2013-November/006686.html.
When compiling a library, we still retain the "lib" option, although now there
are "rlib", "staticlib", and "dylib" as options for crate_type (and these are
stackable). The idea of "lib" is to generate the "compiler default" instead of
having too choose (although all are interchangeable). For now I have left the
"complier default" to be a dynamic library for size reasons.
Of the rust libraries, lib{std,extra,rustuv} will bootstrap with an
rlib/dylib pair, but lib{rustc,syntax,rustdoc,rustpkg} will only be built as a
dynamic object. I chose this for size reasons, but also because you're probably
not going to be embedding the rustc compiler anywhere any time soon.
Other than the options outlined above, there are a few defaults/preferences that
are now opinionated in the compiler:
* If both a .dylib and .rlib are found for a rust library, the compiler will
prefer the .rlib variant. This is overridable via the -Z prefer-dynamic option
* If generating a "lib", the compiler will generate a dynamic library. This is
overridable by explicitly saying what flavor you'd like (rlib, staticlib,
dylib).
* If no options are passed to the command line, and no crate_type is found in
the destination crate, then an executable is generated
With this change, you can successfully build a rust program with 0 dynamic
dependencies on rust libraries. There is still a dynamic dependency on
librustrt, but I plan on removing that in a subsequent commit.
This change includes no tests just yet. Our current testing
infrastructure/harnesses aren't very amenable to doing flavorful things with
linking, so I'm planning on adding a new mode of testing which I believe belongs
as a separate commit.
Closes #552
2013-11-15 16:03:29 -06:00
|
|
|
};
|
2011-12-20 04:17:13 -06:00
|
|
|
|
2012-08-24 17:28:43 -05:00
|
|
|
match *ofile {
|
2012-08-20 14:23:37 -05:00
|
|
|
None => {
|
2013-05-27 19:45:16 -05:00
|
|
|
// "-" as input file will cause the parser to read from stdin so we
|
|
|
|
// have to make up a name
|
|
|
|
// We want to toss everything after the final '.'
|
|
|
|
let dirpath = match *odir {
|
2013-07-02 14:47:32 -05:00
|
|
|
Some(ref d) => (*d).clone(),
|
2013-05-27 19:45:16 -05:00
|
|
|
None => match *input {
|
|
|
|
str_input(_) => os::getcwd(),
|
|
|
|
file_input(ref ifile) => (*ifile).dir_path()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut stem = match *input {
|
2013-09-26 19:21:59 -05:00
|
|
|
// FIXME (#9639): This needs to handle non-utf8 paths
|
|
|
|
file_input(ref ifile) => (*ifile).filestem_str().unwrap().to_managed(),
|
2013-06-12 12:02:55 -05:00
|
|
|
str_input(_) => @"rust_out"
|
2013-05-27 19:45:16 -05:00
|
|
|
};
|
|
|
|
|
2013-12-27 18:14:01 -06:00
|
|
|
// If a crateid is present, we use it as the link name
|
|
|
|
let crateid = attr::find_crateid(attrs);
|
|
|
|
match crateid {
|
2013-12-09 15:56:53 -06:00
|
|
|
None => {}
|
2013-12-27 18:14:01 -06:00
|
|
|
Some(crateid) => {
|
|
|
|
stem = crateid.name.to_managed()
|
2013-05-27 19:45:16 -05:00
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2013-12-22 16:40:03 -06:00
|
|
|
if sess.building_library.get() {
|
2013-10-05 21:49:32 -05:00
|
|
|
out_path = dirpath.join(os::dll_filename(stem));
|
2013-09-26 19:21:59 -05:00
|
|
|
obj_path = {
|
2013-10-05 21:49:32 -05:00
|
|
|
let mut p = dirpath.join(stem);
|
|
|
|
p.set_extension(obj_suffix);
|
2013-09-26 19:21:59 -05:00
|
|
|
p
|
|
|
|
};
|
2013-05-27 19:45:16 -05:00
|
|
|
} else {
|
2013-10-05 21:49:32 -05:00
|
|
|
out_path = dirpath.join(stem);
|
|
|
|
obj_path = out_path.with_extension(obj_suffix);
|
2013-05-27 19:45:16 -05:00
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2012-12-04 12:50:00 -06:00
|
|
|
Some(ref out_file) => {
|
2013-09-26 19:21:59 -05:00
|
|
|
out_path = out_file.clone();
|
2011-12-20 04:17:13 -06:00
|
|
|
obj_path = if stop_after_codegen {
|
2013-09-26 19:21:59 -05:00
|
|
|
out_file.clone()
|
2011-12-20 04:17:13 -06:00
|
|
|
} else {
|
2013-10-05 21:49:32 -05:00
|
|
|
out_file.with_extension(obj_suffix)
|
2011-12-20 04:17:13 -06:00
|
|
|
};
|
|
|
|
|
2013-12-22 16:40:03 -06:00
|
|
|
if sess.building_library.get() {
|
2013-07-30 17:40:19 -05:00
|
|
|
sess.warn("ignoring specified output filename for library.");
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2012-08-20 14:23:37 -05:00
|
|
|
if *odir != None {
|
2013-05-19 00:07:44 -05:00
|
|
|
sess.warn("ignoring --out-dir flag due to -o flag.");
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-02-19 01:40:42 -06:00
|
|
|
|
2013-07-27 01:49:38 -05:00
|
|
|
~OutputFilenames {
|
2013-02-19 01:40:42 -06:00
|
|
|
out_filename: out_path,
|
|
|
|
obj_filename: obj_path
|
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2013-12-26 23:48:35 -06:00
|
|
|
pub fn early_error(emitter: &diagnostic::Emitter, msg: &str) -> ! {
|
2014-01-09 07:05:33 -06:00
|
|
|
emitter.emit(None, msg, diagnostic::Fatal);
|
2013-10-21 15:08:31 -05:00
|
|
|
fail!();
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
2013-12-21 17:24:10 -06:00
|
|
|
pub fn list_metadata(sess: Session, path: &Path, out: &mut io::Writer) {
|
2012-05-22 19:16:26 -05:00
|
|
|
metadata::loader::list_file_metadata(
|
2013-05-14 19:27:27 -05:00
|
|
|
token::get_ident_interner(),
|
2012-05-22 19:16:26 -05:00
|
|
|
session::sess_os_to_meta_os(sess.targ_cfg.os), path, out);
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
2013-04-15 10:08:52 -05:00
|
|
|
mod test {
|
2013-05-22 21:59:22 -05:00
|
|
|
|
2013-01-08 21:37:25 -06:00
|
|
|
use driver::driver::{build_configuration, build_session};
|
2013-08-13 19:06:27 -05:00
|
|
|
use driver::driver::{build_session_options, optgroups};
|
2013-01-08 21:37:25 -06:00
|
|
|
|
2013-05-18 14:39:17 -05:00
|
|
|
use extra::getopts::groups::getopts;
|
2012-12-27 17:49:26 -06:00
|
|
|
use syntax::attr;
|
2014-01-07 02:57:12 -06:00
|
|
|
use syntax::attr::AttrMetaMethods;
|
2012-12-27 17:49:26 -06:00
|
|
|
use syntax::diagnostic;
|
|
|
|
|
2011-12-20 04:17:13 -06:00
|
|
|
// When the user supplies --test we should implicitly supply --cfg test
|
|
|
|
#[test]
|
2013-04-15 10:08:52 -05:00
|
|
|
fn test_switch_implies_cfg_test() {
|
2012-07-31 18:38:41 -05:00
|
|
|
let matches =
|
2013-05-27 18:04:00 -05:00
|
|
|
&match getopts([~"--test"], optgroups()) {
|
2013-05-29 18:59:33 -05:00
|
|
|
Ok(m) => m,
|
2013-10-21 15:08:31 -05:00
|
|
|
Err(f) => fail!("test_switch_implies_cfg_test: {}", f.to_err_msg())
|
2011-12-20 04:17:13 -06:00
|
|
|
};
|
2012-08-29 21:24:43 -05:00
|
|
|
let sessopts = build_session_options(
|
2013-12-26 23:48:35 -06:00
|
|
|
~"rustc",
|
2013-09-17 01:37:54 -05:00
|
|
|
matches,
|
|
|
|
@diagnostic::DefaultEmitter as @diagnostic::Emitter);
|
|
|
|
let sess = build_session(sessopts,
|
|
|
|
@diagnostic::DefaultEmitter as
|
|
|
|
@diagnostic::Emitter);
|
2013-08-13 19:06:27 -05:00
|
|
|
let cfg = build_configuration(sess);
|
2013-05-23 11:39:10 -05:00
|
|
|
assert!((attr::contains_name(cfg, "test")));
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
// When the user supplies --test and --cfg test, don't implicitly add
|
|
|
|
// another --cfg test
|
|
|
|
#[test]
|
2013-04-15 10:08:52 -05:00
|
|
|
fn test_switch_implies_cfg_test_unless_cfg_test() {
|
2012-07-31 18:38:41 -05:00
|
|
|
let matches =
|
2013-05-23 11:39:10 -05:00
|
|
|
&match getopts([~"--test", ~"--cfg=test"], optgroups()) {
|
2013-05-29 18:59:33 -05:00
|
|
|
Ok(m) => m,
|
|
|
|
Err(f) => {
|
2013-10-21 15:08:31 -05:00
|
|
|
fail!("test_switch_implies_cfg_test_unless_cfg_test: {}",
|
2013-09-28 00:38:08 -05:00
|
|
|
f.to_err_msg());
|
2012-07-14 00:57:48 -05:00
|
|
|
}
|
2011-12-20 04:17:13 -06:00
|
|
|
};
|
2012-08-29 21:24:43 -05:00
|
|
|
let sessopts = build_session_options(
|
2013-12-26 23:48:35 -06:00
|
|
|
~"rustc",
|
2013-09-17 01:37:54 -05:00
|
|
|
matches,
|
|
|
|
@diagnostic::DefaultEmitter as @diagnostic::Emitter);
|
|
|
|
let sess = build_session(sessopts,
|
|
|
|
@diagnostic::DefaultEmitter as
|
|
|
|
@diagnostic::Emitter);
|
2013-08-13 19:06:27 -05:00
|
|
|
let cfg = build_configuration(sess);
|
2013-07-19 06:51:37 -05:00
|
|
|
let mut test_items = cfg.iter().filter(|m| "test" == m.name());
|
|
|
|
assert!(test_items.next().is_some());
|
|
|
|
assert!(test_items.next().is_none());
|
2011-12-20 04:17:13 -06:00
|
|
|
}
|
|
|
|
}
|