From 10cdabc89f0e2ea798595f3b5921d966e187e694 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 17 Jul 2012 22:47:59 -0400 Subject: [PATCH] re PR c++/53995 (Overload resolution fails with enum argument, says ) PR c++/53995 * decl.c (finish_enum_value_list): Only call insert_late_enum_def_into_classtype_sorted_fields in class scope. From-SVN: r189598 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/decl.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/parse/enum9.C | 13 +++++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/parse/enum9.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c1465ccc385..ef4e8acdb99 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2012-07-17 Jason Merrill + PR c++/53995 + * decl.c (finish_enum_value_list): Only call + insert_late_enum_def_into_classtype_sorted_fields in class scope. + PR c++/53989 * tree.c (build_cplus_array_type): Also add TYPE_CANONICAL to the list of variants. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 84b78f6f1da..8a3163a4994 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -12392,7 +12392,7 @@ finish_enum_value_list (tree enumtype) for (t = TYPE_MAIN_VARIANT (enumtype); t; t = TYPE_NEXT_VARIANT (t)) TYPE_VALUES (t) = TYPE_VALUES (enumtype); - if (current_class_type + if (at_class_scope_p () && COMPLETE_TYPE_P (current_class_type) && UNSCOPED_ENUM_P (enumtype)) insert_late_enum_def_into_classtype_sorted_fields (enumtype, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2b1bb7b9c0f..ac9f86b1ae9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-07-17 Jason Merrill + + PR c++/53995 + * g++.dg/parse/enum9.C: New. + 2012-07-17 Kazu Hirata Sandra Loosemore diff --git a/gcc/testsuite/g++.dg/parse/enum9.C b/gcc/testsuite/g++.dg/parse/enum9.C new file mode 100644 index 00000000000..559db31d51b --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/enum9.C @@ -0,0 +1,13 @@ +// PR c++/53995 + +enum E1 { e }; +void f(E1); + +struct A { + int i1,i2,i3,i4,i5,i6,i7,i8,i9,i10; + void g(); + void h(); +}; + +void A::g() { enum E2 { e }; } +void A::h() { f(e); }