From: Carol Eidt <carol.eidt@microsoft.com>
Date: Thu, 25 Apr 2019 14:26:21 +0000 (-0700)
Subject: Return null for unexpected HW intrinsic (#24219)
X-Git-Tag: accepted/tizen/unified/20190813.215958~42^2~416
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9cd5658f969f503127e2a40991989976c72f866d;p=platform%2Fupstream%2Fcoreclr.git

Return null for unexpected HW intrinsic (#24219)

Fix #17815
---

diff --git a/src/jit/hwintrinsicxarch.cpp b/src/jit/hwintrinsicxarch.cpp
index 8da12e5..4d78fde 100644
--- a/src/jit/hwintrinsicxarch.cpp
+++ b/src/jit/hwintrinsicxarch.cpp
@@ -846,8 +846,11 @@ GenTree* Compiler::impHWIntrinsic(NamedIntrinsic        intrinsic,
         var_types               argType = TYP_UNKNOWN;
 
         assert(numArgs >= 0);
-        assert(HWIntrinsicInfo::lookupIns(intrinsic, baseType) != INS_invalid);
-        assert(simdSize == 32 || simdSize == 16);
+        if ((HWIntrinsicInfo::lookupIns(intrinsic, baseType) == INS_invalid) || ((simdSize != 32) && (simdSize != 16)))
+        {
+            assert(!"Unexpected HW Intrinsic");
+            return nullptr;
+        }
 
         GenTreeHWIntrinsic* retNode = nullptr;
         GenTree*            op1     = nullptr;