From 3c395ecf7d41384016acbcc18d4847c72685013c Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 7 Jun 2011 11:09:29 -0400 Subject: [PATCH] re PR c++/48780 ([C++0x] scoped enumerations and va_arg (default argument promotions)) PR c++/48780 * typeck.c (perform_integral_promotions): Don't promote scoped enums. * call.c (convert_arg_to_ellipsis): Promote them here in old ABI. From-SVN: r174751 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/call.c | 10 +++++++++- gcc/cp/cvt.c | 3 ++- gcc/cp/typeck.c | 3 +++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/cpp0x/enum19.C | 12 ++++++++++++ 6 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/enum19.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c3826e5..ba3fd1a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-06-06 Jason Merrill + + PR c++/48780 + * typeck.c (perform_integral_promotions): Don't promote scoped enums. + * call.c (convert_arg_to_ellipsis): Promote them here in old ABI. + 2011-06-06 Nicola Pero , PR obj-c++/48275 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index ff3dc06..d955b63 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5896,7 +5896,15 @@ convert_arg_to_ellipsis (tree arg) else if (NULLPTR_TYPE_P (arg_type)) arg = null_pointer_node; else if (INTEGRAL_OR_ENUMERATION_TYPE_P (arg_type)) - arg = perform_integral_promotions (arg); + { + if (SCOPED_ENUM_P (arg_type) && !abi_version_at_least (6)) + { + warning (OPT_Wabi, "scoped enum %qT will not promote to an " + "integral type in a future version of GCC", arg_type); + arg = cp_convert (ENUM_UNDERLYING_TYPE (arg_type), arg); + } + arg = perform_integral_promotions (arg); + } arg = require_complete_type (arg); arg_type = TREE_TYPE (arg); diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index e5d5361..8a23d51 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -1616,7 +1616,8 @@ type_promotes_to (tree type) if (TREE_CODE (type) == BOOLEAN_TYPE) type = integer_type_node; - /* scoped enums don't promote. */ + /* Scoped enums don't promote, but pretend they do for backward ABI bug + compatibility wrt varargs. */ else if (SCOPED_ENUM_P (type) && abi_version_at_least (6)) ; diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 5fbb765..8e4fd42 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -1953,6 +1953,9 @@ perform_integral_promotions (tree expr) if (!type || TREE_CODE (type) != ENUMERAL_TYPE) type = TREE_TYPE (expr); gcc_assert (INTEGRAL_OR_ENUMERATION_TYPE_P (type)); + /* Scoped enums don't promote. */ + if (SCOPED_ENUM_P (type)) + return expr; promoted_type = type_promotes_to (type); if (type != promoted_type) expr = cp_convert (promoted_type, expr); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 05849cc..b38cd1e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-06-06 Jason Merrill + + * g++.dg/cpp0x/enum19.C: New. + 2011-06-07 Sergey Grechanik * gcc.target/arm/neon-reload-class.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/enum19.C b/gcc/testsuite/g++.dg/cpp0x/enum19.C new file mode 100644 index 0000000..acdd86c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/enum19.C @@ -0,0 +1,12 @@ +// We shouldn't give an ABI warning about promotion in switch. +// { dg-options "-std=c++0x -fabi-version=5 -Wabi" } + +enum class Foo { X }; +void test(Foo val) +{ + switch(val) + { + case Foo::X: + break; + } +}; -- 2.7.4