diff options
| -rw-r--r-- | src/librustc/middle/trans/adt.rs | 21 | ||||
| -rw-r--r-- | src/test/run-pass/issue-8506.rs | 20 |
2 files changed, 28 insertions, 13 deletions
diff --git a/src/librustc/middle/trans/adt.rs b/src/librustc/middle/trans/adt.rs index 2c68914d21f..ae0025ffa30 100644 --- a/src/librustc/middle/trans/adt.rs +++ b/src/librustc/middle/trans/adt.rs @@ -749,14 +749,15 @@ pub fn trans_const(ccx: &CrateContext, r: &Repr, discr: Disr, let contents = build_const_struct(ccx, st, vals); C_struct(contents, st.packed) } - NullablePointer{ nonnull: ref nonnull, nndiscr, ptrfield, .. } => { + NullablePointer{ nonnull: ref nonnull, nndiscr, .. } => { if discr == nndiscr { C_struct(build_const_struct(ccx, nonnull, vals), false) } else { - let vals = nonnull.fields.iter().enumerate().map(|(i, &ty)| { - let llty = type_of::sizing_type_of(ccx, ty); - if i == ptrfield { C_null(llty) } else { C_undef(llty) } - }).collect::<~[ValueRef]>(); + let vals = nonnull.fields.map(|&ty| { + // Always use null even if it's not the `ptrfield`th + // field; see #8506. + C_null(type_of::sizing_type_of(ccx, ty)) + }); C_struct(build_const_struct(ccx, nonnull, vals), false) } } @@ -791,14 +792,8 @@ fn build_const_struct(ccx: &CrateContext, st: &Struct, vals: &[ValueRef]) cfields.push(padding(target_offset - offset)); offset = target_offset; } - let val = if is_undef(vals[i]) { - let wrapped = C_struct([vals[i]], false); - assert!(!is_undef(wrapped)); - wrapped - } else { - vals[i] - }; - cfields.push(val); + assert!(!is_undef(vals[i])); + cfields.push(vals[i]); offset += machine::llsize_of_alloc(ccx, llty) as u64 } diff --git a/src/test/run-pass/issue-8506.rs b/src/test/run-pass/issue-8506.rs new file mode 100644 index 00000000000..b5e9141deef --- /dev/null +++ b/src/test/run-pass/issue-8506.rs @@ -0,0 +1,20 @@ +// Copyright 2013-2014 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. + +#[allow(dead_code)]; + +enum Either { + One, + Other(~str,~str) +} + +static one : Either = One; + +pub fn main () { } |