From c499286c5b3d2a19b37c75e69e47e542edfb80ed Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Wed, 29 Mar 2017 12:39:37 +0900 Subject: [PATCH] [x86/Linux] Fix signature mismatch inside InstantiatingStub (dotnet/coreclr#10538) Commit migrated from https://github.com/dotnet/coreclr/commit/a8459520aaf5663e7b97c1b4b42f16859d5e129d --- src/coreclr/src/vm/prestub.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/coreclr/src/vm/prestub.cpp b/src/coreclr/src/vm/prestub.cpp index 1aec797..87b36fa 100644 --- a/src/coreclr/src/vm/prestub.cpp +++ b/src/coreclr/src/vm/prestub.cpp @@ -681,8 +681,10 @@ void CreateInstantiatingILStubTargetSig(MethodDesc *pBaseMD, SigPointer pReturn = msig.GetReturnProps(); pReturn.ConvertToInternalExactlyOne(msig.GetModule(), &typeContext, stubSigBuilder, FALSE); +#ifndef _TARGET_X86_ // The hidden context parameter stubSigBuilder->AppendElementType(ELEMENT_TYPE_I); +#endif // !_TARGET_X86_ // Copy rest of the arguments msig.NextArg(); @@ -692,6 +694,10 @@ void CreateInstantiatingILStubTargetSig(MethodDesc *pBaseMD, pArgs.ConvertToInternalExactlyOne(msig.GetModule(), &typeContext, stubSigBuilder); } +#ifdef _TARGET_X86_ + // The hidden context parameter + stubSigBuilder->AppendElementType(ELEMENT_TYPE_I); +#endif // _TARGET_X86_ } Stub * CreateUnboxingILStubForSharedGenericValueTypeMethods(MethodDesc* pTargetMD) -- 2.7.4