<div dir="ltr">The reason for the revert was that the assertion was triggered by a bunch of tests. It looks like we diagnose the errors later? I'm not sure yet.</div><br><div class="gmail_quote"><div dir="ltr">On Thu, Oct 25, 2018 at 4:52 PM Eric Fiselier <<a href="mailto:eric@efcs.ca">eric@efcs.ca</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Ack. My bad.</div><br><div class="gmail_quote"><div dir="ltr">On Thu, Oct 25, 2018 at 4:02 PM Richard Smith <<a href="mailto:richard@metafoo.co.uk" target="_blank">richard@metafoo.co.uk</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">When reverting (even when reverting your own commit), please include in the commit description a reason for the revert.<br><br><div class="gmail_quote"><div dir="ltr">On Thu, 25 Oct 2018 at 12:52, Eric Fiselier via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ericwf<br>
Date: Thu Oct 25 12:50:43 2018<br>
New Revision: 345306<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=345306&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=345306&view=rev</a><br>
Log:<br>
Revert "[SemaCXX] Unconfuse Clang when std::align_val_t is unscoped in C++03"<br>
<br>
This reverts commit b5d8d0de744d2c212bdb17d5c5fd4447dd14dbd2.<br>
<br>
Removed:<br>
cfe/trunk/test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp<br>
Modified:<br>
cfe/trunk/lib/Sema/SemaExprCXX.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=345306&r1=345305&r2=345306&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=345306&r1=345305&r2=345306&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaExprCXX.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaExprCXX.cpp Thu Oct 25 12:50:43 2018<br>
@@ -1515,11 +1515,8 @@ namespace {<br>
if (FD->getNumParams() == NumBaseParams + 2)<br>
HasAlignValT = HasSizeT = true;<br>
else if (FD->getNumParams() == NumBaseParams + 1) {<br>
- QualType ParamTy = FD->getParamDecl(NumBaseParams)->getType();<br>
- HasAlignValT = ParamTy->isAlignValT();<br>
- HasSizeT = !HasAlignValT;<br>
- assert((HasAlignValT || ParamTy->isIntegerType()) &&<br>
- "Candidate is not regular dealloc function");<br>
+ HasSizeT = FD->getParamDecl(NumBaseParams)->getType()->isIntegerType();<br>
+ HasAlignValT = !HasSizeT;<br>
}<br>
<br>
// In CUDA, determine how much we'd like / dislike to call this.<br>
<br>
Removed: cfe/trunk/test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp?rev=345305&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp?rev=345305&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp (removed)<br>
@@ -1,21 +0,0 @@<br>
-// RUN: %clang_cc1 -std=c++03 -triple x86_64-pc-linux-gnu %s \<br>
-// RUN: -faligned-allocation -emit-llvm -o - | FileCheck %s<br>
-<br>
-// Ensure Clang doesn't confuse std::align_val_t with the sized deallocation<br>
-// parameter when the enum type is unscoped. Libc++ does this in C++03 in order<br>
-// to support aligned allocation in that dialect.<br>
-<br>
-using size_t = __decltype(sizeof(0));<br>
-<br>
-namespace std {<br>
-enum align_val_t { zero = size_t(0),<br>
- max = size_t(-1) };<br>
-}<br>
-<br>
-// CHECK-LABEL: define void @_Z1fPi(<br>
-void f(int *p) {<br>
- // CHECK-NOT: call void @_ZdlPvSt11align_val_t(<br>
- // CHECK: call void @_ZdlPv(<br>
- // CHECK: ret void<br>
- delete p;<br>
-}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">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></div>
</blockquote></div>
</blockquote></div>