Merge pull request #24071 from AndyAyersMS/Fix24055
authorRuss Keldorph <russ.keldorph@microsoft.com>
Thu, 18 Apr 2019 18:11:59 +0000 (11:11 -0700)
committerGitHub <noreply@github.com>
Thu, 18 Apr 2019 18:11:59 +0000 (11:11 -0700)
JIT: fix arm64 crossgen simd issue

src/jit/rationalize.cpp

index cf5f44a..e226212 100644 (file)
@@ -75,8 +75,8 @@ void copyFlags(GenTree* dst, GenTree* src, unsigned mask)
 void Rationalizer::RewriteSIMDOperand(LIR::Use& use, bool keepBlk)
 {
 #ifdef FEATURE_SIMD
-    // No lowering is needed for non-SIMD nodes, so early out if featureSIMD is not enabled.
-    if (!comp->featureSIMD)
+    // No lowering is needed for non-SIMD nodes, so early out if SIMD types are not supported.
+    if (!comp->supportSIMDTypes())
     {
         return;
     }
@@ -771,7 +771,7 @@ Compiler::fgWalkResult Rationalizer::RewriteNode(GenTree** useEdge, Compiler::Ge
 #ifdef FEATURE_SIMD
         case GT_SIMD:
         {
-            noway_assert(comp->featureSIMD);
+            noway_assert(comp->supportSIMDTypes());
             GenTreeSIMD* simdNode = node->AsSIMD();
             unsigned     simdSize = simdNode->gtSIMDSize;
             var_types    simdType = comp->getSIMDTypeForSize(simdSize);