user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wrap const structs in as many LLVM structs as the non-const case.

Browse source 
This, like the previous change for unit-like enums, is only necessary
until everything is fully converted to use trans::adt.
This commit is contained in:
Jed Davis 2013-03-06 20:17:22 -08:00
parent e09a843973
commit a5030e7615
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc/middle/trans/adt.rs
View file

@ -269,10 +269,15 @@ pub fn trans_const(ccx: @CrateContext, r: &Repr, discr: int,
assert min <= discr && discr <= max;
C_int(ccx, discr)
}
Univariant(ref st, _dt) => {
Univariant(ref st, dt) => {
assert discr == 0;
// consts are never destroyed, so the dtor flag is not needed
C_struct(build_const_struct(ccx, st, vals))
let s = C_struct(build_const_struct(ccx, st, vals));
match dt {
NoDtor => s,
// The actual destructor flag doesn't need to be present.
// But add an extra struct layer for compatibility.
DtorPresent | DtorAbsent => C_struct(~[s])
}
}
General(ref cases) => {
let case = &cases[discr as uint];
@ -336,7 +341,9 @@ pub fn const_get_element(ccx: @CrateContext, r: &Repr, val: ValueRef,
match *r {
Unit(*) | CEnum(*) => ccx.sess.bug(~"element access in C-like enum \
const"),
Univariant(*) => const_struct_field(ccx, val, ix),
Univariant(_, NoDtor) => const_struct_field(ccx, val, ix),
Univariant(*) => const_struct_field(ccx, const_get_elt(ccx, val,
[0]), ix),
General(*) => const_struct_field(ccx, const_get_elt(ccx, val,
[1, 0]), ix)
}