Skip to content

Commit

Permalink
unblock inlining of generics with static fields (dotnet#109256)
Browse files Browse the repository at this point in the history
  • Loading branch information
AndyAyersMS authored and mikelle-rogers committed Dec 4, 2024
1 parent 209aa04 commit dfca062
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/coreclr/jit/importer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4047,8 +4047,6 @@ GenTree* Compiler::impImportStaticFieldAddress(CORINFO_RESOLVED_TOKEN* pResolved
{
case CORINFO_FIELD_STATIC_GENERICS_STATIC_HELPER:
{
assert(!compIsForInlining());

// We first call a special helper to get the statics base pointer
op1 = impParentClassTokenToHandle(pResolvedToken);

Expand Down Expand Up @@ -9222,10 +9220,7 @@ void Compiler::impImportBlockCode(BasicBlock* block)
compInlineResult->NoteFatal(InlineObservation::CALLEE_LDFLD_NEEDS_HELPER);
return;

case CORINFO_FIELD_STATIC_GENERICS_STATIC_HELPER:
case CORINFO_FIELD_STATIC_READYTORUN_HELPER:
/* We may be able to inline the field accessors in specific instantiations of generic
* methods */
compInlineResult->NoteFatal(InlineObservation::CALLSITE_LDFLD_NEEDS_HELPER);
return;

Expand Down

0 comments on commit dfca062

Please sign in to comment.