<div class="gmail_quote">On Wed, Jul 18, 2012 at 8:12 PM, Aaron Ballman <span dir="ltr"><<a href="mailto:aaron@aaronballman.com" target="_blank">aaron@aaronballman.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: aaronballman<br>
Date: Wed Jul 18 22:12:23 2012<br>
New Revision: 160490<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=160490&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=160490&view=rev</a><br>
Log:<br>
Relaxed enumeration constant naming rules for scoped enumerators so they no longer emit a diagnostic when the enumeration's name matches that of the class. Fixes PR13128.<br>
<br>
Modified:<br>
cfe/trunk/lib/Sema/SemaDecl.cpp<br>
cfe/trunk/test/SemaCXX/enum-scoped.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaDecl.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=160490&r1=160489&r2=160490&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=160490&r1=160489&r2=160490&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Wed Jul 18 22:12:23 2012<br>
@@ -10406,15 +10406,21 @@<br>
}<br>
}<br>
<br>
- // C++ [class.mem]p13:<br>
- // If T is the name of a class, then each of the following shall have a<br>
- // name different from T:<br>
- // - every enumerator of every member of class T that is an enumerated<br>
- // type<br>
+ // C++ [class.mem]p15:<br>
+ // If T is the name of a class, then each of the following shall have a name<br>
+ // different from T:<br>
+ // - every enumerator of every member of class T that is an unscoped<br>
+ // enumerated type<br>
+ //<br>
+ // C++ [dcl.enum]p10:<br>
+ // Each enum-name and each unscoped enumerator is declared in the scope that<br>
+ // immediately contains the enum-specifier. Each scoped enumerator is declared<br>
+ // in the scope of the enumeration.<br></blockquote><div><br></div><div>Is this quotation relevant here? (Sorry for not calling this out before.)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
if (CXXRecordDecl *Record<br>
= dyn_cast<CXXRecordDecl>(<br>
TheEnumDecl->getDeclContext()->getRedeclContext()))<br>
- if (Record->getIdentifier() && Record->getIdentifier() == Id)<br>
+ if (!TheEnumDecl->isScoped() &&<br>
+ Record->getIdentifier() && Record->getIdentifier() == Id)<br>
Diag(IdLoc, diag::err_member_name_of_class) << Id;<br>
<br>
EnumConstantDecl *New =<br>
<br>
Modified: cfe/trunk/test/SemaCXX/enum-scoped.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/enum-scoped.cpp?rev=160490&r1=160489&r2=160490&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/enum-scoped.cpp?rev=160490&r1=160489&r2=160490&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaCXX/enum-scoped.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/enum-scoped.cpp Wed Jul 18 22:12:23 2012<br>
@@ -245,3 +245,10 @@<br>
int m = g<int>();<br>
int n = g<short>(); // expected-note {{here}}<br>
}<br>
+<br>
+namespace pr13128 {<br>
+ // This should compile cleanly<br>
+ class C {<br>
+ enum class E { C };<br>
+ };<br>
+}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br>