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

Fixed false circular data ref with self-refing field function typeref

Browse source
This commit is contained in:
Brian Fiete 2020-09-10 10:42:32 -07:00
parent c34e6fe66a
commit 947426b384
3 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -6902,15 +6902,13 @@ BfType* BfModule::ResolveTypeResult(BfTypeReference* typeRef, BfType* resolvedTy
}
}
else if (resolvedTypeRef->IsDelegateFromTypeRef() || resolvedTypeRef->IsFunctionFromTypeRef())
{
{
auto delegateInfo = resolvedTypeRef->GetDelegateInfo();
auto invokeMethod = GetDelegateInvokeMethod(resolvedTypeRef->ToTypeInstance());
AddDependency(invokeMethod->mReturnType, mCurTypeInstance, BfDependencyMap::DependencyFlag_TypeReference);
for (auto& param : invokeMethod->mParams)
{
AddDependency(param.mResolvedType, mCurTypeInstance, BfDependencyMap::DependencyFlag_TypeReference);
}
if (delegateInfo->mFunctionThisType != NULL)
AddDependency(delegateInfo->mFunctionThisType, mCurTypeInstance, BfDependencyMap::DependencyFlag_TypeReference);
AddDependency(delegateInfo->mReturnType, mCurTypeInstance, BfDependencyMap::DependencyFlag_TypeReference);
for (auto& param : delegateInfo->mParams)
AddDependency(param, mCurTypeInstance, BfDependencyMap::DependencyFlag_TypeReference);
}
BfTypeInstance* typeInstance = resolvedTypeRef->ToTypeInstance();
@ -8864,7 +8862,7 @@ BfType* BfModule::ResolveTypeRef(BfTypeReference* typeRef, BfPopulateType popula
bool failed = false;
auto returnType = ResolveTypeRef(delegateTypeRef->mReturnType);
auto returnType = ResolveTypeRef(delegateTypeRef->mReturnType, NULL, BfPopulateType_Declaration);
if (returnType == NULL)
returnType = GetPrimitiveType(BfTypeCode_Var);
_CheckType(returnType);