From 0b17de659022f8478cca92487f3eaf5dddcfad22 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 28 Nov 2019 21:49:16 +0100 Subject: [PATCH] Port CoreRT bugfix in marshalling to crossgen2 (#384) Ports dotnet/corert#7892. --- src/coreclr/src/tools/Common/TypeSystem/Interop/IL/Marshaller.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/src/tools/Common/TypeSystem/Interop/IL/Marshaller.cs b/src/coreclr/src/tools/Common/TypeSystem/Interop/IL/Marshaller.cs index 18c2d2c..7199afb 100644 --- a/src/coreclr/src/tools/Common/TypeSystem/Interop/IL/Marshaller.cs +++ b/src/coreclr/src/tools/Common/TypeSystem/Interop/IL/Marshaller.cs @@ -1434,7 +1434,7 @@ namespace Internal.TypeSystem.Interop Context.GetHelperEntryPoint("InteropHelpers", "CoTaskMemFree"))); } - protected override void AllocAndTransformManagedToNative(ILCodeStream codeStream) + protected override void TransformManagedToNative(ILCodeStream codeStream) { ILEmitter emitter = _ilCodeStreams.Emitter; @@ -1529,7 +1529,7 @@ namespace Internal.TypeSystem.Interop Context.GetHelperEntryPoint("InteropHelpers", "CoTaskMemFree"))); } - protected override void AllocAndTransformManagedToNative(ILCodeStream codeStream) + protected override void TransformManagedToNative(ILCodeStream codeStream) { ILEmitter emitter = _ilCodeStreams.Emitter; @@ -1616,7 +1616,7 @@ namespace Internal.TypeSystem.Interop Context.GetHelperEntryPoint("InteropHelpers", "CoTaskMemFree"))); } - protected override void AllocAndTransformManagedToNative(ILCodeStream codeStream) + protected override void TransformManagedToNative(ILCodeStream codeStream) { ILEmitter emitter = _ilCodeStreams.Emitter; -- 2.7.4