Skip to content

Fix TestGenericAddStaticField #89145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 21, 2023
Merged

Fix TestGenericAddStaticField #89145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
282cb94
Fix TestGenericAddStaticField
mikelle-rogers Jul 18, 2023
bae414f
remove commented code and PTR_FieldDesc
mikelle-rogers Jul 19, 2023
7850798
use the correct Method Table to gather fields
mikelle-rogers Jul 21, 2023
65f27c5
removing code
mikelle-rogers Jul 21, 2023
7f73a6f
whitespace
mikelle-rogers Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/coreclr/vm/memberload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,16 +367,24 @@ void MemberLoader::GetDescFromMemberRef(ModuleBase * pModule,
{
//
// <NICE> this is duplicated logic GetFieldDescByIndex </NICE>
//
INDEBUG(mdFieldDef token = pFD->GetMemberDef();)
//

DWORD pos = static_cast<DWORD>(pFD - (pMT->GetApproxFieldDescListRaw() + pMT->GetNumIntroducedInstanceFields()));
_ASSERTE(pos >= 0 && pos < pMT->GetNumStaticFields());
INDEBUG(mdFieldDef token = pFD->GetMemberDef();)

pFD = pMT->GetGenericsStaticFieldDescs() + pos;
_ASSERTE(pFD->GetMemberDef() == token);
_ASSERTE(!pFD->IsSharedByGenericInstantiations());
_ASSERTE(pFD->GetEnclosingMethodTable() == pMT);
DWORD pos = static_cast<DWORD>(pFD - (pMT->GetApproxFieldDescListRaw() + pMT->GetNumStaticFields()));
if(!(pos >= 0 && pos < pMT->GetNumStaticFields()))
{
DWORD fdIndex = pMT->GetIndexForFieldDesc(pFD);
PTR_FieldDesc pFD = pMT->GetFieldDescByIndex(fdIndex);
}
else
{
_ASSERTE(pos >= 0 && pos < pMT->GetNumStaticFields());
pFD = pMT->GetGenericsStaticFieldDescs() + pos;
_ASSERTE(pFD->GetMemberDef() == token);
_ASSERTE(!pFD->IsSharedByGenericInstantiations());
_ASSERTE(pFD->GetEnclosingMethodTable() == pMT);
}
}

*ppFD = pFD;
Expand Down Expand Up @@ -562,6 +570,7 @@ FieldDesc * MemberLoader::GetFieldDescFromMemberRefAndType(ModuleBase * pModule,
INDEBUG(mdFieldDef token = pFD->GetMemberDef();)

DWORD pos = static_cast<DWORD>(pFD - (pMT->GetApproxFieldDescListRaw() + pMT->GetNumIntroducedInstanceFields()));
LOG((LF_CORDB, LL_INFO1000, "Nope We are right here\n"));
_ASSERTE(pos >= 0 && pos < pMT->GetNumStaticFields());

pFD = pMT->GetGenericsStaticFieldDescs() + pos;
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ public static void TestReflectionAddNewMethod()
});
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/87574", TestRuntimes.CoreCLR)]
//[ActiveIssue("https://github.com/dotnet/runtime/issues/87574", TestRuntimes.CoreCLR)]
[ConditionalFact(typeof(ApplyUpdateUtil), nameof(ApplyUpdateUtil.IsSupported))]
public static void TestGenericAddStaticField()
{
Expand Down