[clang] 426eff6 - [clang][bytecode] No primitive types need their ctor function called (#218666)
via cfe-commits
cfe-commits at lists.llvm.org
Tue Aug 25 06:27:16 PDT 2026
Author: Timm Baeder
Date: 2026-08-25T15:27:11+02:00
New Revision: 426eff6682570ab7ec624b3957a2794641f3fa3c
URL: https://github.com/llvm/llvm-project/commit/426eff6682570ab7ec624b3957a2794641f3fa3c
DIFF: https://github.com/llvm/llvm-project/commit/426eff6682570ab7ec624b3957a2794641f3fa3c.diff
LOG: [clang][bytecode] No primitive types need their ctor function called (#218666)
Both Pointer and MemberPointer are fine with being all-zero initialized.
I've left the code for this in the file for now though, in case I need
it later.
Added:
Modified:
clang/lib/AST/ByteCode/Descriptor.cpp
Removed:
################################################################################
diff --git a/clang/lib/AST/ByteCode/Descriptor.cpp b/clang/lib/AST/ByteCode/Descriptor.cpp
index d0435d4684875..862940ec32bf4 100644
--- a/clang/lib/AST/ByteCode/Descriptor.cpp
+++ b/clang/lib/AST/ByteCode/Descriptor.cpp
@@ -11,6 +11,7 @@
#include "Char.h"
#include "FixedPoint.h"
#include "Floating.h"
+#include "Integral.h"
#include "IntegralAP.h"
#include "MemberPointer.h"
#include "Pointer.h"
@@ -22,57 +23,24 @@
using namespace clang;
using namespace clang::interp;
-template <typename T> static constexpr bool needsCtor() {
- if constexpr (std::is_same_v<T, Char<true>> ||
- std::is_same_v<T, Char<false>> ||
- std::is_same_v<T, Integral<16, true>> ||
- std::is_same_v<T, Integral<16, false>> ||
- std::is_same_v<T, Integral<32, true>> ||
- std::is_same_v<T, Integral<32, false>> ||
- std::is_same_v<T, Integral<64, true>> ||
- std::is_same_v<T, Integral<64, false>> ||
- std::is_same_v<T, IntegralAP<true>> ||
- std::is_same_v<T, IntegralAP<false>> ||
- std::is_same_v<T, Floating> || std::is_same_v<T, Boolean>)
- return false;
-
- return true;
-}
-
-template <typename T>
-static void ctorTy(Block *, std::byte *Ptr, bool, bool, bool, bool, bool,
- const Descriptor *) {
- static_assert(needsCtor<T>());
- new (Ptr) T();
+template <typename T> static constexpr bool needsDtor() {
+ return std::is_same_v<T, Pointer> || std::is_same_v<T, MemberPointer>;
}
template <typename T>
static void dtorTy(Block *, std::byte *Ptr, const Descriptor *) {
- static_assert(needsCtor<T>());
+ static_assert(needsDtor<T>());
reinterpret_cast<T *>(Ptr)->~T();
}
-template <typename T>
-static void ctorArrayTy(Block *, std::byte *Ptr, bool, bool, bool, bool, bool,
- const Descriptor *D) {
- new (Ptr) InitMapPtr();
-
- if constexpr (needsCtor<T>()) {
- Ptr += sizeof(InitMapPtr);
- for (unsigned I = 0, NE = D->getNumElems(); I < NE; ++I) {
- new (&reinterpret_cast<T *>(Ptr)[I]) T();
- }
- }
-}
-
template <typename T>
static void dtorArrayTy(Block *, std::byte *Ptr, const Descriptor *D) {
InitMapPtr &IMP = *reinterpret_cast<InitMapPtr *>(Ptr);
IMP.deleteInitMap();
- if constexpr (needsCtor<T>()) {
+ if constexpr (needsDtor<T>()) {
Ptr += sizeof(InitMapPtr);
- for (unsigned I = 0, NE = D->getNumElems(); I < NE; ++I) {
+ for (unsigned I = 0, NE = D->getNumElems(); I != NE; ++I) {
reinterpret_cast<T *>(Ptr)[I].~T();
}
}
@@ -243,18 +211,6 @@ static bool needsRecordDtor(const Record *R) {
return false;
}
-static BlockCtorFn getCtorPrim(PrimType T) {
- switch (T) {
- case PT_Ptr:
- return ctorTy<PrimConv<PT_Ptr>::T>;
- case PT_MemberPtr:
- return ctorTy<PrimConv<PT_MemberPtr>::T>;
- default:
- return nullptr;
- }
- llvm_unreachable("Unhandled PrimType");
-}
-
static BlockDtorFn getDtorPrim(PrimType T) {
switch (T) {
case PT_Ptr:
@@ -267,11 +223,67 @@ static BlockDtorFn getDtorPrim(PrimType T) {
llvm_unreachable("Unhandled PrimType");
}
+// NOTE: The following #if-ed out code is for calling constructors of primitive
+// types. It is currently not needed but I'm not sure if it will stay this way
+// forever so I'm leaving it here for now.
+#if 0
+template <typename T> static constexpr bool needsCtor() {
+ return false;
+ if constexpr (std::is_same_v<T, Char<true>> ||
+ std::is_same_v<T, Char<false>> ||
+ std::is_same_v<T, Integral<16, true>> ||
+ std::is_same_v<T, Integral<16, false>> ||
+ std::is_same_v<T, Integral<32, true>> ||
+ std::is_same_v<T, Integral<32, false>> ||
+ std::is_same_v<T, Integral<64, true>> ||
+ std::is_same_v<T, Integral<64, false>> ||
+ std::is_same_v<T, IntegralAP<true>> ||
+ std::is_same_v<T, IntegralAP<false>> ||
+ std::is_same_v<T, Floating> || std::is_same_v<T, Boolean>)
+ return false;
+
+ return true;
+}
+
+
static BlockCtorFn getCtorArrayPrim(PrimType Type) {
TYPE_SWITCH(Type, if constexpr (!needsCtor<T>()) return nullptr;
return ctorArrayTy<T>);
llvm_unreachable("unknown Expr");
}
+static BlockCtorFn getCtorPrim(PrimType T) {
+ return nullptr;
+ switch (T) {
+ // case PT_Ptr:
+ // return ctorTy<PrimConv<PT_Ptr>::T>;
+ // case PT_MemberPtr:
+ // return ctorTy<PrimConv<PT_MemberPtr>::T>;
+ default:
+ return nullptr;
+ }
+ llvm_unreachable("Unhandled PrimType");
+}
+
+
+template <typename T>
+static void ctorArrayTy(Block *, std::byte *Ptr, bool, bool, bool, bool, bool,
+ const Descriptor *D) {
+ new (Ptr) InitMapPtr();
+
+ if constexpr (needsCtor<T>()) {
+ Ptr += sizeof(InitMapPtr);
+ for (unsigned I = 0, NE = D->getNumElems(); I < NE; ++I) {
+ new (&reinterpret_cast<T *>(Ptr)[I]) T();
+ }
+ }
+}
+template <typename T>
+static void ctorTy(Block *, std::byte *Ptr, bool, bool, bool, bool, bool,
+ const Descriptor *) {
+ static_assert(needsCtor<T>());
+ new (Ptr) T();
+}
+#endif
static BlockDtorFn getDtorArrayPrim(PrimType Type) {
TYPE_SWITCH(Type, return dtorArrayTy<T>);
@@ -285,7 +297,7 @@ Descriptor::Descriptor(DeclOrExpr D, const Type *SourceTy, PrimType Type,
: Source(D), SourceType(SourceTy), ElemSize(primSize(Type)), Size(ElemSize),
AllocSize(align(ElemSize)), PrimT(Type), IsConst(IsConst),
IsMutable(IsMutable), IsTemporary(IsTemporary), IsVolatile(IsVolatile),
- CtorFn(getCtorPrim(Type)), DtorFn(getDtorPrim(Type)) {
+ CtorFn(nullptr), DtorFn(getDtorPrim(Type)) {
assert(Source && "Missing source");
}
@@ -297,7 +309,7 @@ Descriptor::Descriptor(DeclOrExpr D, const Type *SourceTy, PrimType Type,
Size(ElemSize * NumElems), AllocSize(align(Size) + sizeof(InitMapPtr)),
PrimT(Type), IsConst(IsConst), IsMutable(IsMutable),
IsTemporary(IsTemporary), IsVolatile(IsVolatile), IsArray(true),
- CtorFn(getCtorArrayPrim(Type)), DtorFn(getDtorArrayPrim(Type)) {
+ CtorFn(nullptr), DtorFn(getDtorArrayPrim(Type)) {
assert(Source && "Missing source");
assert(NumElems <= (MaxArrayElemBytes / ElemSize));
}
@@ -308,8 +320,7 @@ Descriptor::Descriptor(DeclOrExpr D, PrimType Type, bool IsConst,
: Source(D), ElemSize(primSize(Type)), Size(UnknownSizeMark),
AllocSize(sizeof(InitMapPtr) + alignof(void *)), PrimT(Type),
IsConst(IsConst), IsMutable(false), IsTemporary(IsTemporary),
- IsArray(true), CtorFn(getCtorArrayPrim(Type)),
- DtorFn(getDtorArrayPrim(Type)) {
+ IsArray(true), CtorFn(nullptr), DtorFn(getDtorArrayPrim(Type)) {
assert(Source && "Missing source");
}
More information about the cfe-commits
mailing list