Skip to content

Commit f37f0b9

Browse files
gbalykovgbalykov
authored
Fix Linux x86 build (#50836)
1 parent 5221db9 commit f37f0b9

File tree

22 files changed

+74
-42
lines changed

22 files changed

+74
-42
lines changed

‎src/coreclr/ToolBox/superpmi/superpmi-shim-collector/superpmi-shim-collector.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ extern "C"
130130
return TRUE;
131131
}
132132

133-
extern "C" DLLEXPORT void __stdcall jitStartup(ICorJitHost* host)
133+
extern "C" DLLEXPORT void jitStartup(ICorJitHost* host)
134134
{
135135
// crossgen2 doesn't invoke DllMain on Linux/Mac (under PAL), so optionally do initialization work here.
136136
InitializeShim();
@@ -157,7 +157,7 @@ extern "C" DLLEXPORT void __stdcall jitStartup(ICorJitHost* host)
157157
pnjitStartup(g_ourJitHost);
158158
}
159159

160-
extern "C" DLLEXPORT ICorJitCompiler* __stdcall getJit()
160+
extern "C" DLLEXPORT ICorJitCompiler* getJit()
161161
{
162162
DWORD dwRetVal = 0;
163163
PgetJit pngetJit;

‎src/coreclr/ToolBox/superpmi/superpmi-shim-counter/superpmi-shim-counter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ extern "C"
108108
return TRUE;
109109
}
110110

111-
extern "C" DLLEXPORT void __stdcall jitStartup(ICorJitHost* host)
111+
extern "C" DLLEXPORT void jitStartup(ICorJitHost* host)
112112
{
113113
SetDefaultPaths();
114114
SetLibName();
@@ -141,7 +141,7 @@ extern "C" DLLEXPORT void __stdcall jitStartup(ICorJitHost* host)
141141
pnjitStartup(g_ourJitHost);
142142
}
143143

144-
extern "C" DLLEXPORT ICorJitCompiler* __stdcall getJit()
144+
extern "C" DLLEXPORT ICorJitCompiler* getJit()
145145
{
146146
DWORD dwRetVal = 0;
147147
PgetJit pngetJit;

‎src/coreclr/ToolBox/superpmi/superpmi-shim-simple/superpmi-shim-simple.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ extern "C"
9393
return TRUE;
9494
}
9595

96-
extern "C" DLLEXPORT void __stdcall jitStartup(ICorJitHost* host)
96+
extern "C" DLLEXPORT void jitStartup(ICorJitHost* host)
9797
{
9898
SetDefaultPaths();
9999
SetLibName();
@@ -117,7 +117,7 @@ extern "C" DLLEXPORT void __stdcall jitStartup(ICorJitHost* host)
117117
pnjitStartup(g_ourJitHost);
118118
}
119119

120-
extern "C" DLLEXPORT ICorJitCompiler* __stdcall getJit()
120+
extern "C" DLLEXPORT ICorJitCompiler* getJit()
121121
{
122122
DWORD dwRetVal = 0;
123123
PgetJit pngetJit;

‎src/coreclr/clrdefinitions.cmake

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,14 @@ if(CLR_CMAKE_HOST_WIN32)
5757
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
5858
endif(CLR_CMAKE_HOST_WIN32)
5959

60-
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:EnC_SUPPORTED>)
61-
if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386)
60+
if (NOT (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_UNIX))
61+
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:EnC_SUPPORTED>)
62+
endif()
63+
if(CLR_CMAKE_TARGET_ARCH_AMD64 OR (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_WIN32))
6264
if(CLR_CMAKE_TARGET_WIN32)
6365
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_ENC_SUPPORTED>)
6466
endif(CLR_CMAKE_TARGET_WIN32)
65-
endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386)
67+
endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_WIN32))
6668

6769
# Features - please keep them alphabetically sorted
6870
if(CLR_CMAKE_TARGET_WIN32)

‎src/coreclr/debug/ee/funceval.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@ static void GCProtectAllPassedArgs(DebuggerEval *pDE,
16351635
#endif
16361636
}
16371637
#endif // TARGET_X86
1638-
1638+
FALLTHROUGH;
16391639
default:
16401640
//
16411641
// Ignorable - no need to protect

‎src/coreclr/debug/ee/i386/x86walker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ void NativeWalker::DecodeInstructionForPatchSkip(const BYTE *address, Instructio
415415
case 2:
416416
case 3:
417417
pInstrAttrib->m_fIsCall = true;
418-
// fall through
418+
FALLTHROUGH;
419419
case 4:
420420
case 5:
421421
pInstrAttrib->m_fIsAbsBranch = true;

‎src/coreclr/gc/unix/gcenv.unix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ static size_t GetLogicalProcessorCacheSizeFromOS()
884884
cacheSize = std::max(cacheSize, ( size_t) sysconf(_SC_LEVEL4_CACHE_SIZE));
885885
#endif
886886

887-
#if defined(TARGET_LINUX) && !defined(HOST_ARM)
887+
#if defined(TARGET_LINUX) && !defined(HOST_ARM) && !defined(HOST_X86)
888888
if (cacheSize == 0)
889889
{
890890
//

‎src/coreclr/gcinfo/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,7 @@ create_gcinfo_lib(TARGET gcinfo_unix_armel OS unix ARCH armel)
8282
create_gcinfo_lib(TARGET gcinfo_unix_arm OS unix ARCH arm)
8383
create_gcinfo_lib(TARGET gcinfo_win_arm OS win ARCH arm)
8484
create_gcinfo_lib(TARGET gcinfo_win_x86 OS win ARCH x86)
85+
86+
if (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_UNIX)
87+
create_gcinfo_lib(TARGET gcinfo_unix_x86 OS unix ARCH x86)
88+
endif (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_UNIX)

‎src/coreclr/jit/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,10 @@ target_compile_definitions(clrjit_unix_arm_${ARCH_HOST_NAME} PRIVATE ARM_SOFTFP
516516
create_standalone_jit(TARGET clrjit_win_arm_${ARCH_HOST_NAME} OS win ARCH arm DESTINATIONS .)
517517
create_standalone_jit(TARGET clrjit_win_x86_${ARCH_HOST_NAME} OS win ARCH x86 DESTINATIONS .)
518518

519+
if (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_UNIX)
520+
create_standalone_jit(TARGET clrjit_unix_x86_${ARCH_HOST_NAME} OS unix ARCH x86 DESTINATIONS .)
521+
endif (CLR_CMAKE_TARGET_ARCH_I386 AND CLR_CMAKE_TARGET_UNIX)
522+
519523
if (CLR_CMAKE_TARGET_UNIX)
520524
if (NOT ARCH_TARGET_NAME STREQUAL s390x)
521525
install_clr(TARGETS clrjit_unix_${ARCH_TARGET_NAME}_${ARCH_HOST_NAME} DESTINATIONS . COMPONENT jit)

‎src/coreclr/md/inc/VerifyLayouts.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@ FIELD(CLiteWeightStgdbRW, m_wszFileName, sizeof(void*))
156156
FIELD(CLiteWeightStgdbRW, m_dwDatabaseLFT, 4)
157157
FIELD(CLiteWeightStgdbRW, m_dwDatabaseLFS, 4)
158158
FIELD(CLiteWeightStgdbRW, m_pStgIO, sizeof(void*))
159+
#ifdef FEATURE_METADATA_EMIT_PORTABLE_PDB
160+
FIELD(CLiteWeightStgdbRW, m_pPdbHeap, sizeof(void*))
161+
#endif
159162
END_TYPE(CLiteWeightStgdbRW, 8)
160163

161164
USING_ALIAS(CLiteWeightStgdb__CMiniMdRW__, CLiteWeightStgdb<CMiniMdRW>)

‎src/coreclr/md/inc/metamodel.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@ class CMiniMdBase : public IMetaModelCommonRO
594594

595595

596596
protected:
597+
DAC_ALIGNAS(8)
597598
CMiniMdSchema m_Schema; // data header.
598599
ULONG m_TblCount; // Tables in this database.
599600
BOOL m_fVerifiedByTrustedSource; // whether the data was verified by a trusted source

‎src/coreclr/pal/src/misc/sysinfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ PAL_GetLogicalProcessorCacheSizeFromOS()
558558
cacheSize = std::max(cacheSize, (size_t)sysconf(_SC_LEVEL4_CACHE_SIZE));
559559
#endif
560560

561-
#if defined(TARGET_LINUX) && !defined(HOST_ARM)
561+
#if defined(TARGET_LINUX) && !defined(HOST_ARM) && !defined(HOST_X86)
562562
if (cacheSize == 0)
563563
{
564564
//

‎src/coreclr/vm/callingconvention.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,11 +423,12 @@ class ArgIteratorTemplate : public ARGITERATOR_BASE
423423
//@todo: Is it more apropos to call LookupApproxFieldTypeHandle() here?
424424
TypeHandle fldHnd = pFD->GetApproxFieldTypeHandleThrowing();
425425
CONSISTENCY_CHECK(!fldHnd.IsNull());
426-
pMT = fldHnd.GetMethodTable();
426+
pMT = fldHnd.GetMethodTable();
427+
FALLTHROUGH;
427428
}
428-
case ELEMENT_TYPE_PTR:
429-
case ELEMENT_TYPE_I:
430-
case ELEMENT_TYPE_U:
429+
case ELEMENT_TYPE_PTR:
430+
case ELEMENT_TYPE_I:
431+
case ELEMENT_TYPE_U:
431432
case ELEMENT_TYPE_I4:
432433
case ELEMENT_TYPE_U4:
433434
{

‎src/coreclr/vm/codeman.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,8 +1718,8 @@ static void LoadAndInitializeJIT(LPCWSTR pwzJitName, OUT HINSTANCE* phJit, OUT I
17181718
}
17191719

17201720
#ifdef FEATURE_MERGE_JIT_AND_ENGINE
1721-
EXTERN_C void __stdcall jitStartup(ICorJitHost* host);
1722-
EXTERN_C ICorJitCompiler* __stdcall getJit();
1721+
EXTERN_C void jitStartup(ICorJitHost* host);
1722+
EXTERN_C ICorJitCompiler* getJit();
17231723
#endif // FEATURE_MERGE_JIT_AND_ENGINE
17241724

17251725
BOOL EEJitManager::LoadJIT()

‎src/coreclr/vm/common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ inline void ClrRestoreNonvolatileContext(PCONTEXT ContextRecord)
367367
#include "pefile.inl"
368368
#include "excep.h"
369369
#include "method.hpp"
370+
#include "field.h"
370371
#include "callingconvention.h"
371372
#include "frames.h"
372373
#include "qcall.h"

‎src/coreclr/vm/crossgencompile.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@ void CrawlFrame::GetExactGenericInstantiations(Instantiation *pClassInst, Instan
271271
UNREACHABLE();
272272
}
273273

274+
void SetObjectReferenceUnchecked(OBJECTREF *dst,OBJECTREF ref)
275+
{
276+
UNREACHABLE();
277+
}
278+
274279
BOOL Object::SupportsInterface(OBJECTREF pObj, MethodTable* pInterfaceMT)
275280
{
276281
UNREACHABLE();

‎src/coreclr/vm/exceptionhandling.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,7 @@ lExit: ;
12191219
invalidRevPInvoke = gcInfoDecoder.GetReversePInvokeFrameStackSlot() != NO_REVERSE_PINVOKE_FRAME;
12201220
#else // USE_GC_INFO_DECODER
12211221
hdrInfo gcHdrInfo;
1222-
DecodeGCHdrInfo(gcInfoToken, 0, &gcHdrInfo);
1222+
DecodeGCHdrInfo(codeInfo.GetGCInfoToken(), 0, &gcHdrInfo);
12231223
invalidRevPInvoke = gcHdrInfo.revPInvokeOffset != INVALID_REV_PINVOKE_OFFSET;
12241224
#endif // USE_GC_INFO_DECODER
12251225

@@ -4640,7 +4640,7 @@ VOID DECLSPEC_NORETURN UnwindManagedExceptionPass1(PAL_SEHException& ex, CONTEXT
46404640
invalidRevPInvoke = gcInfoDecoder.GetReversePInvokeFrameStackSlot() != NO_REVERSE_PINVOKE_FRAME;
46414641
#else // USE_GC_INFO_DECODER
46424642
hdrInfo gcHdrInfo;
4643-
DecodeGCHdrInfo(gcInfoToken, 0, &gcHdrInfo);
4643+
DecodeGCHdrInfo(codeInfo.GetGCInfoToken(), 0, &gcHdrInfo);
46444644
invalidRevPInvoke = gcHdrInfo.revPInvokeOffset != INVALID_REV_PINVOKE_OFFSET;
46454645
#endif // USE_GC_INFO_DECODER
46464646

‎src/coreclr/vm/fcall.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,6 +1145,7 @@ struct FCSigCheck {
11451145
#define HCIMPL2_IV(rettype, funcname, a1, a2) rettype F_CALL_CONV funcname(int /* EAX */, int /* EDX */, a1, a2) { HCIMPL_PROLOG(funcname)
11461146
#define HCIMPL2VA(rettype, funcname, a1, a2) rettype F_CALL_VA_CONV funcname(a1, a2, ...) { HCIMPL_PROLOG(funcname)
11471147
#define HCIMPL3(rettype, funcname, a1, a2, a3) rettype F_CALL_CONV funcname(int /* EAX */, a2, a1, a3) { HCIMPL_PROLOG(funcname)
1148+
#define HCIMPL3_RAW(rettype, funcname, a1, a2, a3) rettype F_CALL_CONV funcname(int /* EAX */, a2, a1, a3) {
11481149
#define HCIMPL4(rettype, funcname, a1, a2, a3, a4) rettype F_CALL_CONV funcname(int /* EAX */, a2, a1, a4, a3) { HCIMPL_PROLOG(funcname)
11491150
#define HCIMPL5(rettype, funcname, a1, a2, a3, a4, a5) rettype F_CALL_CONV funcname(int /* EAX */, a2, a1, a5, a4, a3) { HCIMPL_PROLOG(funcname)
11501151

@@ -1169,6 +1170,7 @@ struct FCSigCheck {
11691170
#define HCIMPL2_IV(rettype, funcname, a1, a2) rettype F_CALL_CONV funcname(a1, a2) { HCIMPL_PROLOG(funcname)
11701171
#define HCIMPL2VA(rettype, funcname, a1, a2) rettype F_CALL_VA_CONV funcname(a1, a2, ...) { HCIMPL_PROLOG(funcname)
11711172
#define HCIMPL3(rettype, funcname, a1, a2, a3) rettype F_CALL_CONV funcname(a1, a2, a3) { HCIMPL_PROLOG(funcname)
1173+
#define HCIMPL3_RAW(rettype, funcname, a1, a2, a3) rettype F_CALL_CONV funcname(a1, a2, a3) {
11721174
#define HCIMPL4(rettype, funcname, a1, a2, a3, a4) rettype F_CALL_CONV funcname(a1, a2, a4, a3) { HCIMPL_PROLOG(funcname)
11731175
#define HCIMPL5(rettype, funcname, a1, a2, a3, a4, a5) rettype F_CALL_CONV funcname(a1, a2, a5, a4, a3) { HCIMPL_PROLOG(funcname)
11741176

@@ -1194,6 +1196,7 @@ struct FCSigCheck {
11941196
#define HCIMPL2_IV(rettype, funcname, a1, a2) rettype F_CALL_CONV funcname(a1, a2) { HCIMPL_PROLOG(funcname)
11951197
#define HCIMPL2VA(rettype, funcname, a1, a2) rettype F_CALL_VA_CONV funcname(a1, a2, ...) { HCIMPL_PROLOG(funcname)
11961198
#define HCIMPL3(rettype, funcname, a1, a2, a3) rettype F_CALL_CONV funcname(a1, a2, a3) { HCIMPL_PROLOG(funcname)
1199+
#define HCIMPL3_RAW(rettype, funcname, a1, a2, a3) rettype F_CALL_CONV funcname(a1, a2, a3) {
11971200
#define HCIMPL4(rettype, funcname, a1, a2, a3, a4) rettype F_CALL_CONV funcname(a1, a2, a3, a4) { HCIMPL_PROLOG(funcname)
11981201
#define HCIMPL5(rettype, funcname, a1, a2, a3, a4, a5) rettype F_CALL_CONV funcname(a1, a2, a3, a4, a5) { HCIMPL_PROLOG(funcname)
11991202

‎src/coreclr/vm/field.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,25 @@
1818

1919
#include "peimagelayout.inl"
2020

21+
#ifndef DACCESS_COMPILE
22+
VOID FieldDesc::SetStaticOBJECTREF(OBJECTREF objRef)
23+
{
24+
CONTRACTL
25+
{
26+
THROWS;
27+
GC_TRIGGERS;
28+
MODE_COOPERATIVE;
29+
INJECT_FAULT(COMPlusThrowOM());
30+
}
31+
CONTRACTL_END
32+
33+
GCPROTECT_BEGIN(objRef);
34+
OBJECTREF *pObjRef = (OBJECTREF *)GetCurrentStaticAddress();
35+
SetObjectReference(pObjRef, objRef);
36+
GCPROTECT_END();
37+
}
38+
#endif
39+
2140
// called from code:MethodTableBuilder::InitializeFieldDescs#InitCall
2241
VOID FieldDesc::Init(mdFieldDef mb, CorElementType FieldType, DWORD dwMemberAttrs, BOOL fIsStatic, BOOL fIsRVA, BOOL fIsThreadLocal, LPCSTR pszFieldName)
2342
{

‎src/coreclr/vm/field.h

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -483,22 +483,7 @@ class FieldDesc
483483
return *(OBJECTREF *)GetCurrentStaticAddress();
484484
}
485485

486-
VOID SetStaticOBJECTREF(OBJECTREF objRef)
487-
{
488-
CONTRACTL
489-
{
490-
THROWS;
491-
GC_TRIGGERS;
492-
MODE_COOPERATIVE;
493-
INJECT_FAULT(COMPlusThrowOM());
494-
}
495-
CONTRACTL_END
496-
497-
GCPROTECT_BEGIN(objRef);
498-
OBJECTREF *pObjRef = (OBJECTREF *)GetCurrentStaticAddress();
499-
SetObjectReference(pObjRef, objRef);
500-
GCPROTECT_END();
501-
}
486+
VOID SetStaticOBJECTREF(OBJECTREF objRef);
502487

503488
void* GetStaticValuePtr()
504489
{

‎src/coreclr/vm/jithelpers.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5471,7 +5471,7 @@ NOINLINE static void JIT_ReversePInvokeEnterRare2(ReversePInvokeFrame* frame, vo
54715471
// As a result, we specially decorate this method to have the correct calling convention
54725472
// and argument ordering for an HCALL, but we don't use the HCALL macros and contracts
54735473
// since this method doesn't follow the contracts.
5474-
void F_CALL_CONV HCCALL3(JIT_ReversePInvokeEnterTrackTransitions, ReversePInvokeFrame* frame, CORINFO_METHOD_HANDLE handle, void* secretArg)
5474+
HCIMPL3_RAW(void, JIT_ReversePInvokeEnterTrackTransitions, ReversePInvokeFrame* frame, CORINFO_METHOD_HANDLE handle, void* secretArg)
54755475
{
54765476
_ASSERTE(frame != NULL && handle != NULL);
54775477

@@ -5520,8 +5520,9 @@ void F_CALL_CONV HCCALL3(JIT_ReversePInvokeEnterTrackTransitions, ReversePInvoke
55205520
INSTALL_EXCEPTION_HANDLING_RECORD(&frame->record.m_ExReg);
55215521
#endif
55225522
}
5523+
HCIMPLEND_RAW
55235524

5524-
void F_CALL_CONV HCCALL1(JIT_ReversePInvokeEnter, ReversePInvokeFrame* frame)
5525+
HCIMPL1_RAW(void, JIT_ReversePInvokeEnter, ReversePInvokeFrame* frame)
55255526
{
55265527
_ASSERTE(frame != NULL);
55275528

@@ -5552,8 +5553,9 @@ void F_CALL_CONV HCCALL1(JIT_ReversePInvokeEnter, ReversePInvokeFrame* frame)
55525553
INSTALL_EXCEPTION_HANDLING_RECORD(&frame->record.m_ExReg);
55535554
#endif
55545555
}
5556+
HCIMPLEND_RAW
55555557

5556-
void F_CALL_CONV HCCALL1(JIT_ReversePInvokeExitTrackTransitions, ReversePInvokeFrame* frame)
5558+
HCIMPL1_RAW(void, JIT_ReversePInvokeExitTrackTransitions, ReversePInvokeFrame* frame)
55575559
{
55585560
_ASSERTE(frame != NULL);
55595561
_ASSERTE(frame->currentThread == GetThread());
@@ -5574,8 +5576,9 @@ void F_CALL_CONV HCCALL1(JIT_ReversePInvokeExitTrackTransitions, ReversePInvokeF
55745576
}
55755577
#endif
55765578
}
5579+
HCIMPLEND_RAW
55775580

5578-
void F_CALL_CONV HCCALL1(JIT_ReversePInvokeExit, ReversePInvokeFrame* frame)
5581+
HCIMPL1_RAW(void, JIT_ReversePInvokeExit, ReversePInvokeFrame* frame)
55795582
{
55805583
_ASSERTE(frame != NULL);
55815584
_ASSERTE(frame->currentThread == GetThread());
@@ -5589,6 +5592,7 @@ void F_CALL_CONV HCCALL1(JIT_ReversePInvokeExit, ReversePInvokeFrame* frame)
55895592
UNINSTALL_EXCEPTION_HANDLING_RECORD(&frame->record.m_ExReg);
55905593
#endif
55915594
}
5595+
HCIMPLEND_RAW
55925596

55935597
//========================================================================
55945598
//

‎src/coreclr/vm/jitinterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12526,7 +12526,7 @@ void CEEJitInfo::getEHinfo(
1252612526
#endif // CROSSGEN_COMPILE
1252712527

1252812528
#if defined(CROSSGEN_COMPILE)
12529-
EXTERN_C ICorJitCompiler* __stdcall getJit();
12529+
EXTERN_C ICorJitCompiler* getJit();
1253012530
#endif // defined(CROSSGEN_COMPILE)
1253112531

1253212532
#ifdef FEATURE_INTERPRETER

0 commit comments

Comments
 (0)