summaryrefslogtreecommitdiff
path: root/src/jit
diff options
context:
space:
mode:
authorBrian Sullivan <briansul@microsoft.com>2019-05-30 14:34:55 -0700
committerBrian Sullivan <briansul@microsoft.com>2019-05-30 14:34:55 -0700
commita765642cab6f2242fcfe0fab27ca41ceb7c57490 (patch)
tree5f79fa4ce23608f0e4fd944e49d6959146cc54a4 /src/jit
parent42d8e40e469cf00128e0cfa48f24297afa13c36f (diff)
downloadcoreclr-a765642cab6f2242fcfe0fab27ca41ceb7c57490.tar.gz
coreclr-a765642cab6f2242fcfe0fab27ca41ceb7c57490.tar.bz2
coreclr-a765642cab6f2242fcfe0fab27ca41ceb7c57490.zip
Fixes for building the Desktop JIT in CodegenMirror
Diffstat (limited to 'src/jit')
-rw-r--r--src/jit/codegenxarch.cpp1
-rw-r--r--src/jit/compiler.cpp2
-rw-r--r--src/jit/lowerarmarch.cpp4
-rw-r--r--src/jit/simdcodegenxarch.cpp1
4 files changed, 7 insertions, 1 deletions
diff --git a/src/jit/codegenxarch.cpp b/src/jit/codegenxarch.cpp
index 0297979266..15bd607c2e 100644
--- a/src/jit/codegenxarch.cpp
+++ b/src/jit/codegenxarch.cpp
@@ -13,6 +13,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
#include "jitpch.h"
#ifdef _MSC_VER
#pragma hdrstop
+#pragma warning(disable : 4310) // cast truncates constant value - happens for (int8_t)0xb1
#endif
#ifdef _TARGET_XARCH_
diff --git a/src/jit/compiler.cpp b/src/jit/compiler.cpp
index 25249e19bb..e8ea9a1391 100644
--- a/src/jit/compiler.cpp
+++ b/src/jit/compiler.cpp
@@ -5959,7 +5959,7 @@ int Compiler::compCompileHelper(CORINFO_MODULE_HANDLE classPtr,
if (fgHasBackwardJump && (info.compFlags & CORINFO_FLG_DISABLE_TIER0_FOR_LOOPS) != 0 && fgCanSwitchToOptimized())
#else // !FEATURE_CORECLR
// We may want to use JitConfig value here to support DISABLE_TIER0_FOR_LOOPS
- if (fgHasBackwardJump && fgCanSwitchToTier1())
+ if (fgHasBackwardJump && fgCanSwitchToOptimized())
#endif
{
// Method likely has a loop, switch to the OptimizedTier to avoid spending too much time running slower code
diff --git a/src/jit/lowerarmarch.cpp b/src/jit/lowerarmarch.cpp
index bec27800d5..36988ebb43 100644
--- a/src/jit/lowerarmarch.cpp
+++ b/src/jit/lowerarmarch.cpp
@@ -93,8 +93,12 @@ bool Lowering::IsContainableImmed(GenTree* parentNode, GenTree* childNode)
case GT_GE:
case GT_GT:
case GT_ARR_BOUNDS_CHECK:
+#ifdef FEATURE_SIMD
case GT_SIMD_CHK:
+#endif
+#ifdef FEATURE_HW_INTRINSICS
case GT_HW_INTRINSIC_CHK:
+#endif
return emitter::emitIns_valid_imm_for_cmp(immVal, size);
case GT_AND:
case GT_OR:
diff --git a/src/jit/simdcodegenxarch.cpp b/src/jit/simdcodegenxarch.cpp
index a60404abaf..ecb811d6d2 100644
--- a/src/jit/simdcodegenxarch.cpp
+++ b/src/jit/simdcodegenxarch.cpp
@@ -13,6 +13,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
#include "jitpch.h"
#ifdef _MSC_VER
#pragma hdrstop
+#pragma warning(disable : 4310) // cast truncates constant value - happens for (int8_t)SHUFFLE_ZXXX
#endif
#ifdef _TARGET_XARCH_