OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "librustc: Make monomorphic newtype structs work cross-crate"

Browse Source 
This reverts commit a8f039a085.
This commit is contained in:
Graydon Hoare 2013-02-12 09:02:17 -08:00
parent a8f039a085
commit 1d82d8dd5d
11 changed files with 37 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc/metadata/common.rs
View File

@ -153,7 +153,5 @@ pub const tag_lang_items_item: uint = 0x73;
pub const tag_lang_items_item_id: uint = 0x74;
pub const tag_lang_items_item_node_id: uint = 0x75;
pub const tag_item_unnamed_field: uint = 0x76;
pub type link_meta = {name: @str, vers: @str, extras_hash: @str};

5
src/librustc/metadata/csearch.rs
View File

@ -166,9 +166,8 @@ pub fn get_item_attrs(cstore: @mut cstore::CStore,
decoder::get_item_attrs(cdata, def_id.node, f)
}
pub fn get_struct_fields(cstore: @mut cstore::CStore,
def: ast::def_id)
-> ~[ty::field_ty] {
pub fn get_struct_fields(tcx: ty::ctxt, def: ast::def_id) -> ~[ty::field_ty] {
let cstore = tcx.cstore;
let cdata = cstore::get_crate_data(cstore, def.crate);
decoder::get_struct_fields(cstore.intr, cdata, def.node)
}

24
src/librustc/metadata/decoder.rs
View File

@ -42,7 +42,7 @@ use std::serialize::Decodable;
use syntax::ast_map;
use syntax::attr;
use syntax::diagnostic::span_handler;
use syntax::parse::token::{ident_interner, special_idents};
use syntax::parse::token::ident_interner;
use syntax::print::pprust;
use syntax::{ast, ast_util};
use syntax::codemap;
@ -231,9 +231,7 @@ pub fn item_type(item_id: ast::def_id, item: ebml::Doc,
let t = doc_type(item, tcx, cdata);
if family_names_type(item_family(item)) {
ty::mk_with_id(tcx, t, item_id)
} else {
t
}
} else { t }
}
fn item_impl_traits(item: ebml::Doc, tcx: ty::ctxt, cdata: cmd) -> ~[ty::t] {
@ -663,12 +661,11 @@ fn item_impl_methods(intr: @ident_interner, cdata: cmd, item: ebml::Doc,
rslt
}
pub fn get_impls_for_mod(intr: @ident_interner,
cdata: cmd,
m_id: ast::node_id,
name: Option<ast::ident>,
get_cdata: &fn(ast::crate_num) -> cmd)
pub fn get_impls_for_mod(intr: @ident_interner, cdata: cmd,
m_id: ast::node_id, name: Option<ast::ident>,
get_cdata: fn(ast::crate_num) -> cmd)
-> @~[@_impl] {
let data = cdata.data;
let mod_item = lookup_item(m_id, data);
let mut result = ~[];
@ -890,15 +887,6 @@ pub fn get_struct_fields(intr: @ident_interner, cdata: cmd, id: ast::node_id)
});
}
}
for reader::tagged_docs(item, tag_item_unnamed_field) |an_item| {
let did = item_def_id(an_item, cdata);
result.push(ty::field_ty {
ident: special_idents::unnamed_field,
id: did,
vis: ast::inherited,
mutability: ast::struct_immutable,
});
}
result
}

69
src/librustc/metadata/encoder.rs
View File

@ -46,7 +46,6 @@ use syntax::ast_map;
use syntax::ast_util::*;
use syntax::attr;
use syntax::diagnostic::span_handler;
use syntax::parse::token::special_idents;
use syntax::print::pprust;
use syntax::{ast_util, visit};
use syntax;
@ -329,7 +328,7 @@ fn encode_info_for_mod(ecx: @encode_ctxt, ebml_w: writer::Encoder,
// Encode info about all the module children.
for md.items.each |item| {
match item.node {
item_impl(*) => {
item_impl(*) | item_struct(*) => {
let (ident, did) = (item.ident, item.id);
debug!("(encoding info for module) ... encoding impl %s \
(%?/%?)",
@ -433,28 +432,25 @@ fn encode_info_for_struct(ecx: @encode_ctxt, ebml_w: writer::Encoder,
/* We encode both private and public fields -- need to include
private fields to get the offsets right */
for fields.each |field| {
let (nm, mt, vis) = match field.node.kind {
named_field(nm, mt, vis) => (nm, mt, vis),
unnamed_field => (
special_idents::unnamed_field,
struct_immutable,
inherited
)
};
let id = field.node.id;
index.push({val: id, pos: ebml_w.writer.tell()});
global_index.push({val: id, pos: ebml_w.writer.tell()});
ebml_w.start_tag(tag_items_data_item);
debug!("encode_info_for_struct: doing %s %d",
tcx.sess.str_of(nm), id);
encode_visibility(ebml_w, vis);
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_mutability(ebml_w, mt);
encode_def_id(ebml_w, local_def(id));
ebml_w.end_tag();
match field.node.kind {
named_field(nm, mt, vis) => {
let id = field.node.id;
index.push({val: id, pos: ebml_w.writer.tell()});
global_index.push({val: id,
pos: ebml_w.writer.tell()});
ebml_w.start_tag(tag_items_data_item);
debug!("encode_info_for_struct: doing %s %d",
tcx.sess.str_of(nm), id);
encode_visibility(ebml_w, vis);
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_mutability(ebml_w, mt);
encode_def_id(ebml_w, local_def(id));
ebml_w.end_tag();
}
unnamed_field => {}
}
}
/*bad*/copy *index
}
@ -677,24 +673,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: writer::Encoder,
encode_def_id(ebml_w, local_def(item.id));
encode_family(ebml_w, 'S');
encode_type_param_bounds(ebml_w, ecx, tps);
// If this is a tuple- or enum-like struct, encode the type of the
// constructor. Otherwise, encode the type of the struct.
if struct_def.fields.len() > 0 &&
struct_def.fields[0].node.kind == ast::unnamed_field {
// Tuple- or enum-like struct.
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_type(ecx, ebml_w, node_id_to_type(tcx, ctor_id));
// Also encode the symbol.
encode_symbol(ecx, ebml_w, ctor_id);
} else {
encode_type(ecx, ebml_w, node_id_to_type(tcx, item.id));
}
encode_type(ecx, ebml_w, node_id_to_type(tcx, item.id));
encode_name(ecx, ebml_w, item.ident);
encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
encode_region_param(ecx, ebml_w, item);
@ -718,11 +697,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: writer::Encoder,
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();
}
unnamed_field => {}
}
}

17
src/librustc/middle/resolve.rs
View File

@ -13,8 +13,7 @@ use core::prelude::*;
use driver::session;
use driver::session::Session;
use metadata::csearch::{each_path, get_method_names_if_trait};
use metadata::csearch::{get_static_methods_if_impl, get_struct_fields};
use metadata::csearch::{get_type_name_if_impl};
use metadata::csearch::{get_static_methods_if_impl, get_type_name_if_impl};
use metadata::cstore::find_use_stmt_cnum;
use metadata::decoder::{def_like, dl_def, dl_field, dl_impl};
use middle::lang_items::LanguageItems;
@ -1660,14 +1659,6 @@ pub impl Resolver {
crate) building type %s",
final_ident);
child_name_bindings.define_type(Public, def, dummy_sp());
// Define the struct constructor if this is a tuple-like struct.
let fields = get_struct_fields(self.session.cstore, def_id);
if fields.len() != 0 &&
fields[0].ident == special_idents::unnamed_field {
child_name_bindings.define_value(Public, def, dummy_sp());
}
self.structs.insert(def_id, ());
}
def_self(*) | def_arg(*) | def_local(*) |
@ -1754,12 +1745,10 @@ pub impl Resolver {
OverwriteDuplicates,
dummy_sp());
self.handle_external_def(def,
modules,
self.handle_external_def(def, modules,
child_name_bindings,
self.session.str_of(final_ident),
final_ident,
new_parent);
final_ident, new_parent);
}
dl_impl(def) => {
// We only process static methods of impls here.

9
src/librustc/middle/trans/base.rs
View File

@ -1905,13 +1905,8 @@ pub fn trans_tuple_struct(ccx: @crate_ctxt,
}
};
let fcx = new_fn_ctxt_w_id(ccx,
~[],
llfndecl,
ctor_id,
None,
param_substs,
None);
let fcx = new_fn_ctxt_w_id(ccx, ~[], llfndecl, ctor_id, None,
param_substs, None);
// XXX: Bad copy.
let raw_llargs = create_llargs_for_fn_args(fcx, no_self, copy fn_args);

3
src/librustc/middle/trans/reachable.rs
View File

@ -122,9 +122,6 @@ fn traverse_public_item(cx: ctx, item: @item) {
}
}
item_struct(struct_def, tps) => {
for struct_def.ctor_id.each |&ctor_id| {
cx.rmap.insert(ctor_id, ());
}
do option::iter(&struct_def.dtor) |dtor| {
cx.rmap.insert(dtor.node.id, ());
if tps.len() > 0u || attr::find_inline_attr(dtor.node.attrs)

2
src/librustc/middle/ty.rs
View File

@ -4011,7 +4011,7 @@ pub fn lookup_struct_fields(cx: ctxt, did: ast::def_id) -> ~[field_ty] {
}
}
else {
return csearch::get_struct_fields(cx.sess.cstore, did);
return csearch::get_struct_fields(cx, did);
}
}

2
src/librustc/middle/typeck/coherence.rs
View File

@ -828,7 +828,7 @@ pub impl CoherenceChecker {
let implementations = get_impls_for_mod(crate_store,
module_def_id,
None);
for implementations.each |implementation| {
for (*implementations).each |implementation| {
debug!("coherence: adding impl from external crate: %s",
ty::item_path_str(self.crate_context.tcx,
implementation.did));

4
src/test/auxiliary/newtype_struct_xc.rs
View File

@ -1,4 +0,0 @@
#[crate_type="lib"];
pub struct Au(int);

9
src/test/run-pass/newtype-struct-xc.rs
View File

@ -1,9 +0,0 @@
// xfail-fast
// aux-build:newtype_struct_xc.rs
extern mod newtype_struct_xc;
fn main() {
let _ = newtype_struct_xc::Au(2);
}