<div dir="auto"><div><div class="gmail_extra"><div class="gmail_quote">On 12 Dec 2017 16:02, "Erich Keane via cfe-commits" <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br type="attribution"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: erichkeane<br>
Date: Tue Dec 12 08:02:06 2017<br>
New Revision: 320489<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=320489&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=320489&view=rev</a><br>
Log:<br>
Fix ICE when __has_unqiue_object_<wbr>representations called with invalid decl<br>
<br>
Modified:<br>
    cfe/trunk/lib/AST/ASTContext.<wbr>cpp<br>
    cfe/trunk/lib/Sema/<wbr>SemaExprCXX.cpp<br>
    cfe/trunk/test/SemaCXX/type-<wbr>traits.cpp<br>
<br>
Modified: cfe/trunk/lib/AST/ASTContext.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=320489&r1=320488&r2=320489&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/AST/<wbr>ASTContext.cpp?rev=320489&r1=<wbr>320488&r2=320489&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/AST/ASTContext.<wbr>cpp (original)<br>
+++ cfe/trunk/lib/AST/ASTContext.<wbr>cpp Tue Dec 12 08:02:06 2017<br>
@@ -2279,6 +2279,9 @@ bool ASTContext::<wbr>hasUniqueObjectRepresen<br>
   if (Ty->isRecordType()) {<br>
     const RecordDecl *Record = Ty->getAs<RecordType>()-><wbr>getDecl();<br>
<br>
+    if (Record->isInvalidDecl())<br>
+      return false;<br>
+<br>
     if (Record->isUnion())<br>
       return unionHasUniqueObjectRepresenta<wbr>tions(*this, Record);<br>
<br>
<br>
Modified: cfe/trunk/lib/Sema/<wbr>SemaExprCXX.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=320489&r1=320488&r2=320489&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Sema/<wbr>SemaExprCXX.cpp?rev=320489&r1=<wbr>320488&r2=320489&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Sema/<wbr>SemaExprCXX.cpp (original)<br>
+++ cfe/trunk/lib/Sema/<wbr>SemaExprCXX.cpp Tue Dec 12 08:02:06 2017<br>
@@ -4958,7 +4958,7 @@ static bool EvaluateBinaryTypeTrait(Sema<br>
     EnterExpressionEvaluationConte<wbr>xt Unevaluated(<br>
         Self, Sema::<wbr>ExpressionEvaluationContext::<wbr>Unevaluated);<br>
     Sema::SFINAETrap SFINAE(Self, /*AccessCheckingSFINAE=*/true)<wbr>;<br>
-    Sema::ContextRAII TUContext(Self, Self.Context.<wbr>getTranslationUnitDecl());<br>
+    Sema::ContextRAII TUContext(Self, Self.Context.<wbr>getTranslationUnitDecl()); {<br>
     ExprResult Result = Self.BuildBinOp(/*S=*/nullptr, KeyLoc, BO_Assign, &Lhs,<br>
                                         &Rhs);<br>
     if (Result.isInvalid() || SFINAE.hasErrorOccurred())<br>
@@ -4981,6 +4981,7 @@ static bool EvaluateBinaryTypeTrait(Sema<br>
<br>
     llvm_unreachable("unhandled type trait");<br>
     return false;<br>
+    }<br></blockquote></div></div></div><div dir="auto"><br></div><div dir="auto">Was this change intentional?</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_extra"><div class="gmail_quote"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
   }<br>
     default: llvm_unreachable("not a BTT");<br>
   }<br>
<br>
Modified: cfe/trunk/test/SemaCXX/type-<wbr>traits.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/type-traits.cpp?rev=320489&r1=320488&r2=320489&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>SemaCXX/type-traits.cpp?rev=<wbr>320489&r1=320488&r2=320489&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/SemaCXX/type-<wbr>traits.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/type-<wbr>traits.cpp Tue Dec 12 08:02:06 2017<br>
@@ -2661,3 +2661,11 @@ static_assert(sizeof(<wbr>CanBeUniqueIfNoPadd<br>
               has_unique_object_<wbr>representations<<wbr>CanBeUniqueIfNoPadding>::<wbr>value,<br>
               "inherit from std layout");<br>
<br>
+namespace ErrorType {<br>
+  struct S; //expected-note{{forward declaration of 'ErrorType::S'}}<br>
+<br>
+  struct T {<br>
+        S t; //expected-error{{field has incomplete type 'ErrorType::S'}}<br>
+  };<br>
+  bool b = __has_unique_object_<wbr>representations(T);<br>
+};<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></div></div>