summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Sienkiewicz <chsienki@microsoft.com>2018-05-31 13:40:11 -0700
committerGleb Balykov <g.balykov@samsung.com>2018-08-10 16:55:00 +0300
commit702db03854d219c15af96cae6f0b9ee4787466fc (patch)
tree43e01713caa8a7bdc9559e8e4f132e52f057fde9
parentbdc42885ef4570175c6b6b75b89dfa93062bba96 (diff)
downloadcoreclr-702db03854d219c15af96cae6f0b9ee4787466fc.tar.gz
coreclr-702db03854d219c15af96cae6f0b9ee4787466fc.tar.bz2
coreclr-702db03854d219c15af96cae6f0b9ee4787466fc.zip
Move assert so it doesn't fire for null addresses
Change-Id: I0afd75bb64dcade7635a252f2d7a477b7a477849
-rw-r--r--src/debug/ee/functioninfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/debug/ee/functioninfo.cpp b/src/debug/ee/functioninfo.cpp
index 56c07267a7..795e86dc95 100644
--- a/src/debug/ee/functioninfo.cpp
+++ b/src/debug/ee/functioninfo.cpp
@@ -1559,7 +1559,6 @@ DebuggerJitInfo *DebuggerMethodInfo::FindOrCreateInitAndAddJitInfo(MethodDesc* f
CONTRACTL_END;
_ASSERTE(fd != NULL);
- ARM_ONLY(_ASSERTE((startAddr & THUMB_CODE) == 1));
// The debugger doesn't track Lightweight-codegen methods b/c they have no metadata.
if (fd->IsDynamicMethod())
@@ -1587,6 +1586,7 @@ DebuggerJitInfo *DebuggerMethodInfo::FindOrCreateInitAndAddJitInfo(MethodDesc* f
//
// We haven't got the lock yet so we'll repeat this lookup once
// we've taken the lock.
+ ARM_ONLY(_ASSERTE((startAddr & THUMB_CODE) == 1));
DebuggerJitInfo * pResult = FindJitInfo(fd, startAddr);
if (pResult != NULL)
{