mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-25 20:50:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Put more types in Mcache

Browse source
This commit is contained in:
Dennis Korpel 2025-02-16 17:31:35 +01:00 • committed by The Dlang Bot
parent b0d35f225f
commit 24f80a0c42
4 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/src/dmd/frontend.h
View file

@ -1828,6 +1828,9 @@ public:
Type* wcto;
Type* swto;
Type* swcto;
Type* pto;
Type* rto;
Type* arrayof;
Mcache() :
cto(),
ito(),
@ -1836,10 +1839,13 @@ public:
wto(),
wcto(),
swto(),
swcto()
swcto(),
pto(),
rto(),
arrayof()
{
}
Mcache(Type* cto, Type* ito = nullptr, Type* sto = nullptr, Type* scto = nullptr, Type* wto = nullptr, Type* wcto = nullptr, Type* swto = nullptr, Type* swcto = nullptr) :
Mcache(Type* cto, Type* ito = nullptr, Type* sto = nullptr, Type* scto = nullptr, Type* wto = nullptr, Type* wcto = nullptr, Type* swto = nullptr, Type* swcto = nullptr, Type* pto = nullptr, Type* rto = nullptr, Type* arrayof = nullptr) :
cto(cto),
ito(ito),
sto(sto),
@ -1847,14 +1853,14 @@ public:
wto(wto),
wcto(wcto),
swto(swto),
swcto(swcto)
swcto(swcto),
pto(pto),
rto(rto),
arrayof(arrayof)
{}
};
Mcache* mcache;
Type* pto;
Type* rto;
Type* arrayof;
TypeInfoDeclaration* vtinfo;
void* ctype;
static Type* tvoid;

10
compiler/src/dmd/mtype.d
View file

@ -299,13 +299,12 @@ extern (C++) abstract class Type : ASTNode
Type wcto; // MODFlags.wildconst
Type swto; // MODFlags.shared_ | MODFlags.wild
Type swcto; // MODFlags.shared_ | MODFlags.wildconst
Type pto; // merged pointer to this type
Type rto; // reference to this type
Type arrayof; // array of this type
}
Mcache* mcache;
Type pto; // merged pointer to this type
Type rto; // reference to this type
Type arrayof; // array of this type
TypeInfoDeclaration vtinfo; // TypeInfo object for this Type
void* ctype; // for back end
@ -762,9 +761,6 @@ extern (C++) abstract class Type : ASTNode
memcpy(cast(void*)t, cast(void*)this, sz);
// t.mod = NULL; // leave mod unchanged
t.deco = null;
t.arrayof = null;
t.pto = null;
t.rto = null;
t.vtinfo = null;
t.ctype = null;
t.mcache = null;

3
compiler/src/dmd/mtype.h
View file

@ -146,9 +146,6 @@ public:
MOD mod; // modifiers MODxxxx
char *deco;
void* mcache;
Type *pto; // merged pointer to this type
Type *rto; // reference to this type
Type *arrayof; // array of this type
TypeInfoDeclaration *vtinfo; // TypeInfo object for this Type
type *ctype; // for back end

23
compiler/src/dmd/typesem.d
View file

@ -6722,30 +6722,32 @@ Type pointerTo(Type type)
{
if (type.ty == Terror)
return type;
if (!type.pto)
auto mcache = type.getMcache();
if (!mcache.pto)
{
Type t = new TypePointer(type);
if (type.ty == Tfunction)
{
t.deco = t.merge().deco;
type.pto = t;
mcache.pto = t;
}
else
type.pto = t.merge();
mcache.pto = t.merge();
}
return type.pto;
return mcache.pto;
}
Type referenceTo(Type type)
{
if (type.ty == Terror)
return type;
if (!type.rto)
auto mcache = type.getMcache();
if (!mcache.rto)
{
Type t = new TypeReference(type);
type.rto = t.merge();
mcache.rto = t.merge();
}
return type.rto;
return mcache.rto;
}
// Make corresponding static array type without semantic
@ -6763,12 +6765,13 @@ Type arrayOf(Type type)
{
if (type.ty == Terror)
return type;
if (!type.arrayof)
auto mcache = type.getMcache();
if (!mcache.arrayof)
{
Type t = new TypeDArray(type);
type.arrayof = t.merge();
mcache.arrayof = t.merge();
}
return type.arrayof;
return mcache.arrayof;
}
/********************************