From 0e140be26c141fdd5bbd262e32415b3b8c93a2cb Mon Sep 17 00:00:00 2001 From: Eugene Rozenfeld Date: Fri, 29 Jan 2016 11:56:25 -0800 Subject: [PATCH] Fix for x86 checked build error. Remove FORCEINLINE from GetUnwindDataBlob so that the compiler always emits it in codeman.obj. The code in nidump.cpp (NativeImageDumper::DumpReadyToRunMethod) calls this method so we were getting link errors if GetUnwindDataBlob wasn't emitted in codeman.obj. GetUnwindDataBlob is small enough for a compiler to inline it even without FORCEINLINE. --- src/vm/codeman.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vm/codeman.cpp b/src/vm/codeman.cpp index 1cac3f4..9374a2c 100644 --- a/src/vm/codeman.cpp +++ b/src/vm/codeman.cpp @@ -1126,7 +1126,7 @@ BOOL IJitManager::IsFilterFunclet(EECodeInfo * pCodeInfo) #else // WIN64EXCEPTIONS -FORCEINLINE PTR_VOID GetUnwindDataBlob(TADDR moduleBase, PTR_RUNTIME_FUNCTION pRuntimeFunction, /* out */ SIZE_T * pSize) +PTR_VOID GetUnwindDataBlob(TADDR moduleBase, PTR_RUNTIME_FUNCTION pRuntimeFunction, /* out */ SIZE_T * pSize) { *pSize = 0; return dac_cast(pRuntimeFunction->UnwindData + moduleBase); -- 2.7.4