Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 04:22:20 +02:00
Code Activity

Fixed reification issues, mut-vs-imut method mangling

Browse source
This commit is contained in:
Brian Fiete 2020-10-22 17:25:19 -07:00
parent 425284f023
commit 9a857cceb3
8 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
IDEHelper/Compiler/BfMangler.cpp
View file

@ -2011,7 +2011,10 @@ void BfMSMangler::Mangle(StringImpl& name, bool is64Bit, BfMethodInstance* metho
}
else
{
AddStr(mangleContext, name, methodDef->mName);
if ((!mangleContext.mCPPMangle) && (!methodDef->mIsMutating) && (!methodDef->mIsStatic) && (methodInst->GetOwner()->IsValueType()))
AddStr(mangleContext, name, methodDef->mName + "__im");
else
AddStr(mangleContext, name, methodDef->mName);
}
if ((methodInst->mMethodDef->mDeclaringType->mPartialIdx != -1) && (methodInst->mMethodDef->mDeclaringType->IsExtension()) &&
@ -2044,12 +2047,15 @@ void BfMSMangler::Mangle(StringImpl& name, bool is64Bit, BfMethodInstance* metho
name += StrFormat("%d$", declType->mPartialIdx);
}
if (methodInst->mMangleWithIdx)
name += StrFormat("i%d$", methodInst->mMethodDef->mIdx);
if (methodDef->mCheckedKind == BfCheckedKind_Checked)
name += "CHK$";
else if (methodDef->mCheckedKind == BfCheckedKind_Unchecked)
name += "UCHK$";
if (!mangleContext.mCPPMangle)
{
if (methodInst->mMangleWithIdx)
name += StrFormat("i%d$", methodInst->mMethodDef->mIdx);
if (methodDef->mCheckedKind == BfCheckedKind_Checked)
name += "CHK$";
else if (methodDef->mCheckedKind == BfCheckedKind_Unchecked)
name += "UCHK$";
}
/*if ((methodInst->mMethodInstanceGroup->mOwner->mTypeDef->IsGlobalsContainer()) && (methodInst->mMethodDef->mMethodDeclaration == NULL))
{