summaryrefslogtreecommitdiff
path: root/src/vm
diff options
context:
space:
mode:
authorIgor Kulaychuk <i.kulaychuk@samsung.com>2018-04-20 23:52:57 +0300
committerKonstantin Baladurin <k.baladurin@samsung.com>2019-09-24 19:39:57 +0300
commit93dabd34572f590650f4ea61d44fbb6f0735427f (patch)
tree676f90a10d9540978560494bb10328a273c8a2e3 /src/vm
parent9facdcacb8a83ea5077fe55bc505847453fc45c4 (diff)
downloadcoreclr-93dabd34572f590650f4ea61d44fbb6f0735427f.tar.gz
coreclr-93dabd34572f590650f4ea61d44fbb6f0735427f.tar.bz2
coreclr-93dabd34572f590650f4ea61d44fbb6f0735427f.zip
Fix EECodeManager::GetAmbientSP on x86/Linux
Diffstat (limited to 'src/vm')
-rw-r--r--src/vm/eetwain.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp
index f9735237fd..c0eb7aa8d0 100644
--- a/src/vm/eetwain.cpp
+++ b/src/vm/eetwain.cpp
@@ -6041,7 +6041,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;
}