<div dir="ltr">*the same crash</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Apr 29, 2015 at 11:23 AM, Nico Weber <span dir="ltr"><<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">There's also a .ii file and a run line triggering the same test at <a href="https://code.google.com/p/chromium/issues/detail?id=482294" target="_blank">https://code.google.com/p/chromium/issues/detail?id=482294</a></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Apr 29, 2015 at 10:51 AM, Richard Smith <span dir="ltr"><<a href="mailto:richard@metafoo.co.uk" target="_blank">richard@metafoo.co.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Reverted for now in r236134.</div><div><div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Apr 29, 2015 at 10:37 AM, Reid Kleckner <span dir="ltr"><<a href="mailto:rnk@google.com" target="_blank">rnk@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">This broke ASTMatcherTests HasAncestor.MatchesClosestAncestor on Windows:<div><a href="http://lab.llvm.org:8011/builders/clang-x86-win2008-selfhost/builds/540/steps/ninja%20check%202/logs/FAIL%3A%20Clang-Unit%3A%3AHasAncestor.MatchesClosestAncestor" target="_blank">http://lab.llvm.org:8011/builders/clang-x86-win2008-selfhost/builds/540/steps/ninja%20check%202/logs/FAIL%3A%20Clang-Unit%3A%3AHasAncestor.MatchesClosestAncestor</a><br></div><div>Assertion failed: getContainingDC(DC) == CurContext && "The next DeclContext should be lexically contained in the current one.", file C:\buildbot\slave-config\clang-x86-win2008-selfhost\llvm\tools\clang\lib\Sema\SemaDecl.cpp, line 1073<br></div><div><br></div><div>I have a feeling there are bugs here with -fdelayed-template-parsing that can be easily exercised in a lit test.</div><div><div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Apr 28, 2015 at 5:07 PM, Richard Smith <span dir="ltr"><<a href="mailto:richard-llvm@metafoo.co.uk" target="_blank">richard-llvm@metafoo.co.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rsmith<br>
Date: Tue Apr 28 19:07:09 2015<br>
New Revision: 236063<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=236063&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=236063&view=rev</a><br>
Log:<br>
PR20625: Instantiate static constexpr member function of a local struct in a function template earlier.<br>
<br>
This is necessary in order to allow the use of a constexpr member function, or<br>
a member function with deduced return type, of a local class within a<br>
surrounding instantiated function template specialization.<br>
<br>
Patch by Michael Park!<br>
<br>
Modified:<br>
cfe/trunk/lib/Sema/SemaTemplateInstantiateDecl.cpp<br>
cfe/trunk/test/SemaTemplate/instantiate-local-class.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaTemplateInstantiateDecl.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateInstantiateDecl.cpp?rev=236063&r1=236062&r2=236063&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateInstantiateDecl.cpp?rev=236063&r1=236062&r2=236063&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaTemplateInstantiateDecl.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaTemplateInstantiateDecl.cpp Tue Apr 28 19:07:09 2015<br>
@@ -1302,11 +1302,19 @@ Decl *TemplateDeclInstantiator::VisitCXX<br>
// DR1484 clarifies that the members of a local class are instantiated as part<br>
// of the instantiation of their enclosing entity.<br>
if (D->isCompleteDefinition() && D->isLocalClass()) {<br>
+ Sema::SavePendingLocalImplicitInstantiationsRAII<br>
+ SavedPendingLocalImplicitInstantiations(SemaRef);<br>
+<br>
SemaRef.InstantiateClass(D->getLocation(), Record, D, TemplateArgs,<br>
TSK_ImplicitInstantiation,<br>
/*Complain=*/true);<br>
+<br>
SemaRef.InstantiateClassMembers(D->getLocation(), Record, TemplateArgs,<br>
TSK_ImplicitInstantiation);<br>
+<br>
+ // This class may have local implicit instantiations that need to be<br>
+ // performed within this scope.<br>
+ SemaRef.PerformPendingInstantiations(/*LocalOnly=*/true);<br>
}<br>
<br>
SemaRef.DiagnoseUnusedNestedTypedefs(Record);<br>
<br>
Modified: cfe/trunk/test/SemaTemplate/instantiate-local-class.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-local-class.cpp?rev=236063&r1=236062&r2=236063&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-local-class.cpp?rev=236063&r1=236062&r2=236063&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaTemplate/instantiate-local-class.cpp (original)<br>
+++ cfe/trunk/test/SemaTemplate/instantiate-local-class.cpp Tue Apr 28 19:07:09 2015<br>
@@ -213,3 +213,16 @@ namespace PR23194 {<br>
return make_seed_pair();<br>
}<br>
}<br>
+<br>
+namespace PR20625 {<br>
+template <typename T><br>
+void f() {<br>
+ struct N {<br>
+ static constexpr int get() { return 42; }<br>
+ };<br>
+ constexpr int n = N::get();<br>
+ static_assert(n == 42, "n == 42");<br>
+}<br>
+<br>
+void g() { f<void>(); }<br>
+}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">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></div></div></div></div>
</blockquote></div><br></div>
</div></div><br>_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">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></blockquote></div><br></div>
</div></div></blockquote></div><br></div>