From ee4b607dfbc5f857eb1c500f2f2ff84062feb926 Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Thu, 3 Mar 2016 14:55:24 -0500 Subject: [PATCH 1/2] derive: assume enum repr defaults to isize It was originally intended to be i32, but it isn't. Fixes #31886. --- src/libsyntax_ext/deriving/generic/mod.rs | 2 +- src/test/run-pass/enum-discrim-autosizing.rs | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index ef7f455632c..5d4842803a0 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -758,7 +758,7 @@ impl<'a> TraitDef<'a> { fn find_repr_type_name(diagnostic: &Handler, type_attrs: &[ast::Attribute]) -> &'static str { - let mut repr_type_name = "i32"; + let mut repr_type_name = "isize"; for a in type_attrs { for r in &attr::find_repr_attrs(diagnostic, a) { repr_type_name = match *r { diff --git a/src/test/run-pass/enum-discrim-autosizing.rs b/src/test/run-pass/enum-discrim-autosizing.rs index 53c44f2bb24..14301db6ce7 100644 --- a/src/test/run-pass/enum-discrim-autosizing.rs +++ b/src/test/run-pass/enum-discrim-autosizing.rs @@ -47,6 +47,12 @@ enum Ei64 { Bi64 = 0x8000_0000 } +#[derive(PartialEq)] +enum Eu64 { + Au64 = 0, + Bu64 = 0x8000_0000_0000_0000 +} + pub fn main() { assert_eq!(size_of::(), 1); assert_eq!(size_of::(), 1); @@ -58,4 +64,8 @@ pub fn main() { assert_eq!(size_of::(), 8); #[cfg(target_pointer_width = "32")] assert_eq!(size_of::(), 4); + assert_eq!(size_of::(), 8); + + // ensure no i32 collisions + assert!(Eu64::Au64 != Eu64::Bu64); } From 9d0748f7eb75c422b61446f846251177faffeb45 Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Fri, 18 Mar 2016 13:58:06 -0400 Subject: [PATCH 2/2] cfail test for #31886 --- .../compile-fail/enum-discrim-autosizing.rs | 20 +++++++++++++++++++ src/test/run-pass/enum-discrim-autosizing.rs | 10 ---------- 2 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 src/test/compile-fail/enum-discrim-autosizing.rs diff --git a/src/test/compile-fail/enum-discrim-autosizing.rs b/src/test/compile-fail/enum-discrim-autosizing.rs new file mode 100644 index 00000000000..3a243330ad9 --- /dev/null +++ b/src/test/compile-fail/enum-discrim-autosizing.rs @@ -0,0 +1,20 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// With no repr attribute the discriminant will default to isize. +// On 32-bit architectures this is equivalent to i32 so the variants +// collide. On other architectures we need compilation to fail anyway, +// so force the repr. +#[cfg_attr(not(target_pointer_width = "32"), repr(i32))] +enum Eu64 { + Au64 = 0, + Bu64 = 0x8000_0000_0000_0000 //~ERROR already exists +} + diff --git a/src/test/run-pass/enum-discrim-autosizing.rs b/src/test/run-pass/enum-discrim-autosizing.rs index 14301db6ce7..53c44f2bb24 100644 --- a/src/test/run-pass/enum-discrim-autosizing.rs +++ b/src/test/run-pass/enum-discrim-autosizing.rs @@ -47,12 +47,6 @@ enum Ei64 { Bi64 = 0x8000_0000 } -#[derive(PartialEq)] -enum Eu64 { - Au64 = 0, - Bu64 = 0x8000_0000_0000_0000 -} - pub fn main() { assert_eq!(size_of::(), 1); assert_eq!(size_of::(), 1); @@ -64,8 +58,4 @@ pub fn main() { assert_eq!(size_of::(), 8); #[cfg(target_pointer_width = "32")] assert_eq!(size_of::(), 4); - assert_eq!(size_of::(), 8); - - // ensure no i32 collisions - assert!(Eu64::Au64 != Eu64::Bu64); }