projects
/
platform
/
upstream
/
coreclr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0a60961
)
Fix build break (#18278) (#18279)
author
Russ Keldorph
<russ.keldorph@microsoft.com>
Mon, 4 Jun 2018 15:11:18 +0000
(08:11 -0700)
committer
Stephen Toub
<stoub@microsoft.com>
Mon, 4 Jun 2018 15:11:18 +0000
(11:11 -0400)
src/vm/codeversion.cpp
patch
|
blob
|
history
diff --git
a/src/vm/codeversion.cpp
b/src/vm/codeversion.cpp
index
01aad66
..
7406d19
100644
(file)
--- a/
src/vm/codeversion.cpp
+++ b/
src/vm/codeversion.cpp
@@
-2520,8
+2520,6
@@
HRESULT CodeVersionManager::DoJumpStampIfNecessary(MethodDesc* pMD, PCODE pCode)
}
CONTRACTL_END;
- HRESULT hr;
-
_ASSERTE(LockOwnedByCurrentThread());
NativeCodeVersion activeCodeVersion = GetActiveILCodeVersion(pMD).GetActiveNativeCodeVersion(pMD);
@@
-2540,6
+2538,7
@@
HRESULT CodeVersionManager::DoJumpStampIfNecessary(MethodDesc* pMD, PCODE pCode)
_ASSERTE(!"How did we get here? IsVersionableWithJumpStamp() should have been FALSE above");
return S_OK;
#else
+ HRESULT hr;
MethodDescVersioningState* pVersioningState;
if (FAILED(hr = GetOrCreateMethodDescVersioningState(pMD, &pVersioningState)))
{