<div dir="ltr">This causes some stray diagnostics to be emitted in certian cases where a base class is already invalid:<div><br></div><div>Reproducer: <a href="https://gist.github.com/EricWF/588a361030edeaebbbc1155b8347cab0">https://gist.github.com/EricWF/588a361030edeaebbbc1155b8347cab0</a></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Feb 2, 2018 at 1:40 AM, Ilya Biryukov 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: ibiryukov<br>
Date: Fri Feb  2 00:40:08 2018<br>
New Revision: 324062<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=324062&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=324062&view=rev</a><br>
Log:<br>
[Sema] Add implicit members even for invalid CXXRecordDecls<br>
<br>
Summary:<br>
It should be safe, since other code paths are already generating<br>
implicit members even in invalid CXXRecordDecls (e.g. lookup).<br>
<br>
If we don't generate implicit members on CXXRecordDecl's completion,<br>
they will be generated by next lookup of constructors. This causes a<br>
crash when the following conditions are met:<br>
  - a CXXRecordDecl is invalid,<br>
  - it is provided via ExternalASTSource (e.g. from PCH),<br>
  - it has inherited constructors (they create ShadowDecls),<br>
  - lookup of its constructors was not run before ASTWriter serialized<br>
    it.<br>
<br>
This may require the ShadowDecls created for inherited constructors to<br>
be removed from the class, but that's no longer possible since class is<br>
provided by ExternalASTSource.<br>
<br>
See provided lit test for an example.<br>
<br>
Reviewers: bkramer<br>
<br>
Reviewed By: bkramer<br>
<br>
Subscribers: cfe-commits<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D42810" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D42810</a><br>
<br>
Added:<br>
    cfe/trunk/test/Index/Inputs/<wbr>crash-preamble-classes.h<br>
    cfe/trunk/test/Index/crash-<wbr>preamble-classes.cpp<br>
Modified:<br>
    cfe/trunk/lib/Sema/SemaDecl.<wbr>cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaDecl.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=324062&r1=324061&r2=324062&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Sema/<wbr>SemaDecl.cpp?rev=324062&r1=<wbr>324061&r2=324062&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Sema/SemaDecl.<wbr>cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaDecl.<wbr>cpp Fri Feb  2 00:40:08 2018<br>
@@ -15440,10 +15440,10 @@ void Sema::ActOnFields(Scope *S, SourceL<br>
                                           CXXRecord->getDestructor());<br>
         }<br>
<br>
-        if (!CXXRecord->isInvalidDecl()) {<br>
-          // Add any implicitly-declared members to this class.<br>
-          AddImplicitlyDeclaredMembersTo<wbr>Class(CXXRecord);<br>
+        // Add any implicitly-declared members to this class.<br>
+        AddImplicitlyDeclaredMembersTo<wbr>Class(CXXRecord);<br>
<br>
+        if (!CXXRecord->isInvalidDecl()) {<br>
           // If we have virtual base classes, we may end up finding multiple<br>
           // final overriders for a given virtual function. Check for this<br>
           // problem now.<br>
<br>
Added: cfe/trunk/test/Index/Inputs/<wbr>crash-preamble-classes.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/Inputs/crash-preamble-classes.h?rev=324062&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Index/<wbr>Inputs/crash-preamble-classes.<wbr>h?rev=324062&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Index/Inputs/<wbr>crash-preamble-classes.h (added)<br>
+++ cfe/trunk/test/Index/Inputs/<wbr>crash-preamble-classes.h Fri Feb  2 00:40:08 2018<br>
@@ -0,0 +1,9 @@<br>
+struct Incomplete;<br>
+<br>
+struct X : Incomplete {<br>
+  X();<br>
+};<br>
+<br>
+struct Y : X {<br>
+  using X::X;<br>
+};<br>
<br>
Added: cfe/trunk/test/Index/crash-<wbr>preamble-classes.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/crash-preamble-classes.cpp?rev=324062&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Index/<wbr>crash-preamble-classes.cpp?<wbr>rev=324062&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Index/crash-<wbr>preamble-classes.cpp (added)<br>
+++ cfe/trunk/test/Index/crash-<wbr>preamble-classes.cpp Fri Feb  2 00:40:08 2018<br>
@@ -0,0 +1,8 @@<br>
+#include "crash-preamble-classes.h"<br>
+<br>
+struct Z : Y {<br>
+  Z() {}<br>
+};<br>
+<br>
+// RUN: env CINDEXTEST_EDITING=1 \<br>
+// RUN: c-index-test -test-load-source-reparse 5 local -I %S/Inputs %s<br>
<br>
<br>
______________________________<wbr>_________________<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/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>