Thanks, fixed in r155269.<br><br><div class="gmail_quote">On Fri, Apr 20, 2012 at 9:09 AM, David Dean <span dir="ltr"><<a href="mailto:david_dean@apple.com">david_dean@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
One of the dejagnu tests is now failing because clang is no longer reporting any errors.<br>
<br>
The expected output is:<br>
$clang g++.dg/lookup/crash6.C<br>
g++.dg/lookup/crash6.C:8:22: error: redefinition of 'A' as different kind of symbol<br>
template<int> struct A; // { dg-error "different kind of symbol" }<br>
^<br>
g++.dg/lookup/crash6.C:7:5: note: previous definition is here<br>
int A; // { dg-error "previous declaration" }<br>
^<br>
1 error generated.<br>
<br>
Can you take a look?<br>
<div class="HOEnZb"><div class="h5"><br>
<br>
On 20 Apr 2012, at 12:12 AM, Richard Smith wrote:<br>
<br>
> Author: rsmith<br>
> Date: Fri Apr 20 02:12:26 2012<br>
> New Revision: 155187<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=155187&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=155187&view=rev</a><br>
> Log:<br>
> Replace r155185 with a better fix, which also addresses PR12557. When looking<br>
> up an elaborated type specifier in a friend declaration, only look for type<br>
> declarations, per [basic.lookup.elab]p2. If we know that the redeclaration<br>
> lookup for a friend class template in a dependent context finds a non-template,<br>
> don't delay the diagnostic to instantiation time.<br>
><br>
> Modified:<br>
> cfe/trunk/lib/Sema/SemaTemplate.cpp<br>
> cfe/trunk/test/SemaTemplate/class-template-decl.cpp<br>
> cfe/trunk/test/SemaTemplate/friend-template.cpp<br>
><br>
> Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=155187&r1=155186&r2=155187&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=155187&r1=155186&r2=155187&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)<br>
> +++ cfe/trunk/lib/Sema/SemaTemplate.cpp Fri Apr 20 02:12:26 2012<br>
> @@ -867,7 +867,7 @@<br>
><br>
> // Find any previous declaration with this name.<br>
> DeclContext *SemanticContext;<br>
> - LookupResult Previous(*this, Name, NameLoc, LookupOrdinaryName,<br>
> + LookupResult Previous(*this, Name, NameLoc, LookupTagName,<br>
> ForRedeclaration);<br>
> if (SS.isNotEmpty() && !SS.isInvalid()) {<br>
> SemanticContext = computeDeclContext(SS, true);<br>
> @@ -938,7 +938,7 @@<br>
> while (!OutermostContext->isFileContext())<br>
> OutermostContext = OutermostContext->getLookupParent();<br>
><br>
> - if (PrevClassTemplate &&<br>
> + if (PrevDecl &&<br>
> (OutermostContext->Equals(PrevDecl->getDeclContext()) ||<br>
> OutermostContext->Encloses(PrevDecl->getDeclContext()))) {<br>
> SemanticContext = PrevDecl->getDeclContext();<br>
> @@ -951,7 +951,7 @@<br>
> }<br>
> }<br>
><br>
> - if (CurContext->isDependentContext()) {<br>
> + if (CurContext->isDependentContext() && PrevClassTemplate) {<br>
> // If this is a dependent context, we don't want to link the friend<br>
> // class template to the template in scope, because that would perform<br>
> // checking of the template parameter lists that can't be performed<br>
><br>
> Modified: cfe/trunk/test/SemaTemplate/class-template-decl.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/class-template-decl.cpp?rev=155187&r1=155186&r2=155187&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/class-template-decl.cpp?rev=155187&r1=155186&r2=155187&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/SemaTemplate/class-template-decl.cpp (original)<br>
> +++ cfe/trunk/test/SemaTemplate/class-template-decl.cpp Fri Apr 20 02:12:26 2012<br>
> @@ -94,13 +94,3 @@<br>
> };<br>
> };<br>
> }<br>
> -<br>
> -namespace Redecl {<br>
> - struct S {<br>
> - int packaged_task;<br>
> - template<typename> class future {<br>
> - template<typename> friend class packaged_task;<br>
> - };<br>
> - future<void> share;<br>
> - };<br>
> -}<br>
><br>
> Modified: cfe/trunk/test/SemaTemplate/friend-template.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/friend-template.cpp?rev=155187&r1=155186&r2=155187&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/friend-template.cpp?rev=155187&r1=155186&r2=155187&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/SemaTemplate/friend-template.cpp (original)<br>
> +++ cfe/trunk/test/SemaTemplate/friend-template.cpp Fri Apr 20 02:12:26 2012<br>
> @@ -243,3 +243,27 @@<br>
><br>
> A<double>::B<double> ab;<br>
> }<br>
> +<br>
> +namespace RedeclUnrelated {<br>
> + struct S {<br>
> + int packaged_task;<br>
> + template<typename> class future {<br>
> + template<typename> friend class packaged_task;<br>
> + };<br>
> + future<void> share;<br>
> + };<br>
> +}<br>
> +<br>
> +namespace PR12557 {<br>
> + template <typename><br>
> + struct Foo;<br>
> +<br>
> + template <typename Foo_><br>
> + struct Bar {<br>
> + typedef Foo_ Foo; // expected-note {{previous}}<br>
> +<br>
> + template <typename> friend struct Foo; // expected-error {{redefinition of 'Foo' as different kind of symbol}}<br>
> + };<br>
> +<br>
> + Bar<int> b;<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>
<br>
</div></div><span class="HOEnZb"><font color="#888888">-David<br>
<br>
<br>
</font></span></blockquote></div><br>