<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 30, 2015 at 3:07 PM, David Majnemer via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Wed Sep 30 17:07:43 2015<br>
New Revision: 248953<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=248953&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=248953&view=rev</a><br>
Log:<br>
[Sema] Don't crash when friending an unqualified templated constructor<br>
<br>
Unqualified templated constructors cannot be friended and our lack of a<br>
diagnostic led to violated invariants.  Instead, raise a diagnostic when<br>
processing the friend declaration.<br>
<br>
This fixes PR20251.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp<br>
    cfe/trunk/test/CXX/class/class.friend/p1.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=248953&r1=248952&r2=248953&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=248953&r1=248952&r2=248953&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Wed Sep 30 17:07:43 2015<br>
@@ -12689,15 +12689,31 @@ NamedDecl *Sema::ActOnFriendFunctionDecl<br>
     DC = CurContext;<br>
     assert(isa<CXXRecordDecl>(DC) && "friend declaration not in class?");<br>
   }<br>
-<br>
+<br>
   if (!DC->isRecord()) {<br>
+    int DiagArg = -1;<br>
+    switch (D.getName().getKind()) {<br>
+    case UnqualifiedId::IK_ConstructorTemplateId:<br>
+    case UnqualifiedId::IK_ConstructorName:<br>
+      DiagArg = 0;<br>
+      break;<br>
+    case UnqualifiedId::IK_DestructorName:<br>
+      DiagArg = 1;<br>
+      break;<br>
+    case UnqualifiedId::IK_ConversionFunctionId:<br>
+      DiagArg = 2;<br>
+      break;<br>
+    case UnqualifiedId::IK_Identifier:<br>
+    case UnqualifiedId::IK_ImplicitSelfParam:<br>
+    case UnqualifiedId::IK_LiteralOperatorId:<br>
+    case UnqualifiedId::IK_OperatorFunctionId:<br>
+    case UnqualifiedId::IK_TemplateId:<br>
+      break;<br>
+      llvm_unreachable("Didn't expect this kind of unqualified-id!");<br></blockquote><div><br></div><div>Is the break followed by unreachable intentional?</div><div><br></div><div>-- Sean Silva</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+    }<br>
     // This implies that it has to be an operator or function.<br>
-    if (D.getName().getKind() == UnqualifiedId::IK_ConstructorName ||<br>
-        D.getName().getKind() == UnqualifiedId::IK_DestructorName ||<br>
-        D.getName().getKind() == UnqualifiedId::IK_ConversionFunctionId) {<br>
-      Diag(Loc, diag::err_introducing_special_friend) <<<br>
-        (D.getName().getKind() == UnqualifiedId::IK_ConstructorName ? 0 :<br>
-         D.getName().getKind() == UnqualifiedId::IK_DestructorName ? 1 : 2);<br>
+    if (DiagArg >= 0) {<br>
+      Diag(Loc, diag::err_introducing_special_friend) << DiagArg;<br>
       return nullptr;<br>
     }<br>
   }<br>
<br>
Modified: cfe/trunk/test/CXX/class/class.friend/p1.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/class/class.friend/p1.cpp?rev=248953&r1=248952&r2=248953&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/class/class.friend/p1.cpp?rev=248953&r1=248952&r2=248953&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CXX/class/class.friend/p1.cpp (original)<br>
+++ cfe/trunk/test/CXX/class/class.friend/p1.cpp Wed Sep 30 17:07:43 2015<br>
@@ -79,3 +79,9 @@ class PreDeclared;<br>
 int myoperation(float f) {<br>
   return (int) f;<br>
 }<br>
+<br>
+template <typename T><br>
+class B {<br>
+  template <typename U><br>
+  friend B<U>() {} // expected-error {{must use a qualified name when declaring a constructor as a friend}}<br>
+};<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>