<div dir="auto">reverting</div><br><div class="gmail_quote"><div dir="ltr">On Thu., Oct. 25, 2018, 2:18 p.m. Eric Fiselier via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">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 11:16:16 2018<br>
New Revision: 345296<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=345296&view=rev" rel="noreferrer noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=345296&view=rev</a><br>
Log:<br>
[SemaCXX] Unconfuse Clang when std::align_val_t is unscoped in C++03<br>
<br>
Summary:<br>
When -faligned-allocation is specified in C++03 libc++ defines std::align_val_t as an unscoped enumeration type (because Clang didn't provide scoped enumerations as an extension until 8.0).<br>
Unfortunately Clang confuses the `align_val_t` overloads of delete with the sized deallocation overloads which aren't enabled. This caused Clang to call the aligned deallocation function as if it were the sized deallocation overload.<br>
<br>
For example: <a href="https://godbolt.org/z/xXJELh" rel="noreferrer noreferrer" target="_blank">https://godbolt.org/z/xXJELh</a><br>
<br>
This patch fixes the confusion.<br>
<br>
Reviewers: rsmith, EricWF<br>
<br>
Reviewed By: EricWF<br>
<br>
Subscribers: cfe-commits<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D53508" rel="noreferrer noreferrer" target="_blank">https://reviews.llvm.org/D53508</a><br>
<br>
Added:<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=345296&r1=345295&r2=345296&view=diff" rel="noreferrer noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=345296&r1=345295&r2=345296&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaExprCXX.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaExprCXX.cpp Thu Oct 25 11:16:16 2018<br>
@@ -1515,8 +1515,11 @@ namespace {<br>
       if (FD->getNumParams() == NumBaseParams + 2)<br>
         HasAlignValT = HasSizeT = true;<br>
       else if (FD->getNumParams() == NumBaseParams + 1) {<br>
-        HasSizeT = FD->getParamDecl(NumBaseParams)->getType()->isIntegerType();<br>
-        HasAlignValT = !HasSizeT;<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>
       }<br>
<br>
       // In CUDA, determine how much we'd like / dislike to call this.<br>
<br>
Added: 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=345296&view=auto" rel="noreferrer noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp?rev=345296&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp (added)<br>
+++ cfe/trunk/test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp Thu Oct 25 11:16:16 2018<br>
@@ -0,0 +1,21 @@<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" rel="noreferrer">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>