Skip to content

[clang][bytecode] Allocate operator new data as array #146471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2025
Merged

[clang][bytecode] Allocate operator new data as array #146471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions clang/lib/AST/ByteCode/InterpBuiltin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1531,34 +1531,21 @@ static bool interp__builtin_operator_new(InterpState &S, CodePtr OpPC,
std::optional<PrimType> ElemT = S.getContext().classify(ElemType);
DynamicAllocator &Allocator = S.getAllocator();
if (ElemT) {
if (IsArray) {
Block *B = Allocator.allocate(NewCall, *ElemT, NumElems.getZExtValue(),
S.Ctx.getEvalID(),
DynamicAllocator::Form::Operator);
assert(B);
S.Stk.push<Pointer>(Pointer(B).atIndex(0));
return true;
}

const Descriptor *Desc = S.P.createDescriptor(
NewCall, *ElemT, ElemType.getTypePtr(), Descriptor::InlineDescMD,
/*IsConst=*/false, /*IsTemporary=*/false,
/*IsMutable=*/false);
Block *B = Allocator.allocate(Desc, S.getContext().getEvalID(),
DynamicAllocator::Form::Operator);
Block *B =
Allocator.allocate(NewCall, *ElemT, NumElems.getZExtValue(),
S.Ctx.getEvalID(), DynamicAllocator::Form::Operator);
assert(B);

S.Stk.push<Pointer>(B);
S.Stk.push<Pointer>(Pointer(B).atIndex(0));
return true;
}

assert(!ElemT);
// Structs etc.
const Descriptor *Desc =
S.P.createDescriptor(NewCall, ElemType.getTypePtr(),
IsArray ? std::nullopt : Descriptor::InlineDescMD);

// Composite arrays
if (IsArray) {
const Descriptor *Desc =
S.P.createDescriptor(NewCall, ElemType.getTypePtr(),
IsArray ? std::nullopt : Descriptor::InlineDescMD);
Block *B =
Allocator.allocate(Desc, NumElems.getZExtValue(), S.Ctx.getEvalID(),
DynamicAllocator::Form::Operator);
Expand All @@ -1567,10 +1554,17 @@ static bool interp__builtin_operator_new(InterpState &S, CodePtr OpPC,
return true;
}

// Records. Still allocate them as single-element arrays.
QualType AllocType = S.getASTContext().getConstantArrayType(
ElemType, NumElems, nullptr, ArraySizeModifier::Normal, 0);

const Descriptor *Desc =
S.P.createDescriptor(NewCall, AllocType.getTypePtr(),
IsArray ? std::nullopt : Descriptor::InlineDescMD);
Block *B = Allocator.allocate(Desc, S.getContext().getEvalID(),
DynamicAllocator::Form::Operator);
assert(B);
S.Stk.push<Pointer>(B);
S.Stk.push<Pointer>(Pointer(B).atIndex(0));
return true;
}

Expand Down
15 changes: 2 additions & 13 deletions clang/lib/AST/ByteCode/Pointer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,19 +176,8 @@ APValue Pointer::toAPValue(const ASTContext &ASTCtx) const {
if (const auto *VD = Desc->asValueDecl())
Base = VD;
else if (const auto *E = Desc->asExpr()) {
// Create a DynamicAlloc base of the right type.
if (const auto *NewExpr = dyn_cast<CXXNewExpr>(E)) {
QualType AllocatedType;
if (NewExpr->isArray()) {
assert(Desc->isArray());
APInt ArraySize(64, static_cast<uint64_t>(Desc->getNumElems()),
/*IsSigned=*/false);
AllocatedType =
ASTCtx.getConstantArrayType(NewExpr->getAllocatedType(), ArraySize,
nullptr, ArraySizeModifier::Normal, 0);
} else {
AllocatedType = NewExpr->getAllocatedType();
}
if (block()->isDynamic()) {
QualType AllocatedType = getDeclPtr().getFieldDesc()->getDataType(ASTCtx);
// FIXME: Suboptimal counting of dynamic allocations. Move this to Context
// or InterpState?
static int ReportedDynamicAllocs = 0;
Expand Down
Loading