diff options
| -rw-r--r-- | src/librustc_trans/adt.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/issue-33202.rs | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/src/librustc_trans/adt.rs b/src/librustc_trans/adt.rs index 49775388038..a4792ea328f 100644 --- a/src/librustc_trans/adt.rs +++ b/src/librustc_trans/adt.rs @@ -306,10 +306,8 @@ fn represent_type_uncached<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, cx.tcx().item_path_str(def.did)); } - if cases.len() == 1 { + if cases.len() == 1 && hint == attr::ReprAny { // Equivalent to a struct/tuple/newtype. - // (Typechecking will reject discriminant-sizing attrs.) - assert_eq!(hint, attr::ReprAny); let mut ftys = cases[0].tys.clone(); if dtor { ftys.push(cx.tcx().dtor_type()); } return Univariant(mk_struct(cx, &ftys[..], false, t), diff --git a/src/test/run-pass/issue-33202.rs b/src/test/run-pass/issue-33202.rs new file mode 100644 index 00000000000..eb4192942f5 --- /dev/null +++ b/src/test/run-pass/issue-33202.rs @@ -0,0 +1,18 @@ +// Copyright 2016 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. + +#[repr(C)] +pub enum CPOption<T> { + PSome(T), +} + +fn main() { + println!("sizeof CPOption<i32> {}", std::mem::size_of::<CPOption<i32>>()); +} |