From: Eugene Rozenfeld Date: Fri, 29 Jan 2016 19:56:25 +0000 (-0800) Subject: Fix for x86 checked build error. X-Git-Tag: accepted/tizen/base/20180629.140029~5720^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e140be26c141fdd5bbd262e32415b3b8c93a2cb;p=platform%2Fupstream%2Fcoreclr.git 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. --- 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);