diff --git a/src/coreclr/jit/gentree.cpp b/src/coreclr/jit/gentree.cpp
index dbdb7c7485108d..eb370393087749 100644
--- a/src/coreclr/jit/gentree.cpp
+++ b/src/coreclr/jit/gentree.cpp
@@ -12837,6 +12837,15 @@ void Compiler::gtDispTree(GenTree*                    tree,
                 case NI_System_Math_MinUnsigned:
                     printf(" minUnsigned");
                     break;
+                case NI_PRIMITIVE_LeadingZeroCount:
+                    printf(" leadingZeroCount");
+                    break;
+                case NI_PRIMITIVE_TrailingZeroCount:
+                    printf(" trailingZeroCount");
+                    break;
+                case NI_PRIMITIVE_PopCount:
+                    printf(" popCount");
+                    break;
 #endif // TARGET_RISCV64
                 case NI_System_Math_Pow:
                     printf(" pow");
diff --git a/src/coreclr/jit/valuenum.cpp b/src/coreclr/jit/valuenum.cpp
index e2de675a651578..22b433629c26dc 100644
--- a/src/coreclr/jit/valuenum.cpp
+++ b/src/coreclr/jit/valuenum.cpp
@@ -9385,8 +9385,6 @@ ValueNum ValueNumStore::EvalMathFuncUnary(var_types typ, NamedIntrinsic gtMathFN
 
     if (IsVNConstant(arg0VN) && (!m_pComp->IsAot() || m_pComp->IsTargetIntrinsic(gtMathFN)))
     {
-        assert(varTypeIsFloating(TypeOfVN(arg0VN)));
-
         if (typ == TYP_DOUBLE)
         {
             // Both operand and its result must be of the same floating point type.