Skip to content

Convert stream override checks to QCall #107117

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 4 commits into from
Aug 29, 2024
Merged

Convert stream override checks to QCall #107117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddd03fe
Convert stream override checks to QCalls and reduce
AaronRobinsonMSFT Aug 28, 2024
dddb619
Merge remote-tracking branch 'upstream/main' into hmf_stream_override…
AaronRobinsonMSFT Aug 29, 2024
cb49e6a
Feedback.
AaronRobinsonMSFT Aug 29, 2024
76ee421
Feedback
AaronRobinsonMSFT Aug 29, 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
Prev Previous commit
Feedback
  • Loading branch information
@AaronRobinsonMSFT
AaronRobinsonMSFT committed Aug 29, 2024
commit 76ee421a02c8002ca28134d1598b3032c11b362d
2 changes: 1 addition & 1 deletion src/coreclr/System.Private.CoreLib/src/System/IO/Stream.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace System.IO
{
public abstract unsafe partial class Stream
{
[LibraryImport(RuntimeHelpers.QCall, EntryPoint = "StreamNative_HasOverriddenSlow")]
[LibraryImport(RuntimeHelpers.QCall, EntryPoint = "Stream_HasOverriddenSlow")]
[return: MarshalAs(UnmanagedType.Bool)]
private static partial bool HasOverriddenSlow(MethodTable* pMT, [MarshalAs(UnmanagedType.Bool)] bool isRead);

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/comutilnative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1894,7 +1894,7 @@ static bool HasOverriddenStreamMethod(MethodTable* streamMT, MethodTable* pMT, W
return MethodTable::GetMethodDescForSlotAddress(actual) != MethodTable::GetMethodDescForSlotAddress(base);
}

extern "C" BOOL QCALLTYPE StreamNative_HasOverriddenSlow(MethodTable* pMT, BOOL isRead)
extern "C" BOOL QCALLTYPE Stream_HasOverriddenSlow(MethodTable* pMT, BOOL isRead)
{
QCALL_CONTRACT;
_ASSERTE(pMT != NULL);
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/comutilnative.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,6 @@ extern "C" INT32 QCALLTYPE ValueType_GetHashCodeStrategy(MethodTable* mt, QCall:

BOOL CanCompareBitsOrUseFastGetHashCode(MethodTable* mt);

extern "C" BOOL QCALLTYPE StreamNative_HasOverriddenSlow(MethodTable* pMT, BOOL isRead);
extern "C" BOOL QCALLTYPE Stream_HasOverriddenSlow(MethodTable* pMT, BOOL isRead);

#endif // _COMUTILNATIVE_H_
2 changes: 1 addition & 1 deletion src/coreclr/vm/qcallentrypoints.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static const Entry s_QCall[] =
DllImportEntry(MethodTable_CanCompareBitsOrUseFastGetHashCode)
DllImportEntry(TypeHandle_CanCastTo_NoCacheLookup)
DllImportEntry(ValueType_GetHashCodeStrategy)
DllImportEntry(StreamNative_HasOverriddenSlow)
DllImportEntry(Stream_HasOverriddenSlow)
DllImportEntry(RuntimeTypeHandle_MakePointer)
DllImportEntry(RuntimeTypeHandle_MakeByRef)
DllImportEntry(RuntimeTypeHandle_MakeSZArray)
Expand Down