Skip to content

Commit 8ab15c0

Browse files
eholkeholk
committed
Merge branch 'incoming' into newsnap
2 parents d4b6898 + d953462 commit 8ab15c0

File tree

4 files changed

+606
-172
lines changed

4 files changed

+606
-172
lines changed

‎src/rustc/front/intrinsic.rs

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,29 +52,38 @@ mod intrinsic {
5252
fn visit_leave_evec_uniq(mtbl: uint) -> bool;
5353
fn visit_enter_evec_slice(mtbl: uint) -> bool;
5454
fn visit_leave_evec_slice(mtbl: uint) -> bool;
55-
fn visit_enter_evec_fixed(mtbl: uint, sz: uint) -> bool;
56-
fn visit_leave_evec_fixed(mtbl: uint, sz: uint) -> bool;
55+
fn visit_enter_evec_fixed(mtbl: uint, n: uint,
56+
sz: uint, align: uint) -> bool;
57+
fn visit_leave_evec_fixed(mtbl: uint, n: uint,
58+
sz: uint, align: uint) -> bool;
5759

58-
fn visit_enter_rec(n_fields: uint) -> bool;
60+
fn visit_enter_rec(n_fields: uint,
61+
sz: uint, align: uint) -> bool;
5962
fn visit_enter_rec_field(mtbl: uint, i: uint,
6063
name: str/&) -> bool;
6164
fn visit_leave_rec_field(mtbl: uint, i: uint,
6265
name: str/&) -> bool;
63-
fn visit_leave_rec(n_fields: uint) -> bool;
66+
fn visit_leave_rec(n_fields: uint,
67+
sz: uint, align: uint) -> bool;
6468

65-
fn visit_enter_class(n_fields: uint) -> bool;
69+
fn visit_enter_class(n_fields: uint,
70+
sz: uint, align: uint) -> bool;
6671
fn visit_enter_class_field(mtbl: uint, i: uint,
6772
name: str/&) -> bool;
6873
fn visit_leave_class_field(mtbl: uint, i: uint,
6974
name: str/&) -> bool;
70-
fn visit_leave_class(n_fields: uint) -> bool;
75+
fn visit_leave_class(n_fields: uint,
76+
sz: uint, align: uint) -> bool;
7177

72-
fn visit_enter_tup(n_fields: uint) -> bool;
78+
fn visit_enter_tup(n_fields: uint,
79+
sz: uint, align: uint) -> bool;
7380
fn visit_enter_tup_field(i: uint) -> bool;
7481
fn visit_leave_tup_field(i: uint) -> bool;
75-
fn visit_leave_tup(n_fields: uint) -> bool;
82+
fn visit_leave_tup(n_fields: uint,
83+
sz: uint, align: uint) -> bool;
7684

77-
fn visit_enter_enum(n_variants: uint) -> bool;
85+
fn visit_enter_enum(n_variants: uint,
86+
sz: uint, align: uint) -> bool;
7887
fn visit_enter_enum_variant(variant: uint,
7988
disr_val: int,
8089
n_fields: uint,
@@ -85,7 +94,8 @@ mod intrinsic {
8594
disr_val: int,
8695
n_fields: uint,
8796
name: str/&) -> bool;
88-
fn visit_leave_enum(n_variants: uint) -> bool;
97+
fn visit_leave_enum(n_variants: uint,
98+
sz: uint, align: uint) -> bool;
8999

90100
fn visit_enter_fn(purity: uint, proto: uint,
91101
n_inputs: uint, retstyle: uint) -> bool;

‎src/rustc/middle/trans/reflect.rs

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,14 @@ impl methods for reflector {
8080
[self.c_uint(mt.mutbl as uint)] + extra);
8181
}
8282

83-
fn vstore_name_and_extra(vstore: ty::vstore,
83+
fn vstore_name_and_extra(t: ty::t,
84+
vstore: ty::vstore,
8485
f: fn(str,[ValueRef])) {
8586
alt vstore {
86-
ty::vstore_fixed(n) { f("fixed", [self.c_uint(n)]) }
87+
ty::vstore_fixed(n) {
88+
let extra = [self.c_uint(n)] + self.c_size_and_align(t);
89+
f("fixed", extra)
90+
}
8791
ty::vstore_slice(_) { f("slice", []) }
8892
ty::vstore_uniq { f("uniq", []);}
8993
ty::vstore_box { f("box", []); }
@@ -123,12 +127,12 @@ impl methods for reflector {
123127

124128
ty::ty_vec(mt) { self.bracketed_mt("vec", mt, []) }
125129
ty::ty_estr(vst) {
126-
self.vstore_name_and_extra(vst) {|name, extra|
130+
self.vstore_name_and_extra(t, vst) {|name, extra|
127131
self.visit("estr_" + name, extra)
128132
}
129133
}
130134
ty::ty_evec(mt, vst) {
131-
self.vstore_name_and_extra(vst) {|name, extra|
135+
self.vstore_name_and_extra(t, vst) {|name, extra|
132136
self.bracketed_mt("evec_" + name, mt, extra)
133137
}
134138
}
@@ -138,21 +142,25 @@ impl methods for reflector {
138142
ty::ty_rptr(_, mt) { self.bracketed_mt("rptr", mt, []) }
139143

140144
ty::ty_rec(fields) {
141-
self.visit("enter_rec", [self.c_uint(vec::len(fields))]);
145+
let extra = ([self.c_uint(vec::len(fields))]
146+
+ self.c_size_and_align(t));
147+
self.visit("enter_rec", extra);
142148
for fields.eachi {|i, field|
143149
self.bracketed_mt("rec_field", field.mt,
144150
[self.c_uint(i),
145151
self.c_slice(*field.ident)]);
146152
}
147-
self.visit("leave_rec", [self.c_uint(vec::len(fields))]);
153+
self.visit("leave_rec", extra);
148154
}
149155

150156
ty::ty_tup(tys) {
151-
self.visit("enter_tup", [self.c_uint(vec::len(tys))]);
157+
let extra = ([self.c_uint(vec::len(tys))]
158+
+ self.c_size_and_align(t));
159+
self.visit("enter_tup", extra);
152160
for tys.eachi {|i, t|
153161
self.bracketed_t("tup_field", t, [self.c_uint(i)]);
154162
}
155-
self.visit("leave_tup", [self.c_uint(vec::len(tys))]);
163+
self.visit("leave_tup", extra);
156164
}
157165

158166
// FIXME: fetch constants out of intrinsic:: for the numbers.
@@ -206,13 +214,16 @@ impl methods for reflector {
206214
let bcx = self.bcx;
207215
let tcx = bcx.ccx().tcx;
208216
let fields = ty::class_items_as_fields(tcx, did, substs);
209-
self.visit("enter_class", [self.c_uint(vec::len(fields))]);
217+
let extra = ([self.c_uint(vec::len(fields))]
218+
+ self.c_size_and_align(t));
219+
220+
self.visit("enter_class", extra);
210221
for fields.eachi {|i, field|
211222
self.bracketed_mt("class_field", field.mt,
212223
[self.c_uint(i),
213224
self.c_slice(*field.ident)]);
214225
}
215-
self.visit("leave_class", [self.c_uint(vec::len(fields))]);
226+
self.visit("leave_class", extra);
216227
}
217228

218229
// FIXME: visiting all the variants in turn is probably
@@ -223,8 +234,10 @@ impl methods for reflector {
223234
let bcx = self.bcx;
224235
let tcx = bcx.ccx().tcx;
225236
let variants = ty::substd_enum_variants(tcx, did, substs);
237+
let extra = ([self.c_uint(vec::len(variants))]
238+
+ self.c_size_and_align(t));
226239

227-
self.visit("enter_enum", [self.c_uint(vec::len(variants))]);
240+
self.visit("enter_enum", extra);
228241
for variants.eachi {|i, v|
229242
let extra = [self.c_uint(i),
230243
self.c_int(v.disr_val),
@@ -237,7 +250,7 @@ impl methods for reflector {
237250
}
238251
self.visit("leave_enum_variant", extra);
239252
}
240-
self.visit("leave_enum", [self.c_uint(vec::len(variants))]);
253+
self.visit("leave_enum", extra);
241254
}
242255

243256
// Miscallaneous extra types

0 commit comments

Comments
 (0)