From 3377ac04fcc9ad021c90f58d890d7e6fb8444b26 Mon Sep 17 00:00:00 2001 From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com> Date: Sun, 22 Oct 2023 12:34:26 +0200 Subject: [PATCH] Fix const use and vtable incompatibility --- oscar64/Parser.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/oscar64/Parser.cpp b/oscar64/Parser.cpp index 64fc32e..4c5fd7f 100644 --- a/oscar64/Parser.cpp +++ b/oscar64/Parser.cpp @@ -486,6 +486,8 @@ Declaration* Parser::ParseStructDeclaration(uint64 flags, DecType dt, Declaratio } dec->SetDefined(); + if (dec->mConst) + dec->mConst->mSize = dec->mSize; if ((mCompilerOptions & COPT_CPLUSPLUS) && dec->mType == DT_TYPE_STRUCT && dec->mIdent) { @@ -530,6 +532,8 @@ Declaration* Parser::ParseStructDeclaration(uint64 flags, DecType dt, Declaratio mdec = mdec->mNext; } dec->mSize++; + if (dec->mConst) + dec->mConst->mSize = dec->mSize; } dec->mScope->Iterate([=](const Ident* ident, Declaration* mdec)