2012-12-03 16:48:01 -08:00
|
|
|
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// 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.
|
|
|
|
|
2011-06-27 16:03:01 -07:00
|
|
|
// Metadata encoding
|
|
|
|
|
2013-05-17 15:28:44 -07:00
|
|
|
|
2012-12-23 17:41:37 -05:00
|
|
|
use metadata::common::*;
|
|
|
|
use metadata::cstore;
|
|
|
|
use metadata::decoder;
|
|
|
|
use metadata::tyencode;
|
2013-07-16 16:28:33 -07:00
|
|
|
use middle::ty::{node_id_to_type, lookup_item_type};
|
2013-08-07 00:11:34 -07:00
|
|
|
use middle::astencode;
|
2012-12-23 17:41:37 -05:00
|
|
|
use middle::ty;
|
2013-07-22 16:40:31 -07:00
|
|
|
use middle::typeck;
|
2012-12-23 17:41:37 -05:00
|
|
|
use middle;
|
2012-04-26 12:15:46 -07:00
|
|
|
|
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 17:41:01 -08:00
|
|
|
use std::cast;
|
2013-12-18 16:53:23 -08:00
|
|
|
use std::cell::RefCell;
|
2013-06-28 18:32:26 -04:00
|
|
|
use std::hashmap::{HashMap, HashSet};
|
2013-11-10 22:46:32 -08:00
|
|
|
use std::io::mem::MemWriter;
|
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 17:41:01 -08:00
|
|
|
use std::io::{Writer, Seek, Decorator};
|
2013-06-28 18:32:26 -04:00
|
|
|
use std::str;
|
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 17:41:01 -08:00
|
|
|
use std::util;
|
2013-06-28 18:32:26 -04:00
|
|
|
use std::vec;
|
2013-10-21 17:11:42 -07:00
|
|
|
|
2013-05-18 12:39:17 -07:00
|
|
|
use extra::serialize::Encodable;
|
2013-10-21 17:11:42 -07:00
|
|
|
|
2013-03-13 22:25:28 -04:00
|
|
|
use syntax::abi::AbiSet;
|
2012-09-04 11:54:36 -07:00
|
|
|
use syntax::ast::*;
|
2012-12-23 17:41:37 -05:00
|
|
|
use syntax::ast;
|
2012-09-04 11:54:36 -07:00
|
|
|
use syntax::ast_map;
|
2012-12-23 17:41:37 -05:00
|
|
|
use syntax::ast_util::*;
|
2012-09-04 11:54:36 -07:00
|
|
|
use syntax::attr;
|
2013-07-19 21:51:37 +10:00
|
|
|
use syntax::attr::AttrMetaMethods;
|
2012-09-04 11:54:36 -07:00
|
|
|
use syntax::diagnostic::span_handler;
|
2013-05-24 19:35:29 -07:00
|
|
|
use syntax::parse::token::special_idents;
|
2013-08-12 14:05:43 +02:00
|
|
|
use syntax::ast_util;
|
2013-08-20 14:55:54 -07:00
|
|
|
use syntax::visit::Visitor;
|
2013-08-12 14:05:43 +02:00
|
|
|
use syntax::visit;
|
2013-05-14 17:27:27 -07:00
|
|
|
use syntax::parse::token;
|
2012-12-23 17:41:37 -05:00
|
|
|
use syntax;
|
2013-05-18 12:39:17 -07:00
|
|
|
use writer = extra::ebml::writer;
|
2012-09-19 13:13:24 -07:00
|
|
|
|
2012-02-14 15:21:53 -08:00
|
|
|
// used by astencode:
|
2013-12-20 20:18:52 -08:00
|
|
|
type abbrev_map = @RefCell<HashMap<ty::t, tyencode::ty_abbrev>>;
|
2011-07-07 23:55:41 -07:00
|
|
|
|
2013-12-09 23:16:18 -08:00
|
|
|
pub type encode_inlined_item<'a> = 'a |ecx: &EncodeContext,
|
2013-11-19 17:36:32 -08:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
path: &[ast_map::path_elt],
|
|
|
|
ii: ast::inlined_item|;
|
2012-05-14 17:38:17 -07:00
|
|
|
|
2013-12-09 23:16:18 -08:00
|
|
|
pub struct EncodeParams<'a> {
|
2013-08-11 13:26:59 -04:00
|
|
|
diag: @mut span_handler,
|
2012-05-13 17:01:52 -07:00
|
|
|
tcx: ty::ctxt,
|
2012-08-29 13:26:26 -07:00
|
|
|
reexports2: middle::resolve::ExportMap2,
|
2013-12-18 16:53:23 -08:00
|
|
|
item_symbols: &'a RefCell<HashMap<ast::NodeId, ~str>>,
|
2013-12-18 18:11:41 -08:00
|
|
|
non_inlineable_statics: &'a RefCell<HashSet<ast::NodeId>>,
|
2013-12-09 23:16:18 -08:00
|
|
|
link_meta: &'a LinkMeta,
|
2013-12-20 20:00:58 -08:00
|
|
|
cstore: @cstore::CStore,
|
2013-12-09 23:16:18 -08:00
|
|
|
encode_inlined_item: encode_inlined_item<'a>,
|
2013-12-20 20:14:51 -08:00
|
|
|
reachable: @RefCell<HashSet<ast::NodeId>>,
|
2013-02-19 02:40:42 -05:00
|
|
|
}
|
2012-05-13 17:01:52 -07:00
|
|
|
|
2013-02-04 14:02:01 -08:00
|
|
|
struct Stats {
|
2013-10-21 17:11:42 -07:00
|
|
|
inline_bytes: u64,
|
|
|
|
attr_bytes: u64,
|
|
|
|
dep_bytes: u64,
|
|
|
|
lang_item_bytes: u64,
|
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 14:03:29 -08:00
|
|
|
native_lib_bytes: u64,
|
2013-10-21 17:11:42 -07:00
|
|
|
impl_bytes: u64,
|
|
|
|
misc_bytes: u64,
|
|
|
|
item_bytes: u64,
|
|
|
|
index_bytes: u64,
|
|
|
|
zero_bytes: u64,
|
|
|
|
total_bytes: u64,
|
2013-02-04 14:02:01 -08:00
|
|
|
|
|
|
|
n_inlines: uint
|
|
|
|
}
|
2012-08-27 16:53:54 -07:00
|
|
|
|
2013-12-09 23:16:18 -08:00
|
|
|
pub struct EncodeContext<'a> {
|
2013-08-11 13:26:59 -04:00
|
|
|
diag: @mut span_handler,
|
2012-05-13 17:01:52 -07:00
|
|
|
tcx: ty::ctxt,
|
2013-02-04 14:02:01 -08:00
|
|
|
stats: @mut Stats,
|
2012-08-29 13:26:26 -07:00
|
|
|
reexports2: middle::resolve::ExportMap2,
|
2013-12-18 16:53:23 -08:00
|
|
|
item_symbols: &'a RefCell<HashMap<ast::NodeId, ~str>>,
|
2013-12-18 18:11:41 -08:00
|
|
|
non_inlineable_statics: &'a RefCell<HashSet<ast::NodeId>>,
|
2013-12-09 23:16:18 -08:00
|
|
|
link_meta: &'a LinkMeta,
|
|
|
|
cstore: &'a cstore::CStore,
|
|
|
|
encode_inlined_item: encode_inlined_item<'a>,
|
2013-06-18 09:39:16 -07:00
|
|
|
type_abbrevs: abbrev_map,
|
2013-12-20 20:14:51 -08:00
|
|
|
reachable: @RefCell<HashSet<ast::NodeId>>,
|
2013-02-19 02:40:42 -05:00
|
|
|
}
|
2011-07-07 23:55:41 -07:00
|
|
|
|
2013-07-27 10:25:59 +02:00
|
|
|
pub fn reachable(ecx: &EncodeContext, id: NodeId) -> bool {
|
2013-12-20 20:14:51 -08:00
|
|
|
let reachable = ecx.reachable.borrow();
|
|
|
|
reachable.get().contains(&id)
|
2012-04-23 23:40:53 -07:00
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_name(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-09-02 02:50:59 +02:00
|
|
|
name: Ident) {
|
2013-06-13 03:02:55 +10:00
|
|
|
ebml_w.wr_tagged_str(tag_paths_data_name, ecx.tcx.sess.str_of(name));
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_impl_type_basename(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-09-02 02:50:59 +02:00
|
|
|
name: Ident) {
|
2012-10-18 13:29:34 -07:00
|
|
|
ebml_w.wr_tagged_str(tag_item_impl_type_basename,
|
2013-06-13 03:02:55 +10:00
|
|
|
ecx.tcx.sess.str_of(name));
|
2012-10-18 13:29:34 -07:00
|
|
|
}
|
|
|
|
|
2013-09-02 03:45:37 +02:00
|
|
|
pub fn encode_def_id(ebml_w: &mut writer::Encoder, id: DefId) {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.wr_tagged_str(tag_def_id, def_to_str(id));
|
2012-02-06 07:13:14 -08:00
|
|
|
}
|
|
|
|
|
2013-07-02 12:47:32 -07:00
|
|
|
#[deriving(Clone)]
|
2013-02-19 02:40:42 -05:00
|
|
|
struct entry<T> {
|
|
|
|
val: T,
|
2013-10-21 17:11:42 -07:00
|
|
|
pos: u64
|
2013-02-19 02:40:42 -05:00
|
|
|
}
|
2011-07-26 14:06:02 +02:00
|
|
|
|
2013-05-01 17:54:54 -07:00
|
|
|
fn encode_trait_ref(ebml_w: &mut writer::Encoder,
|
2013-06-13 19:19:50 +12:00
|
|
|
ecx: &EncodeContext,
|
2013-03-27 06:16:28 -04:00
|
|
|
trait_ref: &ty::TraitRef,
|
2013-05-01 17:54:54 -07:00
|
|
|
tag: uint) {
|
2013-03-27 06:16:28 -04:00
|
|
|
let ty_str_ctxt = @tyencode::ctxt {
|
|
|
|
diag: ecx.diag,
|
|
|
|
ds: def_to_str,
|
|
|
|
tcx: ecx.tcx,
|
2013-06-14 18:21:47 -07:00
|
|
|
abbrevs: tyencode::ac_use_abbrevs(ecx.type_abbrevs)
|
|
|
|
};
|
2013-03-27 06:16:28 -04:00
|
|
|
|
|
|
|
ebml_w.start_tag(tag);
|
|
|
|
tyencode::enc_trait_ref(ebml_w.writer, ty_str_ctxt, trait_ref);
|
2012-04-26 12:15:46 -07:00
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2013-07-22 16:40:31 -07:00
|
|
|
fn encode_impl_vtables(ebml_w: &mut writer::Encoder,
|
|
|
|
ecx: &EncodeContext,
|
|
|
|
vtables: &typeck::impl_res) {
|
|
|
|
ebml_w.start_tag(tag_item_impl_vtables);
|
|
|
|
astencode::encode_vtable_res(ecx, ebml_w, vtables.trait_vtables);
|
|
|
|
astencode::encode_vtable_param_res(ecx, ebml_w, vtables.self_vtables);
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2011-06-27 15:20:17 -07:00
|
|
|
// Item info table encoding
|
2013-05-01 17:54:54 -07:00
|
|
|
fn encode_family(ebml_w: &mut writer::Encoder, c: char) {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item_family);
|
2012-06-29 16:26:56 -07:00
|
|
|
ebml_w.writer.write(&[c as u8]);
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
2013-09-02 03:45:37 +02:00
|
|
|
pub fn def_to_str(did: DefId) -> ~str {
|
2013-09-27 22:38:08 -07:00
|
|
|
format!("{}:{}", did.crate, did.node)
|
2013-05-01 17:54:54 -07:00
|
|
|
}
|
2011-06-27 15:20:17 -07:00
|
|
|
|
2013-05-01 17:54:54 -07:00
|
|
|
fn encode_ty_type_param_defs(ebml_w: &mut writer::Encoder,
|
2013-06-13 19:19:50 +12:00
|
|
|
ecx: &EncodeContext,
|
Cleanup substitutions and treatment of generics around traits in a number of ways.
- In a TraitRef, use the self type consistently to refer to the Self type:
- trait ref in `impl Trait<A,B,C> for S` has a self type of `S`.
- trait ref in `A:Trait` has the self type `A`
- trait ref associated with a trait decl has self type `Self`
- trait ref associated with a supertype has self type `Self`
- trait ref in an object type `@Trait` has no self type
- Rewrite `each_bound_traits_and_supertraits` to perform
substitutions as it goes, and thus yield a series of trait refs
that are always in the same 'namespace' as the type parameter
bound given as input. Before, we left this to the caller, but
this doesn't work because the caller lacks adequare information
to perform the type substitutions correctly.
- For provided methods, substitute the generics involved in the provided
method correctly.
- Introduce TypeParameterDef, which tracks the bounds declared on a type
parameter and brings them together with the def_id and (in the future)
other information (maybe even the parameter's name!).
- Introduce Subst trait, which helps to cleanup a lot of the
repetitive code involved with doing type substitution.
- Introduce Repr trait, which makes debug printouts far more convenient.
Fixes #4183. Needed for #5656.
2013-04-08 22:54:49 -07:00
|
|
|
params: @~[ty::TypeParameterDef],
|
|
|
|
tag: uint) {
|
2013-01-08 14:00:45 -08:00
|
|
|
let ty_str_ctxt = @tyencode::ctxt {
|
|
|
|
diag: ecx.diag,
|
|
|
|
ds: def_to_str,
|
|
|
|
tcx: ecx.tcx,
|
2013-06-14 18:21:47 -07:00
|
|
|
abbrevs: tyencode::ac_use_abbrevs(ecx.type_abbrevs)
|
|
|
|
};
|
2013-08-03 12:45:23 -04:00
|
|
|
for param in params.iter() {
|
2013-03-27 10:26:57 -04:00
|
|
|
ebml_w.start_tag(tag);
|
Cleanup substitutions and treatment of generics around traits in a number of ways.
- In a TraitRef, use the self type consistently to refer to the Self type:
- trait ref in `impl Trait<A,B,C> for S` has a self type of `S`.
- trait ref in `A:Trait` has the self type `A`
- trait ref associated with a trait decl has self type `Self`
- trait ref associated with a supertype has self type `Self`
- trait ref in an object type `@Trait` has no self type
- Rewrite `each_bound_traits_and_supertraits` to perform
substitutions as it goes, and thus yield a series of trait refs
that are always in the same 'namespace' as the type parameter
bound given as input. Before, we left this to the caller, but
this doesn't work because the caller lacks adequare information
to perform the type substitutions correctly.
- For provided methods, substitute the generics involved in the provided
method correctly.
- Introduce TypeParameterDef, which tracks the bounds declared on a type
parameter and brings them together with the def_id and (in the future)
other information (maybe even the parameter's name!).
- Introduce Subst trait, which helps to cleanup a lot of the
repetitive code involved with doing type substitution.
- Introduce Repr trait, which makes debug printouts far more convenient.
Fixes #4183. Needed for #5656.
2013-04-08 22:54:49 -07:00
|
|
|
tyencode::enc_type_param_def(ebml_w.writer, ty_str_ctxt, param);
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-07-29 16:40:23 -07:00
|
|
|
}
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
2013-10-29 06:03:32 -04:00
|
|
|
fn encode_region_param_defs(ebml_w: &mut writer::Encoder,
|
|
|
|
ecx: &EncodeContext,
|
|
|
|
params: @[ty::RegionParameterDef]) {
|
|
|
|
for param in params.iter() {
|
|
|
|
ebml_w.start_tag(tag_region_param_def);
|
|
|
|
|
|
|
|
ebml_w.start_tag(tag_region_param_def_ident);
|
|
|
|
encode_name(ecx, ebml_w, param.ident);
|
|
|
|
ebml_w.end_tag();
|
|
|
|
|
|
|
|
ebml_w.wr_tagged_str(tag_region_param_def_def_id,
|
|
|
|
def_to_str(param.def_id));
|
|
|
|
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-29 06:08:34 -04:00
|
|
|
fn encode_item_variances(ebml_w: &mut writer::Encoder,
|
|
|
|
ecx: &EncodeContext,
|
|
|
|
id: ast::NodeId) {
|
|
|
|
let v = ty::item_variances(ecx.tcx, ast_util::local_def(id));
|
|
|
|
ebml_w.start_tag(tag_item_variances);
|
|
|
|
v.encode(ebml_w);
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2013-07-16 16:28:33 -07:00
|
|
|
fn encode_bounds_and_type(ebml_w: &mut writer::Encoder,
|
|
|
|
ecx: &EncodeContext,
|
|
|
|
tpt: &ty::ty_param_bounds_and_ty) {
|
|
|
|
encode_ty_type_param_defs(ebml_w, ecx, tpt.generics.type_param_defs,
|
Cleanup substitutions and treatment of generics around traits in a number of ways.
- In a TraitRef, use the self type consistently to refer to the Self type:
- trait ref in `impl Trait<A,B,C> for S` has a self type of `S`.
- trait ref in `A:Trait` has the self type `A`
- trait ref associated with a trait decl has self type `Self`
- trait ref associated with a supertype has self type `Self`
- trait ref in an object type `@Trait` has no self type
- Rewrite `each_bound_traits_and_supertraits` to perform
substitutions as it goes, and thus yield a series of trait refs
that are always in the same 'namespace' as the type parameter
bound given as input. Before, we left this to the caller, but
this doesn't work because the caller lacks adequare information
to perform the type substitutions correctly.
- For provided methods, substitute the generics involved in the provided
method correctly.
- Introduce TypeParameterDef, which tracks the bounds declared on a type
parameter and brings them together with the def_id and (in the future)
other information (maybe even the parameter's name!).
- Introduce Subst trait, which helps to cleanup a lot of the
repetitive code involved with doing type substitution.
- Introduce Repr trait, which makes debug printouts far more convenient.
Fixes #4183. Needed for #5656.
2013-04-08 22:54:49 -07:00
|
|
|
tag_items_data_item_ty_param_bounds);
|
2013-10-29 06:03:32 -04:00
|
|
|
encode_region_param_defs(ebml_w, ecx, tpt.generics.region_param_defs);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_type(ecx, ebml_w, tpt.ty);
|
2012-08-02 16:01:38 -07:00
|
|
|
}
|
|
|
|
|
2013-09-02 03:45:37 +02:00
|
|
|
fn encode_variant_id(ebml_w: &mut writer::Encoder, vid: DefId) {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item_variant);
|
2013-06-11 13:10:37 +10:00
|
|
|
let s = def_to_str(vid);
|
|
|
|
ebml_w.writer.write(s.as_bytes());
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
pub fn write_type(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
typ: ty::t) {
|
2013-01-08 14:00:45 -08:00
|
|
|
let ty_str_ctxt = @tyencode::ctxt {
|
|
|
|
diag: ecx.diag,
|
|
|
|
ds: def_to_str,
|
|
|
|
tcx: ecx.tcx,
|
2013-06-14 18:21:47 -07:00
|
|
|
abbrevs: tyencode::ac_use_abbrevs(ecx.type_abbrevs)
|
|
|
|
};
|
2012-01-11 15:15:54 +01:00
|
|
|
tyencode::enc_ty(ebml_w.writer, ty_str_ctxt, typ);
|
2012-01-05 10:57:19 +01:00
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
pub fn write_vstore(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-01-29 16:51:16 -08:00
|
|
|
vstore: ty::vstore) {
|
2013-01-08 14:00:45 -08:00
|
|
|
let ty_str_ctxt = @tyencode::ctxt {
|
|
|
|
diag: ecx.diag,
|
|
|
|
ds: def_to_str,
|
|
|
|
tcx: ecx.tcx,
|
2013-06-14 18:21:47 -07:00
|
|
|
abbrevs: tyencode::ac_use_abbrevs(ecx.type_abbrevs)
|
|
|
|
};
|
2012-10-05 16:55:42 -07:00
|
|
|
tyencode::enc_vstore(ebml_w.writer, ty_str_ctxt, vstore);
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_type(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
typ: ty::t) {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item_type);
|
2012-01-05 10:57:19 +01:00
|
|
|
write_type(ecx, ebml_w, typ);
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_transformed_self_ty(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
opt_typ: Option<ty::t>) {
|
2013-08-03 12:45:23 -04:00
|
|
|
for &typ in opt_typ.iter() {
|
2013-03-29 16:02:55 -04:00
|
|
|
ebml_w.start_tag(tag_item_method_transformed_self_ty);
|
|
|
|
write_type(ecx, ebml_w, typ);
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_method_fty(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
typ: &ty::BareFnTy) {
|
2013-03-27 10:26:57 -04:00
|
|
|
ebml_w.start_tag(tag_item_method_fty);
|
|
|
|
|
|
|
|
let ty_str_ctxt = @tyencode::ctxt {
|
|
|
|
diag: ecx.diag,
|
|
|
|
ds: def_to_str,
|
|
|
|
tcx: ecx.tcx,
|
2013-06-14 18:21:47 -07:00
|
|
|
abbrevs: tyencode::ac_use_abbrevs(ecx.type_abbrevs)
|
|
|
|
};
|
2013-03-27 10:26:57 -04:00
|
|
|
tyencode::enc_bare_fn_ty(ebml_w.writer, ty_str_ctxt, typ);
|
|
|
|
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_symbol(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-07-27 10:25:59 +02:00
|
|
|
id: NodeId) {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item_symbol);
|
2013-12-18 16:53:23 -08:00
|
|
|
let item_symbols = ecx.item_symbols.borrow();
|
|
|
|
match item_symbols.get().find(&id) {
|
2013-03-22 22:26:41 -04:00
|
|
|
Some(x) => {
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("encode_symbol(id={:?}, str={})", id, *x);
|
2013-06-11 13:10:37 +10:00
|
|
|
ebml_w.writer.write(x.as_bytes());
|
2013-03-06 12:27:23 -05:00
|
|
|
}
|
|
|
|
None => {
|
|
|
|
ecx.diag.handler().bug(
|
2013-09-27 22:38:08 -07:00
|
|
|
format!("encode_symbol: id not found {}", id));
|
2013-03-06 12:27:23 -05:00
|
|
|
}
|
|
|
|
}
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_disr_val(_: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-03-11 22:37:01 -07:00
|
|
|
disr_val: ty::Disr) {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_disr_val);
|
2013-08-17 22:47:54 -04:00
|
|
|
let s = disr_val.to_str();
|
2013-06-11 13:10:37 +10:00
|
|
|
ebml_w.writer.write(s.as_bytes());
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2012-01-10 14:50:40 -07:00
|
|
|
}
|
|
|
|
|
2013-09-02 03:45:37 +02:00
|
|
|
fn encode_parent_item(ebml_w: &mut writer::Encoder, id: DefId) {
|
2012-03-08 23:13:57 +01:00
|
|
|
ebml_w.start_tag(tag_items_data_parent_item);
|
2013-06-11 13:10:37 +10:00
|
|
|
let s = def_to_str(id);
|
|
|
|
ebml_w.writer.write(s.as_bytes());
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
2013-09-09 18:33:35 -04:00
|
|
|
fn encode_struct_fields(ecx: &EncodeContext,
|
2013-09-08 20:36:01 -04:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
def: @struct_def) {
|
|
|
|
for f in def.fields.iter() {
|
|
|
|
match f.node.kind {
|
|
|
|
named_field(ident, vis) => {
|
|
|
|
ebml_w.start_tag(tag_item_field);
|
|
|
|
encode_struct_field_family(ebml_w, vis);
|
|
|
|
encode_name(ecx, ebml_w, ident);
|
|
|
|
encode_def_id(ebml_w, local_def(f.node.id));
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
unnamed_field => {
|
|
|
|
ebml_w.start_tag(tag_item_unnamed_field);
|
|
|
|
encode_def_id(ebml_w, local_def(f.node.id));
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_enum_variant_info(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-07-27 10:25:59 +02:00
|
|
|
id: NodeId,
|
2013-12-01 00:00:39 +02:00
|
|
|
variants: &[P<variant>],
|
2013-01-22 11:57:39 -08:00
|
|
|
path: &[ast_map::path_elt],
|
2013-12-21 14:44:18 -08:00
|
|
|
index: @RefCell<~[entry<i64>]>,
|
2013-02-14 21:50:03 -08:00
|
|
|
generics: &ast::Generics) {
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("encode_enum_variant_info(id={:?})", id);
|
2013-03-06 12:27:23 -05:00
|
|
|
|
2012-03-15 09:47:03 -04:00
|
|
|
let mut disr_val = 0;
|
|
|
|
let mut i = 0;
|
2013-01-13 11:05:40 -08:00
|
|
|
let vi = ty::enum_variants(ecx.tcx,
|
2013-09-02 03:45:37 +02:00
|
|
|
ast::DefId { crate: LOCAL_CRATE, node: id });
|
2013-08-03 12:45:23 -04:00
|
|
|
for variant in variants.iter() {
|
2013-07-16 16:28:33 -07:00
|
|
|
let def_id = local_def(variant.node.id);
|
2013-12-21 14:44:18 -08:00
|
|
|
{
|
|
|
|
let mut index = index.borrow_mut();
|
|
|
|
index.get().push(entry {
|
|
|
|
val: variant.node.id as i64,
|
|
|
|
pos: ebml_w.writer.tell(),
|
|
|
|
});
|
|
|
|
}
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_def_id(ebml_w, def_id);
|
2013-09-08 20:36:01 -04:00
|
|
|
match variant.node.kind {
|
|
|
|
ast::tuple_variant_kind(_) => encode_family(ebml_w, 'v'),
|
|
|
|
ast::struct_variant_kind(_) => encode_family(ebml_w, 'V')
|
|
|
|
}
|
2012-07-18 16:18:02 -07:00
|
|
|
encode_name(ecx, ebml_w, variant.node.name);
|
2012-03-08 23:13:57 +01:00
|
|
|
encode_parent_item(ebml_w, local_def(id));
|
2013-05-16 15:37:52 -07:00
|
|
|
encode_visibility(ebml_w, variant.node.vis);
|
2013-08-31 17:13:57 +10:00
|
|
|
encode_attributes(ebml_w, variant.node.attrs);
|
2012-08-07 14:24:04 -07:00
|
|
|
match variant.node.kind {
|
2013-01-07 14:16:52 -08:00
|
|
|
ast::tuple_variant_kind(ref args)
|
2013-02-14 21:50:03 -08:00
|
|
|
if args.len() > 0 && generics.ty_params.len() == 0 => {
|
2012-08-07 14:24:04 -07:00
|
|
|
encode_symbol(ecx, ebml_w, variant.node.id);
|
|
|
|
}
|
2013-09-08 20:36:01 -04:00
|
|
|
ast::tuple_variant_kind(_) => {},
|
|
|
|
ast::struct_variant_kind(def) => {
|
|
|
|
let idx = encode_info_for_struct(ecx, ebml_w, path,
|
|
|
|
def.fields, index);
|
2013-09-09 18:33:35 -04:00
|
|
|
encode_struct_fields(ecx, ebml_w, def);
|
2013-09-08 20:36:01 -04:00
|
|
|
let bkts = create_index(idx);
|
|
|
|
encode_index(ebml_w, bkts, write_i64);
|
|
|
|
}
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
2012-01-16 02:36:47 -07:00
|
|
|
if vi[i].disr_val != disr_val {
|
|
|
|
encode_disr_val(ecx, ebml_w, vi[i].disr_val);
|
|
|
|
disr_val = vi[i].disr_val;
|
2012-01-10 14:50:40 -07:00
|
|
|
}
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_bounds_and_type(ebml_w, ecx,
|
|
|
|
&lookup_item_type(ecx.tcx, def_id));
|
2013-01-22 11:57:39 -08:00
|
|
|
encode_path(ecx, ebml_w, path,
|
2013-01-07 14:16:52 -08:00
|
|
|
ast_map::path_name(variant.node.name));
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2012-01-10 14:50:40 -07:00
|
|
|
disr_val += 1;
|
2012-01-16 02:36:47 -07:00
|
|
|
i += 1;
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_path(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
path: &[ast_map::path_elt],
|
|
|
|
name: ast_map::path_elt) {
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_path_elt(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2012-07-18 16:18:02 -07:00
|
|
|
elt: ast_map::path_elt) {
|
2013-08-30 00:47:10 -07:00
|
|
|
match elt {
|
|
|
|
ast_map::path_mod(n) => {
|
|
|
|
ebml_w.wr_tagged_str(tag_path_elt_mod, ecx.tcx.sess.str_of(n));
|
|
|
|
}
|
|
|
|
ast_map::path_name(n) => {
|
|
|
|
ebml_w.wr_tagged_str(tag_path_elt_name, ecx.tcx.sess.str_of(n));
|
|
|
|
}
|
|
|
|
ast_map::path_pretty_name(n, extra) => {
|
|
|
|
ebml_w.start_tag(tag_path_elt_pretty_name);
|
|
|
|
ebml_w.wr_tagged_str(tag_path_elt_pretty_name_ident,
|
|
|
|
ecx.tcx.sess.str_of(n));
|
|
|
|
ebml_w.wr_tagged_u64(tag_path_elt_pretty_name_extra, extra);
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
}
|
2012-02-10 06:01:32 -08:00
|
|
|
}
|
|
|
|
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w.start_tag(tag_path);
|
|
|
|
ebml_w.wr_tagged_u32(tag_path_len, (path.len() + 1) as u32);
|
2013-08-03 12:45:23 -04:00
|
|
|
for pe in path.iter() {
|
2013-05-01 17:54:54 -07:00
|
|
|
encode_path_elt(ecx, ebml_w, *pe);
|
2012-02-10 06:01:32 -08:00
|
|
|
}
|
2013-05-01 17:54:54 -07:00
|
|
|
encode_path_elt(ecx, ebml_w, name);
|
|
|
|
ebml_w.end_tag();
|
2012-02-10 06:01:32 -08:00
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_reexported_static_method(ecx: &EncodeContext,
|
2013-05-08 23:13:53 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
exp: &middle::resolve::Export2,
|
2013-09-02 03:45:37 +02:00
|
|
|
method_def_id: DefId,
|
2013-09-02 02:50:59 +02:00
|
|
|
method_ident: Ident) {
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("(encode reexported static method) {}::{}",
|
2013-06-13 03:02:55 +10:00
|
|
|
exp.name, ecx.tcx.sess.str_of(method_ident));
|
2013-05-08 23:13:53 -07:00
|
|
|
ebml_w.start_tag(tag_items_data_item_reexport);
|
|
|
|
ebml_w.start_tag(tag_items_data_item_reexport_def_id);
|
2013-06-01 02:54:39 -07:00
|
|
|
ebml_w.wr_str(def_to_str(method_def_id));
|
2013-05-08 23:13:53 -07:00
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.start_tag(tag_items_data_item_reexport_name);
|
2013-09-27 22:38:08 -07:00
|
|
|
ebml_w.wr_str(format!("{}::{}", exp.name, ecx.tcx.sess.str_of(method_ident)));
|
2013-05-08 23:13:53 -07:00
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_reexported_static_base_methods(ecx: &EncodeContext,
|
2013-06-01 02:54:39 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
exp: &middle::resolve::Export2)
|
|
|
|
-> bool {
|
2013-12-19 19:15:06 -08:00
|
|
|
let inherent_impls = ecx.tcx.inherent_impls.borrow();
|
|
|
|
match inherent_impls.get().find(&exp.def_id) {
|
2013-06-01 02:54:39 -07:00
|
|
|
Some(implementations) => {
|
2013-08-03 12:45:23 -04:00
|
|
|
for &base_impl in implementations.iter() {
|
|
|
|
for &m in base_impl.methods.iter() {
|
2013-06-01 02:54:39 -07:00
|
|
|
if m.explicit_self == ast::sty_static {
|
|
|
|
encode_reexported_static_method(ecx, ebml_w, exp,
|
2013-07-15 15:24:16 -07:00
|
|
|
m.def_id, m.ident);
|
2013-06-01 02:54:39 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
true
|
|
|
|
}
|
|
|
|
None => { false }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_reexported_static_trait_methods(ecx: &EncodeContext,
|
2013-06-01 02:54:39 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
exp: &middle::resolve::Export2)
|
|
|
|
-> bool {
|
2013-12-18 15:56:12 -08:00
|
|
|
let trait_methods_cache = ecx.tcx.trait_methods_cache.borrow();
|
|
|
|
match trait_methods_cache.get().find(&exp.def_id) {
|
2013-06-01 02:54:39 -07:00
|
|
|
Some(methods) => {
|
2013-08-03 12:45:23 -04:00
|
|
|
for &m in methods.iter() {
|
2013-06-01 02:54:39 -07:00
|
|
|
if m.explicit_self == ast::sty_static {
|
|
|
|
encode_reexported_static_method(ecx, ebml_w, exp,
|
|
|
|
m.def_id, m.ident);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
true
|
|
|
|
}
|
|
|
|
None => { false }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_reexported_static_methods(ecx: &EncodeContext,
|
2013-05-08 23:13:53 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
mod_path: &[ast_map::path_elt],
|
|
|
|
exp: &middle::resolve::Export2) {
|
2013-06-01 02:54:39 -07:00
|
|
|
match ecx.tcx.items.find(&exp.def_id.node) {
|
|
|
|
Some(&ast_map::node_item(item, path)) => {
|
|
|
|
let original_name = ecx.tcx.sess.str_of(item.ident);
|
|
|
|
|
|
|
|
//
|
|
|
|
// We don't need to reexport static methods on items
|
|
|
|
// declared in the same module as our `pub use ...` since
|
2013-06-01 04:24:31 -07:00
|
|
|
// that's done when we encode the item itself.
|
2013-06-01 02:54:39 -07:00
|
|
|
//
|
|
|
|
// The only exception is when the reexport *changes* the
|
|
|
|
// name e.g. `pub use Foo = self::Bar` -- we have
|
|
|
|
// encoded metadata for static methods relative to Bar,
|
|
|
|
// but not yet for Foo.
|
|
|
|
//
|
2013-06-13 03:02:55 +10:00
|
|
|
if mod_path != *path || exp.name != original_name {
|
2013-06-01 02:54:39 -07:00
|
|
|
if !encode_reexported_static_base_methods(ecx, ebml_w, exp) {
|
|
|
|
if encode_reexported_static_trait_methods(ecx, ebml_w, exp) {
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("(encode reexported static methods) {} \
|
2013-09-27 22:38:08 -07:00
|
|
|
[trait]",
|
|
|
|
original_name);
|
2013-05-08 23:13:53 -07:00
|
|
|
}
|
|
|
|
}
|
2013-06-01 02:54:39 -07:00
|
|
|
else {
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("(encode reexported static methods) {} [base]",
|
2013-09-27 22:38:08 -07:00
|
|
|
original_name);
|
2013-06-01 02:54:39 -07:00
|
|
|
}
|
2013-05-08 23:13:53 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-18 09:39:16 -07:00
|
|
|
/// Iterates through "auxiliary node IDs", which are node IDs that describe
|
|
|
|
/// top-level items that are sub-items of the given item. Specifically:
|
|
|
|
///
|
|
|
|
/// * For enums, iterates through the node IDs of the variants.
|
|
|
|
///
|
|
|
|
/// * For newtype structs, iterates through the node ID of the constructor.
|
2013-11-19 13:22:03 -08:00
|
|
|
fn each_auxiliary_node_id(item: @item, callback: |NodeId| -> bool) -> bool {
|
2013-09-25 17:56:54 -07:00
|
|
|
let mut continue_ = true;
|
2013-06-18 09:39:16 -07:00
|
|
|
match item.node {
|
|
|
|
item_enum(ref enum_def, _) => {
|
2013-08-03 12:45:23 -04:00
|
|
|
for variant in enum_def.variants.iter() {
|
2013-09-25 17:56:54 -07:00
|
|
|
continue_ = callback(variant.node.id);
|
|
|
|
if !continue_ {
|
2013-06-18 09:39:16 -07:00
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
item_struct(struct_def, _) => {
|
|
|
|
// If this is a newtype struct, return the constructor.
|
|
|
|
match struct_def.ctor_id {
|
|
|
|
Some(ctor_id) if struct_def.fields.len() > 0 &&
|
|
|
|
struct_def.fields[0].node.kind ==
|
|
|
|
ast::unnamed_field => {
|
2013-09-25 17:56:54 -07:00
|
|
|
continue_ = callback(ctor_id);
|
2013-06-18 09:39:16 -07:00
|
|
|
}
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
|
2013-09-25 17:56:54 -07:00
|
|
|
continue_
|
2013-06-18 09:39:16 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
fn encode_reexports(ecx: &EncodeContext,
|
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-07-27 10:25:59 +02:00
|
|
|
id: NodeId,
|
2013-06-18 09:39:16 -07:00
|
|
|
path: &[ast_map::path_elt]) {
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("(encoding info for module) encoding reexports for {}", id);
|
2013-12-20 21:14:25 -08:00
|
|
|
let reexports2 = ecx.reexports2.borrow();
|
|
|
|
match reexports2.get().find(&id) {
|
2013-06-18 09:39:16 -07:00
|
|
|
Some(ref exports) => {
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("(encoding info for module) found reexports for {}", id);
|
2013-08-03 12:45:23 -04:00
|
|
|
for exp in exports.iter() {
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("(encoding info for module) reexport '{}' ({}/{}) for \
|
2013-09-27 22:38:08 -07:00
|
|
|
{}",
|
2013-08-23 18:31:43 -07:00
|
|
|
exp.name,
|
|
|
|
exp.def_id.crate,
|
|
|
|
exp.def_id.node,
|
|
|
|
id);
|
2013-06-18 09:39:16 -07:00
|
|
|
ebml_w.start_tag(tag_items_data_item_reexport);
|
|
|
|
ebml_w.start_tag(tag_items_data_item_reexport_def_id);
|
|
|
|
ebml_w.wr_str(def_to_str(exp.def_id));
|
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.start_tag(tag_items_data_item_reexport_name);
|
|
|
|
ebml_w.wr_str(exp.name);
|
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.end_tag();
|
|
|
|
encode_reexported_static_methods(ecx, ebml_w, path, exp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => {
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("(encoding info for module) found no reexports for {}",
|
2013-06-18 09:39:16 -07:00
|
|
|
id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_info_for_mod(ecx: &EncodeContext,
|
2013-05-04 14:25:41 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-05-01 17:54:54 -07:00
|
|
|
md: &_mod,
|
2013-07-27 10:25:59 +02:00
|
|
|
id: NodeId,
|
2013-05-01 17:54:54 -07:00
|
|
|
path: &[ast_map::path_elt],
|
2013-09-02 02:50:59 +02:00
|
|
|
name: Ident,
|
2013-06-18 09:39:16 -07:00
|
|
|
vis: visibility) {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2011-12-16 14:41:12 +01:00
|
|
|
encode_def_id(ebml_w, local_def(id));
|
2012-02-13 20:55:23 +01:00
|
|
|
encode_family(ebml_w, 'm');
|
2012-07-18 16:18:02 -07:00
|
|
|
encode_name(ecx, ebml_w, name);
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("(encoding info for module) encoding info for module ID {}", id);
|
2012-08-17 16:38:07 -07:00
|
|
|
|
|
|
|
// Encode info about all the module children.
|
2013-08-03 12:45:23 -04:00
|
|
|
for item in md.items.iter() {
|
2013-06-18 09:39:16 -07:00
|
|
|
ebml_w.start_tag(tag_mod_child);
|
|
|
|
ebml_w.wr_str(def_to_str(local_def(item.id)));
|
|
|
|
ebml_w.end_tag();
|
|
|
|
|
2013-11-21 15:42:55 -08:00
|
|
|
each_auxiliary_node_id(*item, |auxiliary_node_id| {
|
2013-06-18 09:39:16 -07:00
|
|
|
ebml_w.start_tag(tag_mod_child);
|
|
|
|
ebml_w.wr_str(def_to_str(local_def(auxiliary_node_id)));
|
|
|
|
ebml_w.end_tag();
|
2013-08-02 02:17:20 -04:00
|
|
|
true
|
2013-11-21 15:42:55 -08:00
|
|
|
});
|
2013-06-18 09:39:16 -07:00
|
|
|
|
2012-08-17 16:38:07 -07:00
|
|
|
match item.node {
|
2013-11-28 12:22:53 -08:00
|
|
|
item_impl(..) => {
|
2012-08-17 16:38:07 -07:00
|
|
|
let (ident, did) = (item.ident, item.id);
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("(encoding info for module) ... encoding impl {} \
|
2013-09-27 22:38:08 -07:00
|
|
|
({:?}/{:?})",
|
2013-06-13 03:02:55 +10:00
|
|
|
ecx.tcx.sess.str_of(ident),
|
2012-07-18 16:18:02 -07:00
|
|
|
did,
|
2013-05-14 17:27:27 -07:00
|
|
|
ast_map::node_id_to_str(ecx.tcx.items, did, token::get_ident_interner()));
|
2012-08-17 16:38:07 -07:00
|
|
|
|
|
|
|
ebml_w.start_tag(tag_mod_impl);
|
|
|
|
ebml_w.wr_str(def_to_str(local_def(did)));
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
2013-06-18 09:39:16 -07:00
|
|
|
_ => {}
|
2012-08-17 16:38:07 -07:00
|
|
|
}
|
|
|
|
}
|
2012-05-16 22:28:01 -07:00
|
|
|
|
2013-01-22 11:57:39 -08:00
|
|
|
encode_path(ecx, ebml_w, path, ast_map::path_mod(name));
|
2013-10-07 13:01:47 -07:00
|
|
|
encode_visibility(ebml_w, vis);
|
2012-08-17 12:41:34 -07:00
|
|
|
|
2013-06-18 09:39:16 -07:00
|
|
|
// Encode the reexports of this module, if this module is public.
|
|
|
|
if vis == public {
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("(encoding info for module) encoding reexports for {}", id);
|
2013-06-18 09:39:16 -07:00
|
|
|
encode_reexports(ecx, ebml_w, id, path);
|
2012-08-17 12:41:34 -07:00
|
|
|
}
|
|
|
|
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-12-16 14:41:12 +01:00
|
|
|
}
|
|
|
|
|
2013-05-04 14:25:41 -07:00
|
|
|
fn encode_struct_field_family(ebml_w: &mut writer::Encoder,
|
2013-02-27 13:45:37 -08:00
|
|
|
visibility: visibility) {
|
2012-08-06 12:34:08 -07:00
|
|
|
encode_family(ebml_w, match visibility {
|
2012-08-03 19:59:04 -07:00
|
|
|
public => 'g',
|
|
|
|
private => 'j',
|
|
|
|
inherited => 'N'
|
2012-05-08 16:06:24 +02:00
|
|
|
});
|
2012-03-26 09:59:59 -07:00
|
|
|
}
|
|
|
|
|
2013-05-01 17:54:54 -07:00
|
|
|
fn encode_visibility(ebml_w: &mut writer::Encoder, visibility: visibility) {
|
2013-02-27 13:45:37 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item_visibility);
|
|
|
|
let ch = match visibility {
|
|
|
|
public => 'y',
|
|
|
|
private => 'n',
|
|
|
|
inherited => 'i',
|
|
|
|
};
|
|
|
|
ebml_w.wr_str(str::from_char(ch));
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2013-04-30 08:49:48 -07:00
|
|
|
fn encode_explicit_self(ebml_w: &mut writer::Encoder, explicit_self: ast::explicit_self_) {
|
|
|
|
ebml_w.start_tag(tag_item_trait_method_explicit_self);
|
2012-07-31 16:32:37 -07:00
|
|
|
|
|
|
|
// Encode the base self type.
|
2013-04-30 08:49:48 -07:00
|
|
|
match explicit_self {
|
2013-03-09 19:43:53 -05:00
|
|
|
sty_static => {
|
|
|
|
ebml_w.writer.write(&[ 's' as u8 ]);
|
|
|
|
}
|
2013-10-20 01:55:23 -04:00
|
|
|
sty_value(m) => {
|
2013-03-09 19:43:53 -05:00
|
|
|
ebml_w.writer.write(&[ 'v' as u8 ]);
|
2013-10-20 01:55:23 -04:00
|
|
|
encode_mutability(ebml_w, m);
|
2013-03-09 19:43:53 -05:00
|
|
|
}
|
|
|
|
sty_region(_, m) => {
|
|
|
|
// FIXME(#4846) encode custom lifetime
|
|
|
|
ebml_w.writer.write(&[ '&' as u8 ]);
|
|
|
|
encode_mutability(ebml_w, m);
|
2012-07-31 16:32:37 -07:00
|
|
|
}
|
2013-03-09 19:43:53 -05:00
|
|
|
sty_box(m) => {
|
|
|
|
ebml_w.writer.write(&[ '@' as u8 ]);
|
|
|
|
encode_mutability(ebml_w, m);
|
2012-07-31 16:32:37 -07:00
|
|
|
}
|
2013-10-20 02:34:01 -04:00
|
|
|
sty_uniq(m) => {
|
2013-03-09 19:43:53 -05:00
|
|
|
ebml_w.writer.write(&[ '~' as u8 ]);
|
2013-10-20 02:34:01 -04:00
|
|
|
encode_mutability(ebml_w, m);
|
2012-07-31 16:32:37 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ebml_w.end_tag();
|
2013-03-09 19:43:53 -05:00
|
|
|
|
2013-04-17 12:15:37 -04:00
|
|
|
fn encode_mutability(ebml_w: &writer::Encoder,
|
2013-09-02 03:45:37 +02:00
|
|
|
m: ast::Mutability) {
|
2013-03-09 19:43:53 -05:00
|
|
|
match m {
|
2013-09-02 03:45:37 +02:00
|
|
|
MutImmutable => ebml_w.writer.write(&[ 'i' as u8 ]),
|
|
|
|
MutMutable => ebml_w.writer.write(&[ 'm' as u8 ]),
|
2013-03-09 19:43:53 -05:00
|
|
|
}
|
|
|
|
}
|
2012-07-31 16:32:37 -07:00
|
|
|
}
|
|
|
|
|
2013-05-01 17:54:54 -07:00
|
|
|
fn encode_method_sort(ebml_w: &mut writer::Encoder, sort: char) {
|
2012-10-08 12:39:30 -07:00
|
|
|
ebml_w.start_tag(tag_item_trait_method_sort);
|
|
|
|
ebml_w.writer.write(&[ sort as u8 ]);
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2013-07-11 17:07:57 -07:00
|
|
|
fn encode_provided_source(ebml_w: &mut writer::Encoder,
|
2013-09-02 03:45:37 +02:00
|
|
|
source_opt: Option<DefId>) {
|
2013-08-03 12:45:23 -04:00
|
|
|
for source in source_opt.iter() {
|
2013-07-11 17:07:57 -07:00
|
|
|
ebml_w.start_tag(tag_item_method_provided_source);
|
|
|
|
let s = def_to_str(*source);
|
|
|
|
ebml_w.writer.write(s.as_bytes());
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-19 10:19:00 -07:00
|
|
|
/* Returns an index of items in this class */
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_info_for_struct(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
path: &[ast_map::path_elt],
|
2013-11-30 17:27:25 +01:00
|
|
|
fields: &[struct_field],
|
2013-12-21 14:44:18 -08:00
|
|
|
global_index: @RefCell<~[entry<i64>]>)
|
2013-08-06 19:35:09 -07:00
|
|
|
-> ~[entry<i64>] {
|
2012-06-25 16:49:14 -07:00
|
|
|
/* Each class has its own index, since different classes
|
|
|
|
may have fields with the same name */
|
2013-07-02 12:47:32 -07:00
|
|
|
let mut index = ~[];
|
2012-05-13 17:01:52 -07:00
|
|
|
let tcx = ecx.tcx;
|
2012-03-19 10:19:00 -07:00
|
|
|
/* We encode both private and public fields -- need to include
|
|
|
|
private fields to get the offsets right */
|
2013-08-03 12:45:23 -04:00
|
|
|
for field in fields.iter() {
|
2013-05-03 18:51:58 -07:00
|
|
|
let (nm, vis) = match field.node.kind {
|
|
|
|
named_field(nm, vis) => (nm, vis),
|
|
|
|
unnamed_field => (special_idents::unnamed_field, inherited)
|
2013-02-11 16:28:39 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
let id = field.node.id;
|
2013-08-06 19:35:09 -07:00
|
|
|
index.push(entry {val: id as i64, pos: ebml_w.writer.tell()});
|
2013-12-21 14:44:18 -08:00
|
|
|
{
|
|
|
|
let mut global_index = global_index.borrow_mut();
|
|
|
|
global_index.get().push(entry {
|
|
|
|
val: id as i64,
|
|
|
|
pos: ebml_w.writer.tell(),
|
|
|
|
});
|
|
|
|
}
|
2013-02-11 16:28:39 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("encode_info_for_struct: doing {} {}",
|
2013-06-13 03:02:55 +10:00
|
|
|
tcx.sess.str_of(nm), id);
|
2013-02-27 13:45:37 -08:00
|
|
|
encode_struct_field_family(ebml_w, vis);
|
2013-02-11 16:28:39 -08:00
|
|
|
encode_name(ecx, ebml_w, nm);
|
|
|
|
encode_path(ecx, ebml_w, path, ast_map::path_name(nm));
|
|
|
|
encode_type(ecx, ebml_w, node_id_to_type(tcx, id));
|
|
|
|
encode_def_id(ebml_w, local_def(id));
|
|
|
|
ebml_w.end_tag();
|
2012-08-15 15:53:58 -07:00
|
|
|
}
|
2013-07-02 12:47:32 -07:00
|
|
|
index
|
2012-03-06 08:02:13 -08:00
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_info_for_struct_ctor(ecx: &EncodeContext,
|
2013-05-04 14:25:41 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-02-11 16:28:39 -08:00
|
|
|
path: &[ast_map::path_elt],
|
2013-09-02 02:50:59 +02:00
|
|
|
name: ast::Ident,
|
2013-07-27 10:25:59 +02:00
|
|
|
ctor_id: NodeId,
|
2013-12-21 14:44:18 -08:00
|
|
|
index: @RefCell<~[entry<i64>]>,
|
2013-09-26 21:53:40 -07:00
|
|
|
struct_id: NodeId) {
|
2013-12-21 14:44:18 -08:00
|
|
|
{
|
|
|
|
let mut index = index.borrow_mut();
|
|
|
|
index.get().push(entry {
|
|
|
|
val: ctor_id as i64,
|
|
|
|
pos: ebml_w.writer.tell(),
|
|
|
|
});
|
|
|
|
}
|
2013-02-11 16:28:39 -08:00
|
|
|
|
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
|
|
|
encode_def_id(ebml_w, local_def(ctor_id));
|
|
|
|
encode_family(ebml_w, 'f');
|
|
|
|
encode_name(ecx, ebml_w, name);
|
|
|
|
encode_type(ecx, ebml_w, node_id_to_type(ecx.tcx, ctor_id));
|
|
|
|
encode_path(ecx, ebml_w, path, ast_map::path_name(name));
|
2013-09-26 21:53:40 -07:00
|
|
|
encode_parent_item(ebml_w, local_def(struct_id));
|
2013-02-11 16:28:39 -08:00
|
|
|
|
2013-12-18 16:53:23 -08:00
|
|
|
let item_symbols = ecx.item_symbols.borrow();
|
|
|
|
if item_symbols.get().contains_key(&ctor_id) {
|
2013-02-11 16:28:39 -08:00
|
|
|
encode_symbol(ecx, ebml_w, ctor_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_method_ty_fields(ecx: &EncodeContext,
|
2013-05-04 14:25:41 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-05-02 08:11:15 -07:00
|
|
|
method_ty: &ty::Method) {
|
2013-03-28 14:27:54 -04:00
|
|
|
encode_def_id(ebml_w, method_ty.def_id);
|
|
|
|
encode_name(ecx, ebml_w, method_ty.ident);
|
Cleanup substitutions and treatment of generics around traits in a number of ways.
- In a TraitRef, use the self type consistently to refer to the Self type:
- trait ref in `impl Trait<A,B,C> for S` has a self type of `S`.
- trait ref in `A:Trait` has the self type `A`
- trait ref associated with a trait decl has self type `Self`
- trait ref associated with a supertype has self type `Self`
- trait ref in an object type `@Trait` has no self type
- Rewrite `each_bound_traits_and_supertraits` to perform
substitutions as it goes, and thus yield a series of trait refs
that are always in the same 'namespace' as the type parameter
bound given as input. Before, we left this to the caller, but
this doesn't work because the caller lacks adequare information
to perform the type substitutions correctly.
- For provided methods, substitute the generics involved in the provided
method correctly.
- Introduce TypeParameterDef, which tracks the bounds declared on a type
parameter and brings them together with the def_id and (in the future)
other information (maybe even the parameter's name!).
- Introduce Subst trait, which helps to cleanup a lot of the
repetitive code involved with doing type substitution.
- Introduce Repr trait, which makes debug printouts far more convenient.
Fixes #4183. Needed for #5656.
2013-04-08 22:54:49 -07:00
|
|
|
encode_ty_type_param_defs(ebml_w, ecx,
|
|
|
|
method_ty.generics.type_param_defs,
|
|
|
|
tag_item_method_tps);
|
2013-03-29 16:02:55 -04:00
|
|
|
encode_transformed_self_ty(ecx, ebml_w, method_ty.transformed_self_ty);
|
2013-03-28 14:27:54 -04:00
|
|
|
encode_method_fty(ecx, ebml_w, &method_ty.fty);
|
|
|
|
encode_visibility(ebml_w, method_ty.vis);
|
2013-04-30 08:49:48 -07:00
|
|
|
encode_explicit_self(ebml_w, method_ty.explicit_self);
|
2013-07-16 16:28:33 -07:00
|
|
|
let purity = method_ty.fty.purity;
|
|
|
|
match method_ty.explicit_self {
|
|
|
|
ast::sty_static => {
|
|
|
|
encode_family(ebml_w, purity_static_method_family(purity));
|
|
|
|
}
|
|
|
|
_ => encode_family(ebml_w, purity_fn_family(purity))
|
|
|
|
}
|
2013-07-11 17:07:57 -07:00
|
|
|
encode_provided_source(ebml_w, method_ty.provided_source);
|
2013-03-28 14:27:54 -04:00
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_info_for_method(ecx: &EncodeContext,
|
2013-05-04 14:25:41 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-07-16 16:28:33 -07:00
|
|
|
m: &ty::Method,
|
2013-01-22 11:57:39 -08:00
|
|
|
impl_path: &[ast_map::path_elt],
|
2013-07-16 16:28:33 -07:00
|
|
|
is_default_impl: bool,
|
2013-07-27 10:25:59 +02:00
|
|
|
parent_id: NodeId,
|
2013-07-16 16:28:33 -07:00
|
|
|
ast_method_opt: Option<@method>) {
|
|
|
|
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("encode_info_for_method: {:?} {}", m.def_id,
|
2013-07-16 16:28:33 -07:00
|
|
|
ecx.tcx.sess.str_of(m.ident));
|
2012-03-19 10:19:00 -07:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-03-28 14:27:54 -04:00
|
|
|
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_method_ty_fields(ecx, ebml_w, m);
|
2013-07-15 17:26:56 -07:00
|
|
|
encode_parent_item(ebml_w, local_def(parent_id));
|
2013-02-27 13:45:37 -08:00
|
|
|
|
2013-07-16 16:28:33 -07:00
|
|
|
// The type for methods gets encoded twice, which is unfortunate.
|
|
|
|
let tpt = lookup_item_type(ecx.tcx, m.def_id);
|
|
|
|
encode_bounds_and_type(ebml_w, ecx, &tpt);
|
2013-02-14 21:50:03 -08:00
|
|
|
|
2013-01-22 11:57:39 -08:00
|
|
|
encode_path(ecx, ebml_w, impl_path, ast_map::path_name(m.ident));
|
2013-12-15 21:52:48 -05:00
|
|
|
match ast_method_opt {
|
|
|
|
Some(ast_method) => encode_attributes(ebml_w, ast_method.attrs),
|
|
|
|
None => ()
|
|
|
|
}
|
2013-02-27 13:45:37 -08:00
|
|
|
|
2013-08-03 12:45:23 -04:00
|
|
|
for ast_method in ast_method_opt.iter() {
|
2013-07-16 16:28:33 -07:00
|
|
|
let num_params = tpt.generics.type_param_defs.len();
|
|
|
|
if num_params > 0u || is_default_impl
|
|
|
|
|| should_inline(ast_method.attrs) {
|
|
|
|
(ecx.encode_inlined_item)(
|
|
|
|
ecx, ebml_w, impl_path,
|
|
|
|
ii_method(local_def(parent_id), false, *ast_method));
|
|
|
|
} else {
|
|
|
|
encode_symbol(ecx, ebml_w, m.def_id.node);
|
|
|
|
}
|
2012-03-19 10:19:00 -07:00
|
|
|
}
|
2013-03-28 14:27:54 -04:00
|
|
|
|
2012-03-19 10:19:00 -07:00
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2012-02-13 18:56:09 +01:00
|
|
|
fn purity_fn_family(p: purity) -> char {
|
2012-08-06 12:34:08 -07:00
|
|
|
match p {
|
2012-08-03 19:59:04 -07:00
|
|
|
unsafe_fn => 'u',
|
|
|
|
impure_fn => 'f',
|
2012-08-02 16:01:38 -07:00
|
|
|
extern_fn => 'e'
|
|
|
|
}
|
|
|
|
}
|
2013-02-27 13:45:37 -08:00
|
|
|
|
2012-08-02 16:01:38 -07:00
|
|
|
fn purity_static_method_family(p: purity) -> char {
|
|
|
|
match p {
|
|
|
|
unsafe_fn => 'U',
|
|
|
|
impure_fn => 'F',
|
2013-10-21 13:08:31 -07:00
|
|
|
_ => fail!("extern fn can't be static")
|
2012-02-10 13:39:15 -08:00
|
|
|
}
|
2012-02-13 18:56:09 +01:00
|
|
|
}
|
|
|
|
|
2012-03-02 13:14:10 -08:00
|
|
|
|
2013-07-19 21:51:37 +10:00
|
|
|
fn should_inline(attrs: &[Attribute]) -> bool {
|
|
|
|
use syntax::attr::*;
|
|
|
|
match find_inline_attr(attrs) {
|
|
|
|
InlineNone | InlineNever => false,
|
|
|
|
InlineHint | InlineAlways => true
|
2012-03-02 13:14:10 -08:00
|
|
|
}
|
2012-03-19 10:19:00 -07:00
|
|
|
}
|
|
|
|
|
2013-08-23 14:34:00 -07:00
|
|
|
// Encodes the inherent implementations of a structure, enumeration, or trait.
|
|
|
|
fn encode_inherent_implementations(ecx: &EncodeContext,
|
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-09-02 03:45:37 +02:00
|
|
|
def_id: DefId) {
|
2013-12-19 19:15:06 -08:00
|
|
|
let inherent_impls = ecx.tcx.inherent_impls.borrow();
|
|
|
|
match inherent_impls.get().find(&def_id) {
|
2013-08-23 14:34:00 -07:00
|
|
|
None => {}
|
|
|
|
Some(&implementations) => {
|
|
|
|
for implementation in implementations.iter() {
|
|
|
|
ebml_w.start_tag(tag_items_data_item_inherent_impl);
|
|
|
|
encode_def_id(ebml_w, implementation.did);
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Encodes the implementations of a trait defined in this crate.
|
|
|
|
fn encode_extension_implementations(ecx: &EncodeContext,
|
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-09-02 03:45:37 +02:00
|
|
|
trait_def_id: DefId) {
|
2013-12-19 19:10:55 -08:00
|
|
|
let trait_impls = ecx.tcx.trait_impls.borrow();
|
|
|
|
match trait_impls.get().find(&trait_def_id) {
|
2013-08-23 14:34:00 -07:00
|
|
|
None => {}
|
|
|
|
Some(&implementations) => {
|
|
|
|
for implementation in implementations.iter() {
|
|
|
|
ebml_w.start_tag(tag_items_data_item_extension_impl);
|
|
|
|
encode_def_id(ebml_w, implementation.did);
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_info_for_item(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
item: @item,
|
2013-12-21 14:44:18 -08:00
|
|
|
index: @RefCell<~[entry<i64>]>,
|
2013-08-07 00:11:34 -07:00
|
|
|
path: &[ast_map::path_elt],
|
|
|
|
vis: ast::visibility) {
|
2012-05-13 17:01:52 -07:00
|
|
|
let tcx = ecx.tcx;
|
2012-03-22 18:03:12 -07:00
|
|
|
|
2013-10-25 18:08:45 -07:00
|
|
|
fn add_to_index(item: @item, ebml_w: &writer::Encoder,
|
2013-12-21 14:44:18 -08:00
|
|
|
index: @RefCell<~[entry<i64>]>) {
|
|
|
|
let mut index = index.borrow_mut();
|
|
|
|
index.get().push(entry {
|
|
|
|
val: item.id as i64,
|
|
|
|
pos: ebml_w.writer.tell(),
|
|
|
|
});
|
2012-03-22 18:03:12 -07:00
|
|
|
}
|
2013-11-19 13:22:03 -08:00
|
|
|
let add_to_index: || = || add_to_index(item, ebml_w, index);
|
2012-03-06 12:52:13 +01:00
|
|
|
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("encoding info for item at {}",
|
2012-11-12 18:24:56 -08:00
|
|
|
ecx.tcx.sess.codemap.span_to_str(item.span));
|
2012-10-30 11:19:15 -07:00
|
|
|
|
2013-07-16 16:28:33 -07:00
|
|
|
let def_id = local_def(item.id);
|
2013-03-20 01:17:42 -04:00
|
|
|
match item.node {
|
2013-06-21 18:46:34 -07:00
|
|
|
item_static(_, m, _) => {
|
2012-03-22 18:03:12 -07:00
|
|
|
add_to_index();
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_def_id(ebml_w, def_id);
|
2013-09-02 03:45:37 +02:00
|
|
|
if m == ast::MutMutable {
|
2013-06-21 18:46:34 -07:00
|
|
|
encode_family(ebml_w, 'b');
|
|
|
|
} else {
|
|
|
|
encode_family(ebml_w, 'c');
|
|
|
|
}
|
2012-01-30 17:28:30 +01:00
|
|
|
encode_type(ecx, ebml_w, node_id_to_type(tcx, item.id));
|
2011-07-27 14:19:39 +02:00
|
|
|
encode_symbol(ecx, ebml_w, item.id);
|
2013-06-18 09:39:16 -07:00
|
|
|
encode_name(ecx, ebml_w, item.ident);
|
2013-09-14 23:19:11 -07:00
|
|
|
let elt = ast_map::path_pretty_name(item.ident, item.id as u64);
|
|
|
|
encode_path(ecx, ebml_w, path, elt);
|
2013-12-18 18:11:41 -08:00
|
|
|
|
|
|
|
let non_inlineable;
|
|
|
|
{
|
|
|
|
let non_inlineable_statics = ecx.non_inlineable_statics.borrow();
|
|
|
|
non_inlineable = non_inlineable_statics.get().contains(&item.id);
|
|
|
|
}
|
|
|
|
|
|
|
|
if !non_inlineable {
|
2013-09-11 10:06:16 -07:00
|
|
|
(ecx.encode_inlined_item)(ecx, ebml_w, path, ii_item(item));
|
|
|
|
}
|
2013-08-07 00:11:34 -07:00
|
|
|
encode_visibility(ebml_w, vis);
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
2013-03-13 22:25:28 -04:00
|
|
|
item_fn(_, purity, _, ref generics, _) => {
|
2012-03-22 18:03:12 -07:00
|
|
|
add_to_index();
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_def_id(ebml_w, def_id);
|
2012-08-23 18:17:16 -07:00
|
|
|
encode_family(ebml_w, purity_fn_family(purity));
|
2013-02-14 21:50:03 -08:00
|
|
|
let tps_len = generics.ty_params.len();
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_bounds_and_type(ebml_w, ecx, &lookup_item_type(tcx, def_id));
|
2013-06-18 09:39:16 -07:00
|
|
|
encode_name(ecx, ebml_w, item.ident);
|
2013-01-22 11:57:39 -08:00
|
|
|
encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
|
|
|
|
encode_attributes(ebml_w, item.attrs);
|
2013-01-07 14:16:52 -08:00
|
|
|
if tps_len > 0u || should_inline(item.attrs) {
|
2012-11-29 17:51:16 -08:00
|
|
|
(ecx.encode_inlined_item)(ecx, ebml_w, path, ii_item(item));
|
2012-03-08 13:30:22 +01:00
|
|
|
} else {
|
|
|
|
encode_symbol(ecx, ebml_w, item.id);
|
2012-02-14 15:21:53 -08:00
|
|
|
}
|
2013-08-07 00:11:34 -07:00
|
|
|
encode_visibility(ebml_w, vis);
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
2013-02-17 22:20:36 -08:00
|
|
|
item_mod(ref m) => {
|
2012-03-22 18:03:12 -07:00
|
|
|
add_to_index();
|
2013-06-18 09:39:16 -07:00
|
|
|
encode_info_for_mod(ecx,
|
|
|
|
ebml_w,
|
|
|
|
m,
|
|
|
|
item.id,
|
|
|
|
path,
|
|
|
|
item.ident,
|
|
|
|
item.vis);
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
2013-06-18 09:39:16 -07:00
|
|
|
item_foreign_mod(ref fm) => {
|
2012-03-22 18:03:12 -07:00
|
|
|
add_to_index();
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_def_id(ebml_w, def_id);
|
2012-02-13 20:55:23 +01:00
|
|
|
encode_family(ebml_w, 'n');
|
2012-07-18 16:18:02 -07:00
|
|
|
encode_name(ecx, ebml_w, item.ident);
|
2013-01-22 11:57:39 -08:00
|
|
|
encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
|
2013-06-18 09:39:16 -07:00
|
|
|
|
|
|
|
// Encode all the items in this module.
|
2013-08-03 12:45:23 -04:00
|
|
|
for foreign_item in fm.items.iter() {
|
2013-06-18 09:39:16 -07:00
|
|
|
ebml_w.start_tag(tag_mod_child);
|
|
|
|
ebml_w.wr_str(def_to_str(local_def(foreign_item.id)));
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
2013-08-07 00:11:34 -07:00
|
|
|
encode_visibility(ebml_w, vis);
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
2013-11-28 12:22:53 -08:00
|
|
|
item_ty(..) => {
|
2012-03-22 18:03:12 -07:00
|
|
|
add_to_index();
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_def_id(ebml_w, def_id);
|
2012-02-13 20:55:23 +01:00
|
|
|
encode_family(ebml_w, 'y');
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_bounds_and_type(ebml_w, ecx, &lookup_item_type(tcx, def_id));
|
2012-07-18 16:18:02 -07:00
|
|
|
encode_name(ecx, ebml_w, item.ident);
|
2013-01-22 11:57:39 -08:00
|
|
|
encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
|
2013-08-07 00:11:34 -07:00
|
|
|
encode_visibility(ebml_w, vis);
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
2013-02-14 21:50:03 -08:00
|
|
|
item_enum(ref enum_definition, ref generics) => {
|
2012-03-22 18:03:12 -07:00
|
|
|
add_to_index();
|
2013-05-01 17:54:54 -07:00
|
|
|
|
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_def_id(ebml_w, def_id);
|
2013-05-01 17:54:54 -07:00
|
|
|
encode_family(ebml_w, 't');
|
2013-10-29 06:08:34 -04:00
|
|
|
encode_item_variances(ebml_w, ecx, item.id);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_bounds_and_type(ebml_w, ecx, &lookup_item_type(tcx, def_id));
|
2013-05-01 17:54:54 -07:00
|
|
|
encode_name(ecx, ebml_w, item.ident);
|
2013-05-24 18:08:45 -04:00
|
|
|
encode_attributes(ebml_w, item.attrs);
|
2013-08-03 12:45:23 -04:00
|
|
|
for v in (*enum_definition).variants.iter() {
|
2013-05-01 17:54:54 -07:00
|
|
|
encode_variant_id(ebml_w, local_def(v.node.id));
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
2013-05-01 17:54:54 -07:00
|
|
|
(ecx.encode_inlined_item)(ecx, ebml_w, path, ii_item(item));
|
|
|
|
encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
|
2013-08-23 14:34:00 -07:00
|
|
|
|
|
|
|
// Encode inherent implementations for this enumeration.
|
|
|
|
encode_inherent_implementations(ecx, ebml_w, def_id);
|
|
|
|
|
2013-08-07 00:11:34 -07:00
|
|
|
encode_visibility(ebml_w, vis);
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w.end_tag();
|
|
|
|
|
2012-12-04 21:13:02 -08:00
|
|
|
encode_enum_variant_info(ecx,
|
|
|
|
ebml_w,
|
|
|
|
item.id,
|
2013-01-22 11:57:39 -08:00
|
|
|
(*enum_definition).variants,
|
2012-12-04 21:13:02 -08:00
|
|
|
path,
|
|
|
|
index,
|
2013-02-14 21:50:03 -08:00
|
|
|
generics);
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
2013-07-16 16:28:33 -07:00
|
|
|
item_struct(struct_def, _) => {
|
2012-12-10 13:47:54 -08:00
|
|
|
/* First, encode the fields
|
2012-03-22 18:03:12 -07:00
|
|
|
These come first because we need to write them to make
|
|
|
|
the index, and the index needs to be in the item for the
|
|
|
|
class itself */
|
2013-01-22 11:57:39 -08:00
|
|
|
let idx = encode_info_for_struct(ecx, ebml_w, path,
|
|
|
|
struct_def.fields, index);
|
2012-06-12 16:25:09 -07:00
|
|
|
|
2012-03-22 18:03:12 -07:00
|
|
|
/* Index the class*/
|
|
|
|
add_to_index();
|
2013-02-14 21:50:03 -08:00
|
|
|
|
2012-03-22 18:03:12 -07:00
|
|
|
/* Now, make an item for the class itself */
|
2012-03-16 19:19:37 -07:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_def_id(ebml_w, def_id);
|
2012-10-08 11:49:01 -07:00
|
|
|
encode_family(ebml_w, 'S');
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_bounds_and_type(ebml_w, ecx, &lookup_item_type(tcx, def_id));
|
2013-02-11 16:28:39 -08:00
|
|
|
|
2013-10-29 06:08:34 -04:00
|
|
|
encode_item_variances(ebml_w, ecx, item.id);
|
2012-07-18 16:18:02 -07:00
|
|
|
encode_name(ecx, ebml_w, item.ident);
|
2013-05-06 23:35:27 +09:00
|
|
|
encode_attributes(ebml_w, item.attrs);
|
2013-01-22 11:57:39 -08:00
|
|
|
encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
|
2013-08-07 00:11:34 -07:00
|
|
|
encode_visibility(ebml_w, vis);
|
2012-06-12 16:25:09 -07:00
|
|
|
|
2012-03-22 18:03:12 -07:00
|
|
|
/* Encode def_ids for each field and method
|
2012-07-03 16:30:42 -07:00
|
|
|
for methods, write all the stuff get_trait_method
|
2012-03-22 18:03:12 -07:00
|
|
|
needs to know*/
|
2013-09-09 18:33:35 -04:00
|
|
|
encode_struct_fields(ecx, ebml_w, struct_def);
|
2012-08-15 15:53:58 -07:00
|
|
|
|
2013-09-26 21:53:40 -07:00
|
|
|
(ecx.encode_inlined_item)(ecx, ebml_w, path, ii_item(item));
|
|
|
|
|
2013-08-23 14:34:00 -07:00
|
|
|
// Encode inherent implementations for this structure.
|
|
|
|
encode_inherent_implementations(ecx, ebml_w, def_id);
|
|
|
|
|
2012-03-22 18:03:12 -07:00
|
|
|
/* Each class has its own index -- encode it */
|
2012-09-19 13:13:24 -07:00
|
|
|
let bkts = create_index(idx);
|
2013-08-06 19:35:09 -07:00
|
|
|
encode_index(ebml_w, bkts, write_i64);
|
2012-03-16 19:19:37 -07:00
|
|
|
ebml_w.end_tag();
|
2013-06-14 18:21:47 -07:00
|
|
|
|
|
|
|
// If this is a tuple- or enum-like struct, encode the type of the
|
|
|
|
// constructor.
|
|
|
|
if struct_def.fields.len() > 0 &&
|
|
|
|
struct_def.fields[0].node.kind == ast::unnamed_field {
|
|
|
|
let ctor_id = match struct_def.ctor_id {
|
|
|
|
Some(ctor_id) => ctor_id,
|
|
|
|
None => ecx.tcx.sess.bug("struct def didn't have ctor id"),
|
|
|
|
};
|
|
|
|
|
|
|
|
encode_info_for_struct_ctor(ecx,
|
|
|
|
ebml_w,
|
|
|
|
path,
|
|
|
|
item.ident,
|
|
|
|
ctor_id,
|
2013-09-26 21:53:40 -07:00
|
|
|
index,
|
|
|
|
def_id.node);
|
2013-06-14 18:21:47 -07:00
|
|
|
}
|
2012-01-31 19:30:40 -08:00
|
|
|
}
|
2013-12-01 00:00:39 +02:00
|
|
|
item_impl(_, ref opt_trait, ty, ref ast_methods) => {
|
2013-07-16 16:28:33 -07:00
|
|
|
// We need to encode information about the default methods we
|
|
|
|
// have inherited, so we drive this based on the impl structure.
|
2013-12-19 19:19:19 -08:00
|
|
|
let impls = tcx.impls.borrow();
|
|
|
|
let imp = impls.get().get(&def_id);
|
2013-07-16 16:28:33 -07:00
|
|
|
|
2012-03-22 18:03:12 -07:00
|
|
|
add_to_index();
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_def_id(ebml_w, def_id);
|
2012-02-13 20:55:23 +01:00
|
|
|
encode_family(ebml_w, 'i');
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_bounds_and_type(ebml_w, ecx, &lookup_item_type(tcx, def_id));
|
2012-07-18 16:18:02 -07:00
|
|
|
encode_name(ecx, ebml_w, item.ident);
|
2013-01-22 11:57:39 -08:00
|
|
|
encode_attributes(ebml_w, item.attrs);
|
2012-10-18 13:29:34 -07:00
|
|
|
match ty.node {
|
2013-08-07 09:47:28 -07:00
|
|
|
ast::ty_path(ref path, ref bounds, _) if path.segments
|
|
|
|
.len() == 1 => {
|
2013-06-20 18:23:25 -04:00
|
|
|
assert!(bounds.is_none());
|
2012-10-18 13:29:34 -07:00
|
|
|
encode_impl_type_basename(ecx, ebml_w,
|
|
|
|
ast_util::path_to_ident(path));
|
|
|
|
}
|
|
|
|
_ => {}
|
|
|
|
}
|
2013-08-03 12:45:23 -04:00
|
|
|
for method in imp.methods.iter() {
|
2012-11-13 19:08:01 -08:00
|
|
|
ebml_w.start_tag(tag_item_impl_method);
|
2013-07-16 16:28:33 -07:00
|
|
|
let s = def_to_str(method.def_id);
|
2013-06-11 13:10:37 +10:00
|
|
|
ebml_w.writer.write(s.as_bytes());
|
2012-11-13 19:08:01 -08:00
|
|
|
ebml_w.end_tag();
|
2011-12-16 14:17:52 +01:00
|
|
|
}
|
2013-08-03 12:45:23 -04:00
|
|
|
for ast_trait_ref in opt_trait.iter() {
|
2013-07-16 16:28:33 -07:00
|
|
|
let trait_ref = ty::node_id_to_trait_ref(
|
|
|
|
tcx, ast_trait_ref.ref_id);
|
2013-03-27 06:16:28 -04:00
|
|
|
encode_trait_ref(ebml_w, ecx, trait_ref, tag_item_trait_ref);
|
2013-07-22 16:40:31 -07:00
|
|
|
let impl_vtables = ty::lookup_impl_vtables(tcx, def_id);
|
|
|
|
encode_impl_vtables(ebml_w, ecx, &impl_vtables);
|
2012-07-18 09:31:53 -07:00
|
|
|
}
|
2013-09-06 23:56:17 -07:00
|
|
|
let elt = ast_map::impl_pretty_name(opt_trait, ty, item.ident);
|
|
|
|
encode_path(ecx, ebml_w, path, elt);
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-12-16 14:17:52 +01:00
|
|
|
|
2013-01-22 11:57:39 -08:00
|
|
|
// >:-<
|
|
|
|
let mut impl_path = vec::append(~[], path);
|
2013-09-06 23:56:17 -07:00
|
|
|
impl_path.push(elt);
|
2013-01-22 11:57:39 -08:00
|
|
|
|
2013-07-11 17:07:57 -07:00
|
|
|
// Iterate down the methods, emitting them. We rely on the
|
|
|
|
// assumption that all of the actually implemented methods
|
|
|
|
// appear first in the impl structure, in the same order they do
|
|
|
|
// in the ast. This is a little sketchy.
|
|
|
|
let num_implemented_methods = ast_methods.len();
|
2013-08-03 12:45:23 -04:00
|
|
|
for (i, m) in imp.methods.iter().enumerate() {
|
2013-07-11 17:07:57 -07:00
|
|
|
let ast_method = if i < num_implemented_methods {
|
|
|
|
Some(ast_methods[i])
|
|
|
|
} else { None };
|
|
|
|
|
2013-12-21 14:44:18 -08:00
|
|
|
{
|
|
|
|
let mut index = index.borrow_mut();
|
|
|
|
index.get().push(entry {
|
|
|
|
val: m.def_id.node as i64,
|
|
|
|
pos: ebml_w.writer.tell(),
|
|
|
|
});
|
|
|
|
}
|
2013-02-27 13:45:37 -08:00
|
|
|
encode_info_for_method(ecx,
|
|
|
|
ebml_w,
|
2013-07-11 17:07:57 -07:00
|
|
|
*m,
|
2013-02-27 13:45:37 -08:00
|
|
|
impl_path,
|
2013-07-16 16:28:33 -07:00
|
|
|
false,
|
2013-02-27 13:45:37 -08:00
|
|
|
item.id,
|
2013-07-11 17:07:57 -07:00
|
|
|
ast_method)
|
2011-12-16 14:17:52 +01:00
|
|
|
}
|
|
|
|
}
|
2013-07-16 16:28:33 -07:00
|
|
|
item_trait(_, ref super_traits, ref ms) => {
|
2012-03-22 18:03:12 -07:00
|
|
|
add_to_index();
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_def_id(ebml_w, def_id);
|
2012-02-13 20:55:23 +01:00
|
|
|
encode_family(ebml_w, 'I');
|
2013-10-29 06:08:34 -04:00
|
|
|
encode_item_variances(ebml_w, ecx, item.id);
|
2013-07-16 16:28:33 -07:00
|
|
|
let trait_def = ty::lookup_trait_def(tcx, def_id);
|
|
|
|
encode_ty_type_param_defs(ebml_w, ecx,
|
|
|
|
trait_def.generics.type_param_defs,
|
|
|
|
tag_items_data_item_ty_param_bounds);
|
2013-12-04 21:13:31 -05:00
|
|
|
encode_region_param_defs(ebml_w, ecx,
|
|
|
|
trait_def.generics.region_param_defs);
|
2013-03-27 06:16:28 -04:00
|
|
|
encode_trait_ref(ebml_w, ecx, trait_def.trait_ref, tag_item_trait_ref);
|
2012-07-18 16:18:02 -07:00
|
|
|
encode_name(ecx, ebml_w, item.ident);
|
2013-01-22 11:57:39 -08:00
|
|
|
encode_attributes(ebml_w, item.attrs);
|
2013-08-03 12:45:23 -04:00
|
|
|
for &method_def_id in ty::trait_method_def_ids(tcx, def_id).iter() {
|
2013-03-27 10:26:57 -04:00
|
|
|
ebml_w.start_tag(tag_item_trait_method);
|
|
|
|
encode_def_id(ebml_w, method_def_id);
|
|
|
|
ebml_w.end_tag();
|
2013-06-18 09:39:16 -07:00
|
|
|
|
|
|
|
ebml_w.start_tag(tag_mod_child);
|
|
|
|
ebml_w.wr_str(def_to_str(method_def_id));
|
|
|
|
ebml_w.end_tag();
|
2012-01-05 13:57:27 +01:00
|
|
|
}
|
2013-01-22 11:57:39 -08:00
|
|
|
encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
|
2013-08-16 16:57:42 -04:00
|
|
|
// FIXME(#8559): This should use the tcx's supertrait cache instead of
|
|
|
|
// reading the AST's list, because the former has already filtered out
|
|
|
|
// the builtin-kinds-as-supertraits. See corresponding fixme in decoder.
|
2013-08-03 12:45:23 -04:00
|
|
|
for ast_trait_ref in super_traits.iter() {
|
2013-03-27 06:16:28 -04:00
|
|
|
let trait_ref = ty::node_id_to_trait_ref(ecx.tcx, ast_trait_ref.ref_id);
|
|
|
|
encode_trait_ref(ebml_w, ecx, trait_ref, tag_item_super_trait_ref);
|
2012-08-03 15:02:01 -07:00
|
|
|
}
|
2013-08-23 14:34:00 -07:00
|
|
|
|
|
|
|
// Encode the implementations of this trait.
|
|
|
|
encode_extension_implementations(ecx, ebml_w, def_id);
|
|
|
|
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2012-08-02 16:01:38 -07:00
|
|
|
|
2013-03-27 10:26:57 -04:00
|
|
|
// Now output the method info for each method.
|
2013-07-16 16:28:33 -07:00
|
|
|
let r = ty::trait_method_def_ids(tcx, def_id);
|
2013-08-03 12:45:23 -04:00
|
|
|
for (i, &method_def_id) in r.iter().enumerate() {
|
2013-07-27 10:25:59 +02:00
|
|
|
assert_eq!(method_def_id.crate, ast::LOCAL_CRATE);
|
2012-08-02 16:01:38 -07:00
|
|
|
|
2013-05-02 08:11:15 -07:00
|
|
|
let method_ty = ty::method(tcx, method_def_id);
|
2013-03-27 10:26:57 -04:00
|
|
|
|
2013-12-21 14:44:18 -08:00
|
|
|
{
|
|
|
|
let mut index = index.borrow_mut();
|
|
|
|
index.get().push(entry {
|
|
|
|
val: method_def_id.node as i64,
|
|
|
|
pos: ebml_w.writer.tell(),
|
|
|
|
});
|
|
|
|
}
|
2012-08-02 16:01:38 -07:00
|
|
|
|
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-03-27 10:26:57 -04:00
|
|
|
|
2013-03-28 14:27:54 -04:00
|
|
|
encode_method_ty_fields(ecx, ebml_w, method_ty);
|
|
|
|
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_parent_item(ebml_w, def_id);
|
2013-03-28 14:27:54 -04:00
|
|
|
|
|
|
|
let mut trait_path = vec::append(~[], path);
|
|
|
|
trait_path.push(ast_map::path_name(item.ident));
|
|
|
|
encode_path(ecx, ebml_w, trait_path, ast_map::path_name(method_ty.ident));
|
2013-03-27 10:26:57 -04:00
|
|
|
|
2013-04-30 08:49:48 -07:00
|
|
|
match method_ty.explicit_self {
|
2013-03-27 10:26:57 -04:00
|
|
|
sty_static => {
|
|
|
|
encode_family(ebml_w,
|
|
|
|
purity_static_method_family(
|
|
|
|
method_ty.fty.purity));
|
|
|
|
|
|
|
|
let tpt = ty::lookup_item_type(tcx, method_def_id);
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_bounds_and_type(ebml_w, ecx, &tpt);
|
2013-03-27 10:26:57 -04:00
|
|
|
}
|
2013-03-18 17:20:45 -07:00
|
|
|
|
2013-03-27 10:26:57 -04:00
|
|
|
_ => {
|
|
|
|
encode_family(ebml_w,
|
|
|
|
purity_fn_family(
|
|
|
|
method_ty.fty.purity));
|
|
|
|
}
|
|
|
|
}
|
2012-08-02 16:01:38 -07:00
|
|
|
|
2013-03-27 10:26:57 -04:00
|
|
|
match ms[i] {
|
2013-12-15 21:52:48 -05:00
|
|
|
required(ref tm) => {
|
|
|
|
encode_attributes(ebml_w, tm.attrs);
|
2013-03-27 10:26:57 -04:00
|
|
|
encode_method_sort(ebml_w, 'r');
|
|
|
|
}
|
2013-02-14 21:50:03 -08:00
|
|
|
|
2013-03-27 10:26:57 -04:00
|
|
|
provided(m) => {
|
2013-12-15 21:52:48 -05:00
|
|
|
encode_attributes(ebml_w, m.attrs);
|
2013-07-11 15:08:43 -07:00
|
|
|
// If this is a static method, we've already encoded
|
|
|
|
// this.
|
|
|
|
if method_ty.explicit_self != sty_static {
|
2013-07-16 16:28:33 -07:00
|
|
|
// XXX: I feel like there is something funny going on.
|
|
|
|
let tpt = ty::lookup_item_type(tcx, method_def_id);
|
|
|
|
encode_bounds_and_type(ebml_w, ecx, &tpt);
|
2013-03-27 10:26:57 -04:00
|
|
|
}
|
|
|
|
encode_method_sort(ebml_w, 'p');
|
|
|
|
(ecx.encode_inlined_item)(
|
|
|
|
ecx, ebml_w, path,
|
2013-07-16 16:28:33 -07:00
|
|
|
ii_method(def_id, true, m));
|
2013-03-27 10:26:57 -04:00
|
|
|
}
|
|
|
|
}
|
2013-02-14 21:50:03 -08:00
|
|
|
|
2013-03-27 10:26:57 -04:00
|
|
|
ebml_w.end_tag();
|
2012-10-08 12:39:30 -07:00
|
|
|
}
|
2013-08-23 14:34:00 -07:00
|
|
|
|
|
|
|
// Encode inherent implementations for this trait.
|
|
|
|
encode_inherent_implementations(ecx, ebml_w, def_id);
|
2012-01-05 13:57:27 +01:00
|
|
|
}
|
2013-11-28 12:22:53 -08:00
|
|
|
item_mac(..) => fail!("item macros unimplemented")
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_info_for_foreign_item(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2012-06-26 16:18:37 -07:00
|
|
|
nitem: @foreign_item,
|
2013-12-21 14:44:18 -08:00
|
|
|
index: @RefCell<~[entry<i64>]>,
|
2013-07-02 12:47:32 -07:00
|
|
|
path: &ast_map::path,
|
2013-03-13 22:25:28 -04:00
|
|
|
abi: AbiSet) {
|
2013-12-21 14:44:18 -08:00
|
|
|
{
|
|
|
|
let mut index = index.borrow_mut();
|
|
|
|
index.get().push(entry {
|
|
|
|
val: nitem.id as i64,
|
|
|
|
pos: ebml_w.writer.tell(),
|
|
|
|
});
|
|
|
|
}
|
2012-03-08 23:37:45 +01:00
|
|
|
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data_item);
|
2013-02-14 21:50:03 -08:00
|
|
|
match nitem.node {
|
2013-11-28 12:22:53 -08:00
|
|
|
foreign_item_fn(..) => {
|
2011-07-27 14:19:39 +02:00
|
|
|
encode_def_id(ebml_w, local_def(nitem.id));
|
2013-08-02 14:30:00 -07:00
|
|
|
encode_family(ebml_w, purity_fn_family(impure_fn));
|
2013-07-16 16:28:33 -07:00
|
|
|
encode_bounds_and_type(ebml_w, ecx,
|
|
|
|
&lookup_item_type(ecx.tcx,local_def(nitem.id)));
|
2013-06-18 09:39:16 -07:00
|
|
|
encode_name(ecx, ebml_w, nitem.ident);
|
2013-03-13 22:25:28 -04:00
|
|
|
if abi.is_intrinsic() {
|
2013-07-02 12:47:32 -07:00
|
|
|
(ecx.encode_inlined_item)(ecx, ebml_w, *path, ii_foreign(nitem));
|
2012-03-21 15:42:20 +01:00
|
|
|
} else {
|
|
|
|
encode_symbol(ecx, ebml_w, nitem.id);
|
|
|
|
}
|
2013-07-02 12:47:32 -07:00
|
|
|
encode_path(ecx, ebml_w, *path, ast_map::path_name(nitem.ident));
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
2013-06-21 22:46:27 -07:00
|
|
|
foreign_item_static(_, mutbl) => {
|
2012-08-25 15:09:33 -07:00
|
|
|
encode_def_id(ebml_w, local_def(nitem.id));
|
2013-06-21 22:46:27 -07:00
|
|
|
if mutbl {
|
|
|
|
encode_family(ebml_w, 'b');
|
|
|
|
} else {
|
|
|
|
encode_family(ebml_w, 'c');
|
|
|
|
}
|
2012-08-25 15:09:33 -07:00
|
|
|
encode_type(ecx, ebml_w, node_id_to_type(ecx.tcx, nitem.id));
|
|
|
|
encode_symbol(ecx, ebml_w, nitem.id);
|
2013-06-18 09:39:16 -07:00
|
|
|
encode_name(ecx, ebml_w, nitem.ident);
|
2013-07-02 12:47:32 -07:00
|
|
|
encode_path(ecx, ebml_w, *path, ast_map::path_name(nitem.ident));
|
2012-08-25 15:09:33 -07:00
|
|
|
}
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
2013-09-02 03:45:37 +02:00
|
|
|
fn my_visit_expr(_e:@Expr) { }
|
2013-08-12 14:05:43 +02:00
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
fn my_visit_item(i: @item,
|
|
|
|
items: ast_map::map,
|
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
ecx_ptr: *int,
|
2013-12-21 14:44:18 -08:00
|
|
|
index: @RefCell<~[entry<i64>]>) {
|
2013-08-12 14:05:43 +02:00
|
|
|
match items.get_copy(&i.id) {
|
|
|
|
ast_map::node_item(_, pt) => {
|
2013-12-20 17:36:07 -08:00
|
|
|
let mut ebml_w = unsafe {
|
|
|
|
ebml_w.unsafe_clone()
|
|
|
|
};
|
2013-08-12 14:05:43 +02:00
|
|
|
// See above
|
|
|
|
let ecx : &EncodeContext = unsafe { cast::transmute(ecx_ptr) };
|
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 14:37:39 -07:00
|
|
|
encode_info_for_item(ecx, &mut ebml_w, i, index, *pt, i.vis);
|
2013-08-12 14:05:43 +02:00
|
|
|
}
|
2013-10-21 13:08:31 -07:00
|
|
|
_ => fail!("bad item")
|
2013-08-12 14:05:43 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
fn my_visit_foreign_item(ni: @foreign_item,
|
|
|
|
items: ast_map::map,
|
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
ecx_ptr:*int,
|
2013-12-21 14:44:18 -08:00
|
|
|
index: @RefCell<~[entry<i64>]>) {
|
2013-08-12 14:05:43 +02:00
|
|
|
match items.get_copy(&ni.id) {
|
|
|
|
ast_map::node_foreign_item(_, abi, _, pt) => {
|
2013-10-21 13:08:31 -07:00
|
|
|
debug!("writing foreign item {}::{}",
|
2013-08-12 14:05:43 +02:00
|
|
|
ast_map::path_to_str(
|
|
|
|
*pt,
|
|
|
|
token::get_ident_interner()),
|
|
|
|
token::ident_to_str(&ni.ident));
|
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
let mut ebml_w = unsafe {
|
|
|
|
ebml_w.unsafe_clone()
|
|
|
|
};
|
2013-08-12 14:05:43 +02:00
|
|
|
// See above
|
2013-12-20 17:36:07 -08:00
|
|
|
let ecx: &EncodeContext = unsafe { cast::transmute(ecx_ptr) };
|
2013-08-12 14:05:43 +02:00
|
|
|
encode_info_for_foreign_item(ecx,
|
|
|
|
&mut ebml_w,
|
|
|
|
ni,
|
|
|
|
index,
|
|
|
|
pt,
|
|
|
|
abi);
|
|
|
|
}
|
|
|
|
// case for separate item and foreign-item tables
|
2013-10-21 13:08:31 -07:00
|
|
|
_ => fail!("bad foreign item")
|
2013-08-12 14:05:43 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
struct EncodeVisitor<'a,'b> {
|
|
|
|
ebml_w_for_visit_item: &'a mut writer::Encoder<'b>,
|
2013-08-12 14:05:43 +02:00
|
|
|
ecx_ptr:*int,
|
|
|
|
items: ast_map::map,
|
2013-12-21 14:44:18 -08:00
|
|
|
index: @RefCell<~[entry<i64>]>,
|
2013-08-12 14:05:43 +02:00
|
|
|
}
|
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
impl<'a,'b> visit::Visitor<()> for EncodeVisitor<'a,'b> {
|
2013-09-02 03:45:37 +02:00
|
|
|
fn visit_expr(&mut self, ex:@Expr, _:()) {
|
2013-08-20 14:55:54 -07:00
|
|
|
visit::walk_expr(self, ex, ());
|
|
|
|
my_visit_expr(ex);
|
|
|
|
}
|
2013-08-12 14:05:43 +02:00
|
|
|
fn visit_item(&mut self, i:@item, _:()) {
|
|
|
|
visit::walk_item(self, i, ());
|
|
|
|
my_visit_item(i,
|
|
|
|
self.items,
|
2013-12-20 17:36:07 -08:00
|
|
|
self.ebml_w_for_visit_item,
|
2013-08-12 14:05:43 +02:00
|
|
|
self.ecx_ptr,
|
|
|
|
self.index);
|
|
|
|
}
|
|
|
|
fn visit_foreign_item(&mut self, ni:@foreign_item, _:()) {
|
|
|
|
visit::walk_foreign_item(self, ni, ());
|
|
|
|
my_visit_foreign_item(ni,
|
|
|
|
self.items,
|
2013-12-20 17:36:07 -08:00
|
|
|
self.ebml_w_for_visit_item,
|
2013-08-12 14:05:43 +02:00
|
|
|
self.ecx_ptr,
|
|
|
|
self.index);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_info_for_items(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-07-19 07:38:55 +02:00
|
|
|
crate: &Crate)
|
2013-08-06 19:35:09 -07:00
|
|
|
-> ~[entry<i64>] {
|
2013-12-21 14:44:18 -08:00
|
|
|
let index = @RefCell::new(~[]);
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items_data);
|
2013-12-21 14:44:18 -08:00
|
|
|
{
|
|
|
|
let mut index = index.borrow_mut();
|
|
|
|
index.get().push(entry {
|
|
|
|
val: CRATE_NODE_ID as i64,
|
|
|
|
pos: ebml_w.writer.tell(),
|
|
|
|
});
|
|
|
|
}
|
2013-06-18 09:39:16 -07:00
|
|
|
encode_info_for_mod(ecx,
|
|
|
|
ebml_w,
|
2013-07-19 07:38:55 +02:00
|
|
|
&crate.module,
|
2013-07-27 10:25:59 +02:00
|
|
|
CRATE_NODE_ID,
|
2013-06-18 09:39:16 -07:00
|
|
|
[],
|
|
|
|
syntax::parse::token::special_idents::invalid,
|
|
|
|
public);
|
2013-06-13 19:19:50 +12:00
|
|
|
let items = ecx.tcx.items;
|
|
|
|
|
|
|
|
// See comment in `encode_side_tables_for_ii` in astencode
|
2013-08-12 14:05:43 +02:00
|
|
|
let ecx_ptr : *int = unsafe { cast::transmute(ecx) };
|
2013-12-20 17:36:07 -08:00
|
|
|
{
|
|
|
|
let mut visitor = EncodeVisitor {
|
|
|
|
index: index,
|
|
|
|
items: items,
|
|
|
|
ecx_ptr: ecx_ptr,
|
|
|
|
ebml_w_for_visit_item: &mut *ebml_w,
|
|
|
|
};
|
2013-08-12 14:05:43 +02:00
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
visit::walk_crate(&mut visitor, crate, ());
|
|
|
|
}
|
2013-08-12 14:05:43 +02:00
|
|
|
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2013-12-21 14:44:18 -08:00
|
|
|
return /*bad*/(*index).get();
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Path and definition ID indexing
|
|
|
|
|
2013-07-18 17:12:46 -07:00
|
|
|
fn create_index<T:Clone + Hash + IterBytes + 'static>(
|
|
|
|
index: ~[entry<T>])
|
|
|
|
-> ~[@~[entry<T>]] {
|
2013-12-21 14:44:18 -08:00
|
|
|
let mut buckets: ~[@RefCell<~[entry<T>]>] = ~[];
|
|
|
|
for _ in range(0u, 256u) {
|
|
|
|
buckets.push(@RefCell::new(~[]));
|
|
|
|
}
|
2013-08-03 12:45:23 -04:00
|
|
|
for elt in index.iter() {
|
2012-09-19 13:13:24 -07:00
|
|
|
let h = elt.val.hash() as uint;
|
2013-12-21 14:44:18 -08:00
|
|
|
let mut bucket = buckets[h % 256].borrow_mut();
|
|
|
|
bucket.get().push((*elt).clone());
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
2011-07-14 14:25:43 -07:00
|
|
|
|
2012-06-29 16:26:56 -07:00
|
|
|
let mut buckets_frozen = ~[];
|
2013-08-03 12:45:23 -04:00
|
|
|
for bucket in buckets.iter() {
|
2013-12-21 14:44:18 -08:00
|
|
|
buckets_frozen.push(@/*bad*/(**bucket).get());
|
2011-07-14 14:25:43 -07:00
|
|
|
}
|
2012-08-01 17:30:05 -07:00
|
|
|
return buckets_frozen;
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
2013-07-18 17:12:46 -07:00
|
|
|
fn encode_index<T:'static>(
|
|
|
|
ebml_w: &mut writer::Encoder,
|
|
|
|
buckets: ~[@~[entry<T>]],
|
2013-12-20 17:36:07 -08:00
|
|
|
write_fn: |&mut MemWriter, &T|) {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_index);
|
2013-10-21 17:11:42 -07:00
|
|
|
let mut bucket_locs = ~[];
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_index_buckets);
|
2013-08-03 12:45:23 -04:00
|
|
|
for bucket in buckets.iter() {
|
2012-09-26 17:33:34 -07:00
|
|
|
bucket_locs.push(ebml_w.writer.tell());
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_index_buckets_bucket);
|
2013-08-03 12:45:23 -04:00
|
|
|
for elt in (**bucket).iter() {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_index_buckets_bucket_elt);
|
2013-03-28 18:39:09 -07:00
|
|
|
assert!(elt.pos < 0xffff_ffff);
|
2013-10-21 17:11:42 -07:00
|
|
|
{
|
|
|
|
let wr: &mut MemWriter = ebml_w.writer;
|
2013-10-25 18:08:45 -07:00
|
|
|
wr.write_be_u32(elt.pos as u32);
|
2013-10-21 17:11:42 -07:00
|
|
|
}
|
|
|
|
write_fn(ebml_w.writer, &elt.val);
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.start_tag(tag_index_table);
|
2013-08-03 12:45:23 -04:00
|
|
|
for pos in bucket_locs.iter() {
|
2013-03-28 18:39:09 -07:00
|
|
|
assert!(*pos < 0xffff_ffff);
|
2013-10-21 17:11:42 -07:00
|
|
|
let wr: &mut MemWriter = ebml_w.writer;
|
2013-10-25 18:08:45 -07:00
|
|
|
wr.write_be_u32(*pos as u32);
|
2012-08-02 17:17:07 -07:00
|
|
|
}
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.end_tag();
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
fn write_i64(writer: &mut MemWriter, &n: &i64) {
|
2013-10-21 17:11:42 -07:00
|
|
|
let wr: &mut MemWriter = writer;
|
2013-03-28 18:39:09 -07:00
|
|
|
assert!(n < 0x7fff_ffff);
|
2013-10-25 18:08:45 -07:00
|
|
|
wr.write_be_u32(n as u32);
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
|
|
|
|
2013-07-19 21:51:37 +10:00
|
|
|
fn encode_meta_item(ebml_w: &mut writer::Encoder, mi: @MetaItem) {
|
2012-08-06 12:34:08 -07:00
|
|
|
match mi.node {
|
2013-07-19 21:51:37 +10:00
|
|
|
MetaWord(name) => {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_meta_item_word);
|
|
|
|
ebml_w.start_tag(tag_meta_item_name);
|
2013-06-11 13:10:37 +10:00
|
|
|
ebml_w.writer.write(name.as_bytes());
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.end_tag();
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
2013-07-19 21:51:37 +10:00
|
|
|
MetaNameValue(name, value) => {
|
2012-08-06 12:34:08 -07:00
|
|
|
match value.node {
|
2013-10-08 02:49:10 +02:00
|
|
|
lit_str(value, _) => {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_meta_item_name_value);
|
|
|
|
ebml_w.start_tag(tag_meta_item_name);
|
2013-06-11 13:10:37 +10:00
|
|
|
ebml_w.writer.write(name.as_bytes());
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.start_tag(tag_meta_item_value);
|
2013-06-11 13:10:37 +10:00
|
|
|
ebml_w.writer.write(value.as_bytes());
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.end_tag();
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
2012-08-03 19:59:04 -07:00
|
|
|
_ => {/* FIXME (#623): encode other variants */ }
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
|
|
|
}
|
2013-07-19 21:51:37 +10:00
|
|
|
MetaList(name, ref items) => {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_meta_item_list);
|
|
|
|
ebml_w.start_tag(tag_meta_item_name);
|
2013-06-11 13:10:37 +10:00
|
|
|
ebml_w.writer.write(name.as_bytes());
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2013-08-03 12:45:23 -04:00
|
|
|
for inner_item in items.iter() {
|
2013-02-25 06:19:44 -08:00
|
|
|
encode_meta_item(ebml_w, *inner_item);
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-07-27 14:19:39 +02:00
|
|
|
}
|
2011-06-27 19:41:48 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-07-19 21:51:37 +10:00
|
|
|
fn encode_attributes(ebml_w: &mut writer::Encoder, attrs: &[Attribute]) {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_attributes);
|
2013-08-03 12:45:23 -04:00
|
|
|
for attr in attrs.iter() {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_attribute);
|
2011-06-27 19:41:48 -07:00
|
|
|
encode_meta_item(ebml_w, attr.node.value);
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-06-27 19:41:48 -07:00
|
|
|
}
|
|
|
|
|
2013-12-09 14:56:53 -07:00
|
|
|
// So there's a special crate attribute called 'pkgid' which defines the
|
|
|
|
// metadata that Rust cares about for linking crates. If the user didn't
|
|
|
|
// provide it we will throw it in anyway with a default value.
|
2013-06-13 19:19:50 +12:00
|
|
|
fn synthesize_crate_attrs(ecx: &EncodeContext,
|
2013-07-19 07:38:55 +02:00
|
|
|
crate: &Crate) -> ~[Attribute] {
|
2011-06-29 14:17:23 -07:00
|
|
|
|
2013-12-09 14:56:53 -07:00
|
|
|
fn synthesize_pkgid_attr(ecx: &EncodeContext) -> Attribute {
|
|
|
|
assert!(!ecx.link_meta.pkgid.name.is_empty());
|
2011-06-29 14:17:23 -07:00
|
|
|
|
2013-12-09 14:56:53 -07:00
|
|
|
attr::mk_attr(
|
|
|
|
attr::mk_name_value_item_str(
|
2013-12-17 16:40:33 -05:00
|
|
|
@"crate_id",
|
2013-12-09 14:56:53 -07:00
|
|
|
ecx.link_meta.pkgid.to_str().to_managed()))
|
2011-06-29 14:17:23 -07:00
|
|
|
}
|
|
|
|
|
2013-07-19 21:51:37 +10:00
|
|
|
let mut attrs = ~[];
|
2013-08-03 12:45:23 -04:00
|
|
|
for attr in crate.attrs.iter() {
|
2013-12-17 16:40:33 -05:00
|
|
|
if "crate_id" != attr.name() {
|
2013-12-09 14:56:53 -07:00
|
|
|
attrs.push(*attr);
|
|
|
|
}
|
2011-06-29 14:17:23 -07:00
|
|
|
}
|
2013-12-09 14:56:53 -07:00
|
|
|
attrs.push(synthesize_pkgid_attr(ecx));
|
2011-06-29 14:17:23 -07:00
|
|
|
|
2013-12-09 14:56:53 -07:00
|
|
|
attrs
|
2011-06-29 14:17:23 -07:00
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_crate_deps(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-06-13 19:19:50 +12:00
|
|
|
cstore: &cstore::CStore) {
|
|
|
|
fn get_ordered_deps(ecx: &EncodeContext, cstore: &cstore::CStore)
|
2013-08-31 18:13:04 +02:00
|
|
|
-> ~[decoder::CrateDep] {
|
|
|
|
type numdep = decoder::CrateDep;
|
2011-07-08 11:29:56 -07:00
|
|
|
|
2012-04-08 01:59:37 +08:00
|
|
|
// Pull the cnums and name,vers,hash out of cstore
|
2013-02-11 08:36:42 -08:00
|
|
|
let mut deps = ~[];
|
2013-12-25 13:08:04 -07:00
|
|
|
cstore.iter_crate_data(|key, val| {
|
2013-08-31 18:13:04 +02:00
|
|
|
let dep = decoder::CrateDep {cnum: key,
|
2013-06-13 03:02:55 +10:00
|
|
|
name: ecx.tcx.sess.ident_of(val.name),
|
2013-12-18 14:10:28 -08:00
|
|
|
vers: decoder::get_crate_vers(val.data()),
|
|
|
|
hash: decoder::get_crate_hash(val.data())};
|
2012-09-26 17:33:34 -07:00
|
|
|
deps.push(dep);
|
2013-11-21 15:42:55 -08:00
|
|
|
});
|
2011-07-08 11:29:56 -07:00
|
|
|
|
|
|
|
// Sort by cnum
|
2013-12-20 14:42:00 +11:00
|
|
|
deps.sort_by(|kv1, kv2| kv1.cnum.cmp(&kv2.cnum));
|
2011-07-08 11:29:56 -07:00
|
|
|
|
|
|
|
// Sanity-check the crate numbers
|
2012-03-15 09:47:03 -04:00
|
|
|
let mut expected_cnum = 1;
|
2013-08-03 12:45:23 -04:00
|
|
|
for n in deps.iter() {
|
2013-05-18 22:02:45 -04:00
|
|
|
assert_eq!(n.cnum, expected_cnum);
|
2011-07-08 11:29:56 -07:00
|
|
|
expected_cnum += 1;
|
|
|
|
}
|
|
|
|
|
2013-06-29 15:05:50 +10:00
|
|
|
deps
|
2011-07-08 11:29:56 -07:00
|
|
|
}
|
|
|
|
|
2012-04-08 01:59:37 +08:00
|
|
|
// We're just going to write a list of crate 'name-hash-version's, with
|
|
|
|
// the assumption that they are numbered 1 to n.
|
2012-06-21 16:44:10 -07:00
|
|
|
// FIXME (#2166): This is not nearly enough to support correct versioning
|
2011-07-08 11:29:56 -07:00
|
|
|
// but is enough to get transitive crate dependencies working.
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_crate_deps);
|
2013-06-21 08:29:53 -04:00
|
|
|
let r = get_ordered_deps(ecx, cstore);
|
2013-08-03 12:45:23 -04:00
|
|
|
for dep in r.iter() {
|
2012-09-19 16:55:01 -07:00
|
|
|
encode_crate_dep(ecx, ebml_w, *dep);
|
2011-07-08 11:29:56 -07:00
|
|
|
}
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-07-08 11:29:56 -07:00
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_lang_items(ecx: &EncodeContext, ebml_w: &mut writer::Encoder) {
|
2013-01-07 10:51:53 -08:00
|
|
|
ebml_w.start_tag(tag_lang_items);
|
|
|
|
|
2013-09-30 02:34:36 +02:00
|
|
|
for (i, def_id) in ecx.tcx.lang_items.items() {
|
2013-08-03 12:45:23 -04:00
|
|
|
for id in def_id.iter() {
|
2013-08-02 02:17:20 -04:00
|
|
|
if id.crate == LOCAL_CRATE {
|
|
|
|
ebml_w.start_tag(tag_lang_items_item);
|
2013-01-07 10:51:53 -08:00
|
|
|
|
2013-08-02 02:17:20 -04:00
|
|
|
ebml_w.start_tag(tag_lang_items_item_id);
|
2013-10-21 17:11:42 -07:00
|
|
|
{
|
|
|
|
let wr: &mut MemWriter = ebml_w.writer;
|
2013-10-25 18:08:45 -07:00
|
|
|
wr.write_be_u32(i as u32);
|
2013-10-21 17:11:42 -07:00
|
|
|
}
|
2013-08-02 02:17:20 -04:00
|
|
|
ebml_w.end_tag(); // tag_lang_items_item_id
|
2013-01-07 10:51:53 -08:00
|
|
|
|
2013-08-02 02:17:20 -04:00
|
|
|
ebml_w.start_tag(tag_lang_items_item_node_id);
|
2013-10-21 17:11:42 -07:00
|
|
|
{
|
|
|
|
let wr: &mut MemWriter = ebml_w.writer;
|
2013-10-25 18:08:45 -07:00
|
|
|
wr.write_be_u32(id.node as u32);
|
2013-10-21 17:11:42 -07:00
|
|
|
}
|
2013-08-02 02:17:20 -04:00
|
|
|
ebml_w.end_tag(); // tag_lang_items_item_node_id
|
2013-01-07 10:51:53 -08:00
|
|
|
|
2013-08-02 02:17:20 -04:00
|
|
|
ebml_w.end_tag(); // tag_lang_items_item
|
|
|
|
}
|
|
|
|
}
|
2013-09-30 02:34:36 +02:00
|
|
|
}
|
2013-01-07 10:51:53 -08:00
|
|
|
|
|
|
|
ebml_w.end_tag(); // tag_lang_items
|
|
|
|
}
|
|
|
|
|
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 14:03:29 -08:00
|
|
|
fn encode_native_libraries(ecx: &EncodeContext, ebml_w: &mut writer::Encoder) {
|
|
|
|
ebml_w.start_tag(tag_native_libraries);
|
|
|
|
|
2013-12-20 19:54:01 -08:00
|
|
|
let used_libraries = ecx.tcx.sess.cstore.get_used_libraries();
|
|
|
|
let used_libraries = used_libraries.borrow();
|
|
|
|
for &(ref lib, kind) in used_libraries.get().iter() {
|
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 14:03:29 -08:00
|
|
|
match kind {
|
|
|
|
cstore::NativeStatic => {} // these libraries are not propagated
|
2013-11-30 11:39:55 -08:00
|
|
|
cstore::NativeFramework | cstore::NativeUnknown => {
|
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 14:03:29 -08:00
|
|
|
ebml_w.start_tag(tag_native_libraries_lib);
|
2013-11-30 11:39:55 -08:00
|
|
|
|
|
|
|
ebml_w.start_tag(tag_native_libraries_kind);
|
|
|
|
ebml_w.writer.write_be_u32(kind as u32);
|
|
|
|
ebml_w.end_tag();
|
|
|
|
|
|
|
|
ebml_w.start_tag(tag_native_libraries_name);
|
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 14:03:29 -08:00
|
|
|
ebml_w.writer.write(lib.as_bytes());
|
|
|
|
ebml_w.end_tag();
|
2013-11-30 11:39:55 -08:00
|
|
|
|
|
|
|
ebml_w.end_tag();
|
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 14:03:29 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
struct ImplVisitor<'a,'b> {
|
2013-12-09 23:16:18 -08:00
|
|
|
ecx: &'a EncodeContext<'a>,
|
2013-12-20 17:36:07 -08:00
|
|
|
ebml_w: &'a mut writer::Encoder<'b>,
|
2013-08-20 14:55:54 -07:00
|
|
|
}
|
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
impl<'a,'b> Visitor<()> for ImplVisitor<'a,'b> {
|
2013-08-20 14:55:54 -07:00
|
|
|
fn visit_item(&mut self, item: @item, _: ()) {
|
|
|
|
match item.node {
|
2013-08-23 14:34:00 -07:00
|
|
|
item_impl(_, Some(ref trait_ref), _, _) => {
|
|
|
|
let def_map = self.ecx.tcx.def_map;
|
|
|
|
let trait_def = def_map.get_copy(&trait_ref.ref_id);
|
|
|
|
let def_id = ast_util::def_id_of_def(trait_def);
|
|
|
|
|
|
|
|
// Load eagerly if this is an implementation of the Drop trait
|
|
|
|
// or if the trait is not defined in this crate.
|
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 14:37:39 -07:00
|
|
|
if Some(def_id) == self.ecx.tcx.lang_items.drop_trait() ||
|
2013-08-23 14:34:00 -07:00
|
|
|
def_id.crate != LOCAL_CRATE {
|
|
|
|
self.ebml_w.start_tag(tag_impls_impl);
|
|
|
|
encode_def_id(self.ebml_w, local_def(item.id));
|
|
|
|
self.ebml_w.end_tag();
|
|
|
|
}
|
2013-08-20 14:55:54 -07:00
|
|
|
}
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
visit::walk_item(self, item, ());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-23 14:34:00 -07:00
|
|
|
/// Encodes implementations that are eagerly loaded.
|
|
|
|
///
|
|
|
|
/// None of this is necessary in theory; we can load all implementations
|
|
|
|
/// lazily. However, in two cases the optimizations to lazily load
|
|
|
|
/// implementations are not yet implemented. These two cases, which require us
|
|
|
|
/// to load implementations eagerly, are:
|
|
|
|
///
|
|
|
|
/// * Destructors (implementations of the Drop trait).
|
|
|
|
///
|
|
|
|
/// * Implementations of traits not defined in this crate.
|
2013-08-20 14:55:54 -07:00
|
|
|
fn encode_impls(ecx: &EncodeContext,
|
|
|
|
crate: &Crate,
|
|
|
|
ebml_w: &mut writer::Encoder) {
|
|
|
|
ebml_w.start_tag(tag_impls);
|
|
|
|
|
|
|
|
{
|
|
|
|
let mut visitor = ImplVisitor {
|
|
|
|
ecx: ecx,
|
|
|
|
ebml_w: ebml_w,
|
|
|
|
};
|
|
|
|
visit::walk_crate(&mut visitor, crate, ());
|
|
|
|
}
|
|
|
|
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2013-06-18 09:39:16 -07:00
|
|
|
fn encode_misc_info(ecx: &EncodeContext,
|
2013-07-19 07:38:55 +02:00
|
|
|
crate: &Crate,
|
2013-06-18 09:39:16 -07:00
|
|
|
ebml_w: &mut writer::Encoder) {
|
|
|
|
ebml_w.start_tag(tag_misc_info);
|
|
|
|
ebml_w.start_tag(tag_misc_info_crate_items);
|
2013-08-03 12:45:23 -04:00
|
|
|
for &item in crate.module.items.iter() {
|
2013-06-18 09:39:16 -07:00
|
|
|
ebml_w.start_tag(tag_mod_child);
|
|
|
|
ebml_w.wr_str(def_to_str(local_def(item.id)));
|
|
|
|
ebml_w.end_tag();
|
|
|
|
|
2013-11-21 15:42:55 -08:00
|
|
|
each_auxiliary_node_id(item, |auxiliary_node_id| {
|
2013-06-18 09:39:16 -07:00
|
|
|
ebml_w.start_tag(tag_mod_child);
|
|
|
|
ebml_w.wr_str(def_to_str(local_def(auxiliary_node_id)));
|
|
|
|
ebml_w.end_tag();
|
2013-08-02 02:17:20 -04:00
|
|
|
true
|
2013-11-21 15:42:55 -08:00
|
|
|
});
|
2013-06-18 09:39:16 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
// Encode reexports for the root module.
|
|
|
|
encode_reexports(ecx, ebml_w, 0, []);
|
|
|
|
|
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2013-06-13 19:19:50 +12:00
|
|
|
fn encode_crate_dep(ecx: &EncodeContext,
|
2013-05-01 17:54:54 -07:00
|
|
|
ebml_w: &mut writer::Encoder,
|
2013-08-31 18:13:04 +02:00
|
|
|
dep: decoder::CrateDep) {
|
2012-04-08 01:59:37 +08:00
|
|
|
ebml_w.start_tag(tag_crate_dep);
|
|
|
|
ebml_w.start_tag(tag_crate_dep_name);
|
2013-06-11 13:10:37 +10:00
|
|
|
let s = ecx.tcx.sess.str_of(dep.name);
|
|
|
|
ebml_w.writer.write(s.as_bytes());
|
2012-04-08 01:59:37 +08:00
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.start_tag(tag_crate_dep_vers);
|
2013-06-11 13:10:37 +10:00
|
|
|
ebml_w.writer.write(dep.vers.as_bytes());
|
2012-04-08 01:59:37 +08:00
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.start_tag(tag_crate_dep_hash);
|
2013-06-11 13:10:37 +10:00
|
|
|
ebml_w.writer.write(dep.hash.as_bytes());
|
2012-04-08 01:59:37 +08:00
|
|
|
ebml_w.end_tag();
|
|
|
|
ebml_w.end_tag();
|
|
|
|
}
|
|
|
|
|
2013-05-01 17:54:54 -07:00
|
|
|
fn encode_hash(ebml_w: &mut writer::Encoder, hash: &str) {
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_crate_hash);
|
2013-06-11 13:10:37 +10:00
|
|
|
ebml_w.writer.write(hash.as_bytes());
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2011-12-11 23:23:38 +08:00
|
|
|
}
|
|
|
|
|
2012-09-05 15:27:22 -07:00
|
|
|
// NB: Increment this as you change the metadata encoding version.
|
2013-03-22 14:00:15 -07:00
|
|
|
pub static metadata_encoding_version : &'static [u8] =
|
2013-02-26 14:34:00 -05:00
|
|
|
&[0x72, //'r' as u8,
|
|
|
|
0x75, //'u' as u8,
|
|
|
|
0x73, //'s' as u8,
|
|
|
|
0x74, //'t' as u8,
|
|
|
|
0, 0, 0, 1 ];
|
2012-09-05 15:27:22 -07:00
|
|
|
|
2013-07-19 07:38:55 +02:00
|
|
|
pub fn encode_metadata(parms: EncodeParams, crate: &Crate) -> ~[u8] {
|
2013-10-21 17:11:42 -07:00
|
|
|
let wr = @mut MemWriter::new();
|
2013-04-12 01:15:30 -04:00
|
|
|
let stats = Stats {
|
2013-02-04 14:02:01 -08:00
|
|
|
inline_bytes: 0,
|
|
|
|
attr_bytes: 0,
|
|
|
|
dep_bytes: 0,
|
|
|
|
lang_item_bytes: 0,
|
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 14:03:29 -08:00
|
|
|
native_lib_bytes: 0,
|
2013-08-20 14:55:54 -07:00
|
|
|
impl_bytes: 0,
|
2013-06-18 09:39:16 -07:00
|
|
|
misc_bytes: 0,
|
2013-02-04 14:02:01 -08:00
|
|
|
item_bytes: 0,
|
|
|
|
index_bytes: 0,
|
|
|
|
zero_bytes: 0,
|
|
|
|
total_bytes: 0,
|
|
|
|
n_inlines: 0
|
|
|
|
};
|
2013-06-18 09:39:16 -07:00
|
|
|
let EncodeParams {
|
|
|
|
item_symbols,
|
|
|
|
diag,
|
|
|
|
tcx,
|
|
|
|
reexports2,
|
|
|
|
cstore,
|
|
|
|
encode_inlined_item,
|
|
|
|
link_meta,
|
|
|
|
reachable,
|
2013-09-11 10:06:16 -07:00
|
|
|
non_inlineable_statics,
|
2013-11-28 12:22:53 -08:00
|
|
|
..
|
2013-06-18 09:39:16 -07:00
|
|
|
} = parms;
|
2013-12-20 20:18:52 -08:00
|
|
|
let type_abbrevs = @RefCell::new(HashMap::new());
|
2013-06-13 19:19:50 +12:00
|
|
|
let stats = @mut stats;
|
|
|
|
let ecx = EncodeContext {
|
2013-03-22 22:26:41 -04:00
|
|
|
diag: diag,
|
|
|
|
tcx: tcx,
|
2013-06-13 19:19:50 +12:00
|
|
|
stats: stats,
|
2013-03-22 22:26:41 -04:00
|
|
|
reexports2: reexports2,
|
|
|
|
item_symbols: item_symbols,
|
2013-09-11 10:06:16 -07:00
|
|
|
non_inlineable_statics: non_inlineable_statics,
|
2013-03-22 22:26:41 -04:00
|
|
|
link_meta: link_meta,
|
|
|
|
cstore: cstore,
|
|
|
|
encode_inlined_item: encode_inlined_item,
|
2013-06-18 09:39:16 -07:00
|
|
|
type_abbrevs: type_abbrevs,
|
|
|
|
reachable: reachable,
|
2013-02-19 02:40:42 -05:00
|
|
|
};
|
2011-07-07 23:55:41 -07:00
|
|
|
|
2013-10-21 17:11:42 -07:00
|
|
|
let mut ebml_w = writer::Encoder(wr);
|
2011-06-27 15:20:17 -07:00
|
|
|
|
2013-12-09 14:56:53 -07:00
|
|
|
encode_hash(&mut ebml_w, ecx.link_meta.crate_hash);
|
2011-12-11 23:23:38 +08:00
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
let mut i = ebml_w.writer.tell();
|
2013-06-13 19:19:50 +12:00
|
|
|
let crate_attrs = synthesize_crate_attrs(&ecx, crate);
|
2013-05-01 17:54:54 -07:00
|
|
|
encode_attributes(&mut ebml_w, crate_attrs);
|
2013-12-20 17:36:07 -08:00
|
|
|
ecx.stats.attr_bytes = ebml_w.writer.tell() - i;
|
2011-07-08 11:29:56 -07:00
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
i = ebml_w.writer.tell();
|
2013-06-13 19:19:50 +12:00
|
|
|
encode_crate_deps(&ecx, &mut ebml_w, ecx.cstore);
|
2013-12-20 17:36:07 -08:00
|
|
|
ecx.stats.dep_bytes = ebml_w.writer.tell() - i;
|
2011-07-08 11:29:56 -07:00
|
|
|
|
2013-01-07 10:51:53 -08:00
|
|
|
// Encode the language items.
|
2013-12-20 17:36:07 -08:00
|
|
|
i = ebml_w.writer.tell();
|
2013-06-13 19:19:50 +12:00
|
|
|
encode_lang_items(&ecx, &mut ebml_w);
|
2013-12-20 17:36:07 -08:00
|
|
|
ecx.stats.lang_item_bytes = ebml_w.writer.tell() - i;
|
2013-01-07 10:51:53 -08:00
|
|
|
|
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 14:03:29 -08:00
|
|
|
// Encode the native libraries used
|
2013-12-20 17:36:07 -08:00
|
|
|
i = ebml_w.writer.tell();
|
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 14:03:29 -08:00
|
|
|
encode_native_libraries(&ecx, &mut ebml_w);
|
2013-12-20 17:36:07 -08:00
|
|
|
ecx.stats.native_lib_bytes = ebml_w.writer.tell() - i;
|
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 14:03:29 -08:00
|
|
|
|
2013-08-20 14:55:54 -07:00
|
|
|
// Encode the def IDs of impls, for coherence checking.
|
2013-12-20 17:36:07 -08:00
|
|
|
i = ebml_w.writer.tell();
|
2013-08-20 14:55:54 -07:00
|
|
|
encode_impls(&ecx, crate, &mut ebml_w);
|
2013-12-20 17:36:07 -08:00
|
|
|
ecx.stats.impl_bytes = ebml_w.writer.tell() - i;
|
2013-08-20 14:55:54 -07:00
|
|
|
|
2013-06-18 09:39:16 -07:00
|
|
|
// Encode miscellaneous info.
|
2013-12-20 17:36:07 -08:00
|
|
|
i = ebml_w.writer.tell();
|
2013-06-18 09:39:16 -07:00
|
|
|
encode_misc_info(&ecx, crate, &mut ebml_w);
|
2013-12-20 17:36:07 -08:00
|
|
|
ecx.stats.misc_bytes = ebml_w.writer.tell() - i;
|
2013-06-18 09:39:16 -07:00
|
|
|
|
2012-01-11 15:15:54 +01:00
|
|
|
// Encode and index the items.
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.start_tag(tag_items);
|
2013-12-20 17:36:07 -08:00
|
|
|
i = ebml_w.writer.tell();
|
2013-06-13 19:19:50 +12:00
|
|
|
let items_index = encode_info_for_items(&ecx, &mut ebml_w, crate);
|
2013-12-20 17:36:07 -08:00
|
|
|
ecx.stats.item_bytes = ebml_w.writer.tell() - i;
|
2012-08-27 16:53:54 -07:00
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
i = ebml_w.writer.tell();
|
2012-09-19 13:13:24 -07:00
|
|
|
let items_buckets = create_index(items_index);
|
2013-08-06 19:35:09 -07:00
|
|
|
encode_index(&mut ebml_w, items_buckets, write_i64);
|
2013-12-20 17:36:07 -08:00
|
|
|
ecx.stats.index_bytes = ebml_w.writer.tell() - i;
|
2012-02-14 15:21:53 -08:00
|
|
|
ebml_w.end_tag();
|
2012-01-11 15:15:54 +01:00
|
|
|
|
2013-12-20 17:36:07 -08:00
|
|
|
ecx.stats.total_bytes = ebml_w.writer.tell();
|
2012-08-27 16:53:54 -07:00
|
|
|
|
2013-03-22 22:26:41 -04:00
|
|
|
if (tcx.sess.meta_stats()) {
|
2013-12-20 17:36:07 -08:00
|
|
|
for e in ebml_w.writer.inner_ref().iter() {
|
2013-03-07 18:37:14 -05:00
|
|
|
if *e == 0 {
|
|
|
|
ecx.stats.zero_bytes += 1;
|
2012-08-27 16:53:54 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-13 18:48:47 -07:00
|
|
|
println("metadata stats:");
|
2013-09-24 22:16:43 -07:00
|
|
|
println!(" inline bytes: {}", ecx.stats.inline_bytes);
|
|
|
|
println!(" attribute bytes: {}", ecx.stats.attr_bytes);
|
|
|
|
println!(" dep bytes: {}", ecx.stats.dep_bytes);
|
|
|
|
println!(" lang item bytes: {}", ecx.stats.lang_item_bytes);
|
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 14:03:29 -08:00
|
|
|
println!(" native bytes: {}", ecx.stats.native_lib_bytes);
|
2013-09-24 22:16:43 -07:00
|
|
|
println!(" impl bytes: {}", ecx.stats.impl_bytes);
|
|
|
|
println!(" misc bytes: {}", ecx.stats.misc_bytes);
|
|
|
|
println!(" item bytes: {}", ecx.stats.item_bytes);
|
|
|
|
println!(" index bytes: {}", ecx.stats.index_bytes);
|
|
|
|
println!(" zero bytes: {}", ecx.stats.zero_bytes);
|
|
|
|
println!(" total bytes: {}", ecx.stats.total_bytes);
|
2012-08-27 16:53:54 -07:00
|
|
|
}
|
|
|
|
|
2011-06-27 15:20:17 -07:00
|
|
|
// Pad this, since something (LLVM, presumably) is cutting off the
|
2011-08-11 16:36:20 -07:00
|
|
|
// remaining % 4 bytes.
|
2013-12-20 17:36:07 -08:00
|
|
|
ebml_w.writer.write(&[0u8, 0u8, 0u8, 0u8]);
|
2012-09-05 15:27:22 -07:00
|
|
|
|
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 17:41:01 -08:00
|
|
|
// This is a horrible thing to do to the outer MemWriter, but thankfully we
|
|
|
|
// don't use it again so... it's ok right?
|
2013-12-20 17:36:07 -08:00
|
|
|
return util::replace(ebml_w.writer.inner_mut_ref(), ~[]);
|
2011-06-27 15:20:17 -07:00
|
|
|
}
|
2011-06-27 19:16:16 -07:00
|
|
|
|
2011-07-07 12:47:39 -07:00
|
|
|
// Get the encoded string for a type
|
2013-01-29 16:51:16 -08:00
|
|
|
pub fn encoded_ty(tcx: ty::ctxt, t: ty::t) -> ~str {
|
2013-01-08 14:00:45 -08:00
|
|
|
let cx = @tyencode::ctxt {
|
|
|
|
diag: tcx.diag,
|
|
|
|
ds: def_to_str,
|
|
|
|
tcx: tcx,
|
|
|
|
abbrevs: tyencode::ac_no_abbrevs};
|
2013-10-21 17:11:42 -07:00
|
|
|
let wr = @mut MemWriter::new();
|
|
|
|
tyencode::enc_ty(wr, cx, t);
|
2013-11-28 23:52:11 +11:00
|
|
|
str::from_utf8_owned(wr.inner_ref().to_owned())
|
2011-07-07 12:47:39 -07:00
|
|
|
}
|