summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Koritzinsky <jekoritz@microsoft.com>2019-06-04 11:49:51 -0700
committerBrian Robbins <brianrob@microsoft.com>2019-06-04 11:49:51 -0700
commited882b151fc20ddaddaabd96bd67b034c6069211 (patch)
tree50ac70ef0f91369416c15f80aa7e7dfa7a739a96 /src
parent3c01e17de0c6651d4049c5ed5e4ac2d8ee5ae8c9 (diff)
downloadcoreclr-ed882b151fc20ddaddaabd96bd67b034c6069211.tar.gz
coreclr-ed882b151fc20ddaddaabd96bd67b034c6069211.tar.bz2
coreclr-ed882b151fc20ddaddaabd96bd67b034c6069211.zip
Fix PGO on Windows (#24949)
* Add warning disables around InitJITHelpers1 for C4731 * Move configureoptimization up in configurecompiler.
Diffstat (limited to 'src')
-rw-r--r--src/vm/i386/jitinterfacex86.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vm/i386/jitinterfacex86.cpp b/src/vm/i386/jitinterfacex86.cpp
index 2444a7bf9f..36296f3e70 100644
--- a/src/vm/i386/jitinterfacex86.cpp
+++ b/src/vm/i386/jitinterfacex86.cpp
@@ -1168,6 +1168,7 @@ static const void * const c_rgDebugWriteBarriers[NUM_WRITE_BARRIERS] = {
// Initialize the part of the JIT helpers that require very little of
// EE infrastructure to be in place.
/*********************************************************************/
+#pragma warning (disable : 4731)
void InitJITHelpers1()
{
STANDARD_VM_CONTRACT;
@@ -1332,6 +1333,7 @@ void InitJITHelpers1()
// Initialize g_TailCallFrameVptr for JIT_TailCall helper
g_TailCallFrameVptr = (void*)TailCallFrame::GetMethodFrameVPtr();
}
+#pragma warning (default : 4731)
// these constans are offsets into our write barrier helpers for values that get updated as the bounds of the managed heap change.
// ephemeral region