From e6693011757a969a094ddc5a89051867cd36ab3e Mon Sep 17 00:00:00 2001 From: Igor Kulaychuk Date: Fri, 20 Apr 2018 23:52:57 +0300 Subject: [PATCH] [Tizen] Fix EECodeManager::GetAmbientSP on x86/Linux --- src/coreclr/vm/eetwain.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/coreclr/vm/eetwain.cpp b/src/coreclr/vm/eetwain.cpp index 5c48a13..6721c34 100644 --- a/src/coreclr/vm/eetwain.cpp +++ b/src/coreclr/vm/eetwain.cpp @@ -6108,7 +6108,8 @@ TADDR EECodeManager::GetAmbientSP(PREGDISPLAY pContext, #endif // _DEBUG && !DACCESS_COMPILE if ((stateBuf->hdrInfoBody.prologOffs != hdrInfo::NOT_IN_PROLOG) || - (stateBuf->hdrInfoBody.epilogOffs != hdrInfo::NOT_IN_EPILOG)) + (stateBuf->hdrInfoBody.epilogOffs != hdrInfo::NOT_IN_EPILOG) || + (GetRegdisplayFPAddress(pContext) == NULL)) { return NULL; } -- 2.7.4