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

Improved fatal errors - they run through crash handler now

Browse source
This commit is contained in:
Brian Fiete 2020-05-13 12:30:25 -07:00
parent 9010d8ed47
commit 767ced3563
5 changed files with 48 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

41
IDEHelper/Compiler/BfModule.cpp
View file

@ -2845,12 +2845,31 @@ void BfModule::CheckRangeError(BfType* type, BfAstNode* refNode)
Fail(StrFormat("Result out of range for type '%s'", TypeToString(type).c_str()), refNode);
}
void BfModule::FatalError(const StringImpl& error, const char* file, int line)
{
String fullError = error;
if (file != NULL)
fullError += StrFormat(" at %s:%d", file, line);
fullError += StrFormat("\nModule: %s", mModuleName.c_str());
if (mCurTypeInstance != NULL)
fullError += StrFormat("\nType: %s", TypeToString(mCurTypeInstance).c_str());
if (mCurMethodInstance != NULL)
fullError += StrFormat("\nMethod: %s", MethodToString(mCurMethodInstance).c_str());
if ((mCurFilePosition.mFileInstance != NULL) && (mCurFilePosition.mFileInstance->mParser != NULL))
fullError += StrFormat("\nSource Location: %s:%d", mCurFilePosition.mFileInstance->mParser->mFileName.c_str(), mCurFilePosition.mCurLine + 1);
BfpSystem_FatalError(fullError.c_str(), "FATAL MODULE ERROR");
}
void BfModule::NotImpl(BfAstNode* astNode)
{
Fail("INTERNAL ERROR: Not implemented", astNode);
}
bool BfModule::CheckAccessMemberProtection(BfProtection protection, BfType* memberType)
{
bool allowPrivate = (memberType == mCurTypeInstance) || (IsInnerType(mCurTypeInstance, memberType));
@ -5431,16 +5450,16 @@ BfIRValue BfModule::CreateTypeData(BfType* type, Dictionary<int, int>& usedStrin
}
else if (constant->mTypeCode == BfTypeCode_Object)
{
BF_FATAL("Unhandled");
BFMODULE_FATAL(this, "Unhandled");
}
else
{
BF_FATAL("Unhandled");
BFMODULE_FATAL(this, "Unhandled");
}
}
else if (!handled)
{
BF_FATAL("Unhandled");
BFMODULE_FATAL(this, "Unhandled");
}
argIdx++;
@ -10660,7 +10679,7 @@ BfIRValue BfModule::ExtractSplatValue(BfTypedValue typedValue, int componentIdx,
return val;
}
BF_FATAL("Splat not found");
BFMODULE_FATAL(this, "Splat not found");
return BfIRValue();
}
@ -11278,7 +11297,7 @@ BfModuleMethodInstance BfModule::GetMethodInstance(BfTypeInstance* typeInst, BfM
return GetLocalMethodInstance(localMethod, methodGenericArguments);
}
BF_FATAL("Cannot find local method");
BFMODULE_FATAL(this, "Cannot find local method");
return BfModuleMethodInstance();
}
@ -11887,7 +11906,7 @@ BfModuleMethodInstance BfModule::GetMethodInstance(BfTypeInstance* typeInst, BfM
if (methodDef->mGenericParams.size() != sanitizedMethodGenericArguments.size())
{
Fail("Internal error");
BF_FATAL("Generic method argument counts mismatch");
BFMODULE_FATAL(this, "Generic method argument counts mismatch");
return NULL;
}
@ -15832,7 +15851,7 @@ void BfModule::EmitGCMarkMembers()
}
else if (checkType->IsMethodRef())
{
BF_FATAL("Not handled");
BFMODULE_FATAL(this, "Not handled");
}
else if (checkType->WantsGCMarking())
{
@ -17499,7 +17518,7 @@ void BfModule::ProcessMethod(BfMethodInstance* methodInstance, bool isInlineDup)
auto thisValue = GetThis();
if (thisValue.IsSplat())
{
BF_FATAL("Should not happen");
BFMODULE_FATAL(this, "Should not happen");
}
if (mCurTypeInstance->IsObject())
thisValue = LoadValue(thisValue);
@ -19126,6 +19145,8 @@ void BfModule::DoMethodDeclaration(BfMethodDeclaration* methodDeclaration, bool
auto methodDef = mCurMethodInstance->mMethodDef;
BF_ASSERT(methodDef->mName != "__ASSERTNAME");
if (methodDef->mName == "__FATALERRORNAME")
BFMODULE_FATAL(this, "__FATALERRORNAME");
if (typeInstance->IsClosure())
{
@ -21253,7 +21274,7 @@ bool BfModule::Finish()
}
else if ((!mCompiler->mOptions.mGenerateObj) && (!mCompiler->mOptions.mGenerateBitcode) && (!mCompiler->mOptions.mWriteIR))
{
BF_FATAL("Neither obj nor IR specified");
BFMODULE_FATAL(this, "Neither obj nor IR specified");
}
moduleFileName.mModuleWritten = writeModule;