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

Improvements to warn/error type attributes

Browse source
This commit is contained in:
Brian Fiete 2021-12-30 11:04:52 -05:00
parent b3d3f0fb54
commit efbdc33622
3 changed files with 52 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

34
IDEHelper/Compiler/BfContext.cpp
View file

@ -381,7 +381,7 @@ bool BfContext::ProcessWorkList(bool onlyReifiedTypes, bool onlyReifiedMethods)
for (int workIdx = 0; workIdx < (int)mPopulateTypeWorkList.size(); workIdx++) for (int workIdx = 0; workIdx < (int)mPopulateTypeWorkList.size(); workIdx++)
{ {
//BP_ZONE("PWL_PopulateType"); //BP_ZONE("PWL_PopulateType");
if (IsCancellingAndYield()) if (IsCancellingAndYield())
break; break;
@ -426,8 +426,33 @@ bool BfContext::ProcessWorkList(bool onlyReifiedTypes, bool onlyReifiedMethods)
useModule->PopulateType(type, BfPopulateType_Full); useModule->PopulateType(type, BfPopulateType_Full);
mCompiler->mStats.mQueuedTypesProcessed++; mCompiler->mStats.mQueuedTypesProcessed++;
mCompiler->UpdateCompletion(); mCompiler->UpdateCompletion();
didWork = true; didWork = true;
} }
for (int workIdx = 0; workIdx < (int)mTypeRefVerifyWorkList.size(); workIdx++)
{
if (IsCancellingAndYield())
break;
auto workItemRef = mTypeRefVerifyWorkList[workIdx];
if (workItemRef == NULL)
{
workIdx = mTypeRefVerifyWorkList.RemoveAt(workIdx);
continue;
}
SetAndRestoreValue<BfTypeInstance*> prevTypeInstance(workItemRef->mFromModule->mCurTypeInstance, workItemRef->mCurTypeInstance);
auto refTypeInst = workItemRef->mType->ToTypeInstance();
if (refTypeInst->mCustomAttributes == NULL)
workItemRef->mFromModule->PopulateType(refTypeInst, BfPopulateType_AllowStaticMethods);
if (refTypeInst != NULL)
workItemRef->mFromModule->CheckErrorAttributes(refTypeInst, NULL, refTypeInst->mCustomAttributes, workItemRef->mRefNode);
workIdx = mTypeRefVerifyWorkList.RemoveAt(workIdx);
didWork = true;
}
//while (mMethodSpecializationWorkList.size() != 0) //while (mMethodSpecializationWorkList.size() != 0)
@ -2743,7 +2768,7 @@ void DoRemoveInvalidWorkItems(BfContext* bfContext, WorkQueue<T>& workList, bool
if (workItem == NULL) if (workItem == NULL)
continue; continue;
auto typeInst = workItem->mType->ToTypeInstance(); BfTypeInstance* typeInst = workItem->mType->ToTypeInstance();
if ((workItem->mType->IsDeleting()) || if ((workItem->mType->IsDeleting()) ||
(workItem->mType->mRebuildFlags & BfTypeRebuildFlag_Deleted) || (workItem->mType->mRebuildFlags & BfTypeRebuildFlag_Deleted) ||
@ -2805,6 +2830,7 @@ void BfContext::RemoveInvalidWorkItems()
DoRemoveInvalidWorkItems<BfTypeProcessRequest>(this, mPopulateTypeWorkList, false); DoRemoveInvalidWorkItems<BfTypeProcessRequest>(this, mPopulateTypeWorkList, false);
DoRemoveInvalidWorkItems<BfMethodSpecializationRequest>(this, mMethodSpecializationWorkList, false/*true*/); DoRemoveInvalidWorkItems<BfMethodSpecializationRequest>(this, mMethodSpecializationWorkList, false/*true*/);
DoRemoveInvalidWorkItems<BfTypeRefVerifyRequest>(this, mTypeRefVerifyWorkList, false);
#ifdef _DEBUG #ifdef _DEBUG
for (auto& workItem : mMethodWorkList) for (auto& workItem : mMethodWorkList)

8
IDEHelper/Compiler/BfContext.h
View file

@ -106,6 +106,13 @@ public:
} }
}; };
class BfTypeRefVerifyRequest : public BfWorkListEntry
{
public:
BfTypeInstance* mCurTypeInstance;
BfAstNode* mRefNode;
};
struct BfStringPoolEntry struct BfStringPoolEntry
{ {
String mString; String mString;
@ -384,6 +391,7 @@ public:
WorkQueue<BfInlineMethodRequest> mInlineMethodWorkList; WorkQueue<BfInlineMethodRequest> mInlineMethodWorkList;
WorkQueue<BfTypeProcessRequest> mPopulateTypeWorkList; WorkQueue<BfTypeProcessRequest> mPopulateTypeWorkList;
WorkQueue<BfMethodSpecializationRequest> mMethodSpecializationWorkList; WorkQueue<BfMethodSpecializationRequest> mMethodSpecializationWorkList;
WorkQueue<BfTypeRefVerifyRequest> mTypeRefVerifyWorkList;
PtrWorkQueue<BfModule*> mFinishedSlotAwaitModuleWorkList; PtrWorkQueue<BfModule*> mFinishedSlotAwaitModuleWorkList;
PtrWorkQueue<BfModule*> mFinishedModuleWorkList; PtrWorkQueue<BfModule*> mFinishedModuleWorkList;

16
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -8669,8 +8669,20 @@ BfType* BfModule::ResolveTypeResult(BfTypeReference* typeRef, BfType* resolvedTy
if (typeInstance != NULL) if (typeInstance != NULL)
{ {
if ((typeInstance->mCustomAttributes != NULL) && (!typeRef->IsTemporary())) if ((!typeRef->IsTemporary()) && ((resolveFlags & BfResolveTypeRefFlag_FromIndirectSource) == 0))
CheckErrorAttributes(typeInstance, NULL, typeInstance->mCustomAttributes, typeRef); {
if (typeInstance->mCustomAttributes != NULL)
CheckErrorAttributes(typeInstance, NULL, typeInstance->mCustomAttributes, typeRef);
else if ((typeInstance->mTypeDef->mTypeDeclaration != NULL) && (typeInstance->mTypeDef->mTypeDeclaration->mAttributes != NULL))
{
auto typeRefVerifyRequest = mContext->mTypeRefVerifyWorkList.Alloc();
typeRefVerifyRequest->mCurTypeInstance = mCurTypeInstance;
typeRefVerifyRequest->mRefNode = typeRef;
typeRefVerifyRequest->mType = typeInstance;
typeRefVerifyRequest->mFromModule = this;
typeRefVerifyRequest->mFromModuleRevision = mRevision;
}
}
if (typeInstance->IsTuple()) if (typeInstance->IsTuple())
{ {