From 8015642f728eac33224d1bcd9999cc084713e1e7 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Fri, 14 Apr 2017 02:23:48 +0900 Subject: [PATCH] [x86/Linux] Use appropriate FCALL macro for SafeBuffer methods (dotnet/coreclr#10935) Commit migrated from https://github.com/dotnet/coreclr/commit/92e90a145fd8a9c87e3d909037d734a19ff2bc1b --- src/coreclr/src/vm/object.h | 4 ++-- src/coreclr/src/vm/safehandle.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/coreclr/src/vm/object.h b/src/coreclr/src/vm/object.h index fad5f74..89019d3 100644 --- a/src/coreclr/src/vm/object.h +++ b/src/coreclr/src/vm/object.h @@ -3012,8 +3012,8 @@ class SafeBuffer : SafeHandle public: static FCDECL1(UINT, SizeOfType, ReflectClassBaseObject* typeUNSAFE); static FCDECL1(UINT, AlignedSizeOfType, ReflectClassBaseObject* typeUNSAFE); - static FCDECL3(void, PtrToStructure, BYTE* ptr, FC_TypedByRef structure, UINT32 sizeofT); - static FCDECL3(void, StructureToPtr, FC_TypedByRef structure, BYTE* ptr, UINT32 sizeofT); + static FCDECL3_IVI(void, PtrToStructure, BYTE* ptr, FC_TypedByRef structure, UINT32 sizeofT); + static FCDECL3_VII(void, StructureToPtr, FC_TypedByRef structure, BYTE* ptr, UINT32 sizeofT); }; #ifdef USE_CHECKED_OBJECTREFS diff --git a/src/coreclr/src/vm/safehandle.cpp b/src/coreclr/src/vm/safehandle.cpp index 828b221..d79c5a7 100644 --- a/src/coreclr/src/vm/safehandle.cpp +++ b/src/coreclr/src/vm/safehandle.cpp @@ -483,7 +483,7 @@ FCIMPL1(UINT, SafeBuffer::AlignedSizeOfType, ReflectClassBaseObject* typeUNSAFE) } FCIMPLEND -FCIMPL3(void, SafeBuffer::PtrToStructure, BYTE* ptr, FC_TypedByRef structure, UINT32 sizeofT) +FCIMPL3_IVI(void, SafeBuffer::PtrToStructure, BYTE* ptr, FC_TypedByRef structure, UINT32 sizeofT) { FCALL_CONTRACT; @@ -494,7 +494,7 @@ FCIMPL3(void, SafeBuffer::PtrToStructure, BYTE* ptr, FC_TypedByRef structure, UI } FCIMPLEND -FCIMPL3(void, SafeBuffer::StructureToPtr, FC_TypedByRef structure, BYTE* ptr, UINT32 sizeofT) +FCIMPL3_VII(void, SafeBuffer::StructureToPtr, FC_TypedByRef structure, BYTE* ptr, UINT32 sizeofT) { FCALL_CONTRACT; -- 2.7.4