From 41dfe19d1ffe00edfdaa837a3b46aea5a8036617 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 8 Jan 2019 14:50:42 -0800 Subject: Extract cleanup changes from #21793. (#21852) * Cleanup changes from #21793. * Emit the data pointer offset directly into the IL stream (and calculate it as needed instead of passing it through) * Fix broken assumption that OverrideProcArgs::na::m_pMT is the array type instead of the element type (which it was). --- src/vm/mlinfo.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/vm/mlinfo.h') diff --git a/src/vm/mlinfo.h b/src/vm/mlinfo.h index b31e34f138..0ac146c3b7 100644 --- a/src/vm/mlinfo.h +++ b/src/vm/mlinfo.h @@ -83,8 +83,6 @@ struct OverrideProcArgs struct { VARTYPE m_vt; - UINT16 m_optionalbaseoffset; //for fast marshaling, offset of dataptr if known and less than 64k (0 otherwise) - MethodTable* m_pMT; #ifdef FEATURE_COMINTEROP SIZE_T m_cbElementSize; WinMDAdapter::RedirectedTypeIndex m_redirectedTypeIndex; @@ -470,8 +468,7 @@ public: VOID EmitOrThrowInteropParamException(NDirectStubLinker* psl, BOOL fMngToNative, UINT resID, UINT paramIdx); // These methods retrieve the information for different element types. - HRESULT HandleArrayElemType(NativeTypeParamInfo *pParamInfo, - UINT16 optbaseoffset, + HRESULT HandleArrayElemType(NativeTypeParamInfo *pParamInfo, TypeHandle elemTypeHnd, int iRank, BOOL fNoLowerBounds, -- cgit v1.2.3