Skip to content

clrinterp: Add missing must-expand intrinsics #103326

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 11 commits into from
Jun 14, 2024
Merged

clrinterp: Add missing must-expand intrinsics #103326

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f7a172a
clrinterp: add IsReferenceOrContainsReferences intrinsic
EgorBo Jun 12, 2024
fd15cdf
fix nre
EgorBo Jun 12, 2024
c5c0eb1
Add missing intrinsics
EgorBo Jun 12, 2024
83f5514
Fix byref structs in IsReferenceOrContainsReferences
EgorBo Jun 12, 2024
b1369d6
oops
EgorBo Jun 12, 2024
79791ee
disable TLS opt
EgorBo Jun 12, 2024
cf18e07
Address feedback
EgorBo Jun 12, 2024
f35e849
Address feedback
EgorBo Jun 13, 2024
4083c1a
Merge branch 'main' into fix-IsReferenceOrContainsReferences-interp
EgorBo Jun 13, 2024
f8b86c3
disable TLS opt for interp
EgorBo Jun 13, 2024
76b35a0
Merge branch 'main' of github.com:dotnet/runtime into fix-IsReference…
EgorBo Jun 14, 2024
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
27 changes: 27 additions & 0 deletions src/coreclr/vm/interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9264,6 +9264,23 @@ void Interpreter::DoCallWork(bool virtualCall, void* thisArg, CORINFO_RESOLVED_T
m_curStackHt++; didIntrinsic = true;
break;
#endif // INTERP_ILSTUBS

case NI_System_Runtime_CompilerServices_RuntimeHelpers_IsReferenceOrContainsReferences:
{
CORINFO_SIG_INFO sigInfoFull;
{
GCX_PREEMP();
m_interpCeeInfo.getMethodSig(CORINFO_METHOD_HANDLE(methToCall), &sigInfoFull, nullptr);
}

MethodTable* typeArg = GetMethodTableFromClsHnd(sigInfoFull.sigInst.methInst[0]);
OpStackSet<BOOL>(m_curStackHt, typeArg->ContainsPointers());
OpStackTypeSet(m_curStackHt, InterpreterType(CORINFO_TYPE_INT));
m_curStackHt++;
didIntrinsic = true;
}
break;

default:
#if INTERP_TRACING
InterlockedIncrement(&s_totalInterpCallsToIntrinsicsUnhandled);
Expand Down Expand Up @@ -11762,6 +11779,16 @@ Interpreter::InterpreterNamedIntrinsics Interpreter::getNamedIntrinsicID(CEEInfo
}
}
}
else if (strcmp(namespaceName, "CompilerServices") == 0)
{
if (strcmp(className, "RuntimeHelpers") == 0)
{
if (strcmp(methodName, "IsReferenceOrContainsReferences") == 0)
{
result = NI_System_Runtime_CompilerServices_RuntimeHelpers_IsReferenceOrContainsReferences;
}
}
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/vm/interpreter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,7 @@ class Interpreter
NI_Illegal = 0,
NI_System_StubHelpers_GetStubContext,
NI_System_Runtime_InteropService_MemoryMarshal_GetArrayDataReference,
NI_System_Runtime_CompilerServices_RuntimeHelpers_IsReferenceOrContainsReferences,
};
static InterpreterNamedIntrinsics getNamedIntrinsicID(CEEInfo* info, CORINFO_METHOD_HANDLE methodHnd);
static const char* getMethodName(CEEInfo* info, CORINFO_METHOD_HANDLE hnd, const char** className, const char** namespaceName = NULL, const char **enclosingClassName = NULL);
Expand Down