mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-06 10:57:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring: Introduce getIrType()

Browse source 
As *the* way to access the IrType associated with a Type via its `ctype`
field. Most importantly, it makes sure all access is redirected to the
*unqualified* type's `ctype`, which allows to get rid of the 'multiple
types' workaround for aggregates in DtoType(). Those were e.g. hit for
`shared struct SpinLock`, where the struct's type includes the `shared`
modifier...
This commit is contained in:
Martin Kinkelin 2020-09-27 22:16:57 +02:00
parent ab2ae5e0a2
commit 3f716ff75e
15 changed files with 117 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ir/irtypefunction.cpp
View file

@ -19,20 +19,22 @@ IrTypeFunction::IrTypeFunction(Type *dt, llvm::Type *lt, IrFuncTy irFty_)
: IrType(dt, lt), irFty(std::move(irFty_)) {}
IrTypeFunction *IrTypeFunction::get(Type *dt) {
assert(!dt->ctype);
assert(dt->ty == Tfunction);
TypeFunction *tf = dt->isTypeFunction();
assert(tf);
TypeFunction *tf = static_cast<TypeFunction *>(dt);
auto &ctype = getIrType(tf);
assert(!ctype);
IrFuncTy irFty(tf);
llvm::Type *lt = DtoFunctionType(tf, irFty, nullptr, nullptr);
// Could have already built the type as part of a struct forward reference,
// just as for pointers and arrays.
if (!dt->ctype) {
dt->ctype = new IrTypeFunction(dt, lt, irFty);
if (!ctype) {
ctype = new IrTypeFunction(dt, lt, irFty);
}
return dt->ctype->isFunction();
return ctype->isFunction();
}
//////////////////////////////////////////////////////////////////////////////
@ -41,11 +43,12 @@ IrTypeDelegate::IrTypeDelegate(Type *dt, llvm::Type *lt, IrFuncTy irFty_)
: IrType(dt, lt), irFty(std::move(irFty_)) {}
IrTypeDelegate *IrTypeDelegate::get(Type *t) {
assert(!t->ctype);
assert(t->ty == Tdelegate);
assert(t->nextOf()->ty == Tfunction);
TypeFunction *tf = t->nextOf()->isTypeFunction();
assert(tf);
TypeFunction *tf = static_cast<TypeFunction *>(t->nextOf());
auto &ctype = getIrType(t);
assert(!ctype);
IrFuncTy irFty(tf);
llvm::Type *ltf =
@ -55,8 +58,9 @@ IrTypeDelegate *IrTypeDelegate::get(Type *t) {
// Could have already built the type as part of a struct forward reference,
// just as for pointers and arrays.
if (!t->ctype) {
t->ctype = new IrTypeDelegate(t, lt, irFty);
if (!ctype) {
ctype = new IrTypeDelegate(t, lt, irFty);
}
return t->ctype->isDelegate();
return ctype->isDelegate();
}