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

Perform SetGenericDependencies on identity pop, fix nested emit loc

Browse source
This commit is contained in:
Brian Fiete 2022-05-13 11:43:05 -07:00
parent 29446404b6
commit c5b479eb99
1 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -792,6 +792,10 @@ void BfModule::InitType(BfType* resolvedTypeRef, BfPopulateType populateType)
BF_ASSERT(!genericArg->IsVar()); BF_ASSERT(!genericArg->IsVar());
#endif #endif
// We need to add generic dependencies here because when we are just doing an Identity population there may be
// on-demand types that could get deleted before initializing the type
DoPopulateType_SetGenericDependencies(genericTypeInstance);
// Do it here so the location we attempted to specialize this type will throw the failure if there is one // Do it here so the location we attempted to specialize this type will throw the failure if there is one
if (!InitGenericParams(resolvedTypeRef)) if (!InitGenericParams(resolvedTypeRef))
return; return;
@ -2103,8 +2107,7 @@ BfCEParseContext BfModule::CEEmitParse(BfTypeInstance* typeInstance, BfTypeDef*
BfParser* emitParser = NULL; BfParser* emitParser = NULL;
int64 emitSourceMapKey = ((int64)declaringType->mPartialIdx << 32) | refNode->mSrcStart; int64 emitSourceMapKey = ((int64)declaringType->mPartialIdx << 32) | refNode->mSrcStart;
if (typeInstance->mCeTypeInfo == NULL) if (typeInstance->mCeTypeInfo == NULL)
typeInstance->mCeTypeInfo = new BfCeTypeInfo(); typeInstance->mCeTypeInfo = new BfCeTypeInfo();
auto ceTypeInfo = typeInstance->mCeTypeInfo; auto ceTypeInfo = typeInstance->mCeTypeInfo;
@ -2117,6 +2120,22 @@ BfCEParseContext BfModule::CEEmitParse(BfTypeInstance* typeInstance, BfTypeDef*
} }
else else
{ {
auto refParser = refNode->GetParser();
if ((refParser != NULL) && (refParser->mIsEmitted))
{
// Default to type declaration
emitSourceMapKey = mCurTypeInstance->mTypeDef->GetRefNode()->mSrcStart;
for (auto& kv : ceTypeInfo->mEmitSourceMap)
{
if ((refNode->mSrcStart >= kv.mValue.mSrcStart) && (refNode->mSrcStart < kv.mValue.mSrcEnd))
{
// We found the initial emit source
emitSourceMapKey = kv.mKey;
break;
}
}
}
if (ceTypeInfo->mEmitSourceMap.TryAdd(emitSourceMapKey, NULL, &ceEmitSource)) if (ceTypeInfo->mEmitSourceMap.TryAdd(emitSourceMapKey, NULL, &ceEmitSource))
{ {
if (typeInstance->IsSpecializedType()) if (typeInstance->IsSpecializedType())
@ -3140,11 +3159,6 @@ void BfModule::DoPopulateType_InitSearches(BfTypeInstance* typeInstance)
{ {
auto typeDef = typeInstance->mTypeDef; auto typeDef = typeInstance->mTypeDef;
if (typeInstance->IsGenericTypeInstance())
{
DoPopulateType_SetGenericDependencies(typeInstance);
}
auto _AddStaticSearch = [&](BfTypeDef* typeDef) auto _AddStaticSearch = [&](BfTypeDef* typeDef)
{ {
if (!typeDef->mStaticSearch.IsEmpty()) if (!typeDef->mStaticSearch.IsEmpty())