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

Fixed VerifyTypeLookups from outer types

Browse source
This commit is contained in:
Brian Fiete 2021-02-28 07:14:08 -08:00
parent 4feda1da59
commit c4b7cc58a1
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDEHelper/Compiler/BfContext.cpp
View file

@ -2276,7 +2276,7 @@ void BfContext::VerifyTypeLookups(BfTypeInstance* typeInst)
// so the mNextRevision will be ignored // so the mNextRevision will be ignored
auto useTypeDef = lookupEntry.mUseTypeDef; auto useTypeDef = lookupEntry.mUseTypeDef;
BfTypeDef* ambiguousTypeDef = NULL; BfTypeDef* ambiguousTypeDef = NULL;
BfTypeDef* result = mSystem->FindTypeDef(lookupEntry.mName, lookupEntry.mNumGenericParams, useTypeDef->mProject, useTypeDef->mNamespaceSearch, &ambiguousTypeDef); BfTypeDef* result = typeInst->mModule->FindTypeDefRaw(lookupEntry.mName, lookupEntry.mNumGenericParams, typeInst, useTypeDef, NULL);
if (result != lookupEntryPair.mValue.mTypeDef) if (result != lookupEntryPair.mValue.mTypeDef)
{ {
isDirty = true; isDirty = true;

3
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -2553,6 +2553,9 @@ void BfModule::DoPopulateType_TypeAlias(BfTypeInstance* typeAlias)
void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateType) void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateType)
{ {
if (populateType == BfPopulateType_Identity)
return;
auto typeInstance = resolvedTypeRef->ToTypeInstance(); auto typeInstance = resolvedTypeRef->ToTypeInstance();
auto typeDef = typeInstance->mTypeDef; auto typeDef = typeInstance->mTypeDef;