[PATCH] D53508: [SemaCXX] Unconfuse Clang when std::align_val_t is unscoped in C++03

[Eric Fiselier via Phabricator via cfe-commits]

EricWF created this revision.
EricWF added a reviewer: rsmith.

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).
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.

For example: https://godbolt.org/z/xXJELh

This patch fixes the confusion.


Repository:
  rC Clang

https://reviews.llvm.org/D53508

Files:
  lib/Sema/SemaExprCXX.cpp
  test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp


Index: test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp
===================================================================
--- /dev/null
+++ test/SemaCXX/cxx03-aligned-allocation-unscoped-enum.cpp
@@ -0,0 +1,21 @@
+// RUN: %clang_cc1 -std=c++03 %s -faligned-allocation \
+// RUN:   -emit-llvm -o - | FileCheck %s
+
+// Ensure Clang doesn't confuse std::align_val_t with the sized deallocation
+// parameter when the enum type is unscoped. Libc++ does this in C++03 in order
+// to support aligned allocation in that dialect.
+
+using size_t = __decltype(sizeof(0));
+
+namespace std {
+enum align_val_t { zero = size_t(0),
+                   max = size_t(-1) };
+}
+
+// CHECK-LABEL: define void @_Z1fPi(
+void f(int *p) {
+  // CHECK-NOT: call void @_ZdlPvSt11align_val_t(
+  // CHECK: call void @_ZdlPv(
+  // CHECK: ret void
+  delete p;
+}
Index: lib/Sema/SemaExprCXX.cpp
===================================================================
--- lib/Sema/SemaExprCXX.cpp
+++ lib/Sema/SemaExprCXX.cpp
@@ -1515,8 +1515,9 @@
       if (FD->getNumParams() == NumBaseParams + 2)
         HasAlignValT = HasSizeT = true;
       else if (FD->getNumParams() == NumBaseParams + 1) {
-        HasSizeT = FD->getParamDecl(NumBaseParams)->getType()->isIntegerType();
-        HasAlignValT = !HasSizeT;
+        QualType ParamTy = FD->getParamDecl(NumBaseParams)->getType();
+        HasAlignValT = ParamTy->isAlignValT();
+        HasSizeT = !HasAlignValT && ParamTy->isIntegerType();
       }
 
       // In CUDA, determine how much we'd like / dislike to call this.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D53508.170441.patch
Type: text/x-patch
Size: 1567 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20181022/808be55c/attachment.bin>