Skip to content

Fix #22813 - Removing __monitor from Object leads to errors #22817

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

Draft
dkorpel wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −18
Draft

Fix #22813 - Removing __monitor from Object leads to errors #22817

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
5 changes: 1 addition & 4 deletions compiler/src/dmd/frontend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7373,7 +7373,6 @@ struct Target final
uint8_t realsize;
uint8_t realpad;
uint8_t realalignsize;
uint8_t classinfosize;
uint64_t maxStaticDataSize;
TargetC c;
TargetCPP cpp;
Expand Down Expand Up @@ -7447,7 +7446,6 @@ struct Target final
realsize(),
realpad(),
realalignsize(),
classinfosize(),
maxStaticDataSize(),
c(),
cpp(),
Expand All @@ -7468,14 +7466,13 @@ struct Target final
params()
{
}
Target(OS os, uint8_t osMajor = 0u, uint8_t ptrsize = 0u, uint8_t realsize = 0u, uint8_t realpad = 0u, uint8_t realalignsize = 0u, uint8_t classinfosize = 0u, uint64_t maxStaticDataSize = 0LLU, TargetC c = TargetC(), TargetCPP cpp = TargetCPP(), TargetObjC objc = TargetObjC(), _d_dynamicArray< const char > architectureName = {}, CPU cpu = (CPU)0u, bool isAArch64 = false, bool isX86_64 = false, bool isX86 = false, bool isLP64 = false, _d_dynamicArray< const char > obj_ext = {}, _d_dynamicArray< const char > lib_ext = {}, _d_dynamicArray< const char > dll_ext = {}, bool run_noext = false, FPTypeProperties<float > FloatProperties = FPTypeProperties<float >(), FPTypeProperties<double > DoubleProperties = FPTypeProperties<double >(), FPTypeProperties<_d_real > RealProperties = FPTypeProperties<_d_real >(), Type* tvalist = nullptr, const Param* params = nullptr) :
Target(OS os, uint8_t osMajor = 0u, uint8_t ptrsize = 0u, uint8_t realsize = 0u, uint8_t realpad = 0u, uint8_t realalignsize = 0u, uint64_t maxStaticDataSize = 0LLU, TargetC c = TargetC(), TargetCPP cpp = TargetCPP(), TargetObjC objc = TargetObjC(), _d_dynamicArray< const char > architectureName = {}, CPU cpu = (CPU)0u, bool isAArch64 = false, bool isX86_64 = false, bool isX86 = false, bool isLP64 = false, _d_dynamicArray< const char > obj_ext = {}, _d_dynamicArray< const char > lib_ext = {}, _d_dynamicArray< const char > dll_ext = {}, bool run_noext = false, FPTypeProperties<float > FloatProperties = FPTypeProperties<float >(), FPTypeProperties<double > DoubleProperties = FPTypeProperties<double >(), FPTypeProperties<_d_real > RealProperties = FPTypeProperties<_d_real >(), Type* tvalist = nullptr, const Param* params = nullptr) :
os(os),
osMajor(osMajor),
ptrsize(ptrsize),
realsize(realsize),
realpad(realpad),
realalignsize(realalignsize),
classinfosize(classinfosize),
maxStaticDataSize(maxStaticDataSize),
c(c),
cpp(cpp),
Expand Down
3 changes: 3 additions & 0 deletions compiler/src/dmd/glue/todt.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,9 @@ private extern (C++) class TypeInfoDtVisitor : Visitor
*/
static void verifyStructSize(ClassDeclaration typeclass, size_t expected)
{
if (!typeclass.hasMonitor)
expected -= target.ptrsize;

if (typeclass.structsize != expected)
{
debug
Expand Down
24 changes: 16 additions & 8 deletions compiler/src/dmd/glue/toobj.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,6 +1083,14 @@ private bool finishVtbl(ClassDeclaration cd)
return !hasError;
}

/// Returns: classInstanceSize of TypeInfo_Class for `cd`
uint classInfoSize(ClassDeclaration cd)
{
if (target.ptrsize == 8)
return 0x98 + 8 + (cd.hasMonitor ? 8 : 0); // 168 with monitor
else
return 0x4C + 12 + (cd.hasMonitor ? 4 : 0); // 92 with monitor
}

/******************************************
* Get offset of base class's vtbl[] initializer from start of csym.
Expand All @@ -1092,8 +1100,8 @@ private bool finishVtbl(ClassDeclaration cd)
uint baseVtblOffset(ClassDeclaration cd, BaseClass* bc)
{
//printf("ClassDeclaration.baseVtblOffset('%s', bc = %p)\n", cd.toChars(), bc);
uint csymoffset = target.classinfosize; // must be ClassInfo.size
//printf("target.classinfosize: %d\n", csymoffset);
uint csymoffset = cd.classInfoSize; // must be ClassInfo.size
//printf("cd.classInfoSize: %d\n", csymoffset);
csymoffset += cd.vtblInterfaces.length * (4 * target.ptrsize);

for (size_t i = 0; i < cd.vtblInterfaces.length; i++)
Expand Down Expand Up @@ -1153,7 +1161,7 @@ private size_t emitVtbl(ref DtBuilder dtb, BaseClass* b, ref FuncDeclarations bv
if (id.vtblOffset())
{
// First entry is struct Interface reference
dtb.xoff(toSymbol(pc), cast(uint)(target.classinfosize + k * (4 * target.ptrsize)), TYnptr);
dtb.xoff(toSymbol(pc), cast(uint)(id.classInfoSize + k * (4 * target.ptrsize)), TYnptr);
jstart = 1;
}

Expand Down Expand Up @@ -1187,11 +1195,11 @@ private void genClassInfoForClass(ClassDeclaration cd, Symbol* sinit)
{
if (Type.typeinfoclass)
{
if (Type.typeinfoclass.structsize != target.classinfosize)
if (Type.typeinfoclass.structsize != cd.classInfoSize)
Copy link
Copy Markdown
Contributor

@thewilsonator thewilsonator Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to account for monitor here as done in verifyStructSize?

{
debug printf("target.classinfosize = x%x, Type.typeinfoclass.structsize = x%x\n", target.classinfosize, Type.typeinfoclass.structsize);
debug printf("cd.classInfoSize = x%x, Type.typeinfoclass.structsize = x%x\n", cd.classInfoSize, Type.typeinfoclass.structsize);
.error(cd.loc, "%s `%s` mismatch between compiler (%d bytes) and object.d or object.di (%d bytes) found",
cd.kind, cd.toPrettyChars, cast(uint)target.classinfosize, cast(uint)Type.typeinfoclass.structsize);
cd.kind, cd.toPrettyChars, cast(uint)cd.classInfoSize, cast(uint)Type.typeinfoclass.structsize);
.errorSupplemental(cd.loc, "check installation and import paths with `-v` compiler switch");
fatal();
}
Expand Down Expand Up @@ -1238,7 +1246,7 @@ private void ClassInfoToDt(ref DtBuilder dtb, ClassDeclaration cd, Symbol* sinit
uint[4] nameSig;
}
*/
uint offset = target.classinfosize; // must be ClassInfo.size
uint offset = cd.classInfoSize; // must be ClassInfo.size

if (auto tic = Type.typeinfoclass)
{
Expand Down Expand Up @@ -1523,7 +1531,7 @@ private void InterfaceInfoToDt(ref DtBuilder dtb, InterfaceDeclaration id)
dtb.size(0);

// interfaces[]
uint offset = target.classinfosize;
uint offset = id.classInfoSize;
dtb.size(id.vtblInterfaces.length);
if (id.vtblInterfaces.length)
{
Expand Down
5 changes: 0 additions & 5 deletions compiler/src/dmd/target.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@ extern (C++) struct Target
ubyte realsize; /// size a real consumes in memory
ubyte realpad; /// padding added to the CPU real size to bring it up to realsize
ubyte realalignsize; /// alignment for reals
ubyte classinfosize; /// size of `ClassInfo`
ulong maxStaticDataSize; /// maximum size of static data

/// C ABI
Expand Down Expand Up @@ -444,7 +443,6 @@ extern (C++) struct Target
// These have default values for 32 bit code, they get
// adjusted for 64 bit code.
ptrsize = 4;
classinfosize = 0x4C+16; // 92

/* gcc uses int.max for 32 bit compilations, and long.max for 64 bit ones.
* Set to int.max for both, because the rest of the compiler cannot handle
Expand All @@ -457,9 +455,6 @@ extern (C++) struct Target
if (isLP64 || isAArch64)
{
ptrsize = 8;
/* This is affected by version WithArgTypes in object.d
*/
classinfosize = 0x98+16; // 168
}

if (os & (Target.OS.linux | Target.OS.FreeBSD | Target.OS.OpenBSD | Target.OS.DragonFlyBSD | Target.OS.Solaris))
Expand Down
1 change: 0 additions & 1 deletion compiler/src/dmd/target.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ struct Target
uint8_t realsize; // size a real consumes in memory
uint8_t realpad; // 'padding' added to the CPU real size to bring it up to realsize
uint8_t realalignsize; // alignment for reals
uint8_t classinfosize; // size of 'ClassInfo'
uint64_t maxStaticDataSize; // maximum size of static data

// C ABI
Expand Down
Loading