Fix build breaks with older MSVC compiler (#18725)

diff --git a/src/jit/codegencommon.cpp b/src/jit/codegencommon.cpp
index 201824f..fcc0676 100644 (file)
--- a/src/jit/codegencommon.cpp
+++ b/src/jit/codegencommon.cpp
@@ -8605,7 +8605,8 @@ void CodeGen::genFnEpilog(BasicBlock* block)
     // Method handle and address info used in case of jump epilog
     CORINFO_METHOD_HANDLE methHnd = nullptr;
     CORINFO_CONST_LOOKUP  addrInfo;
-    addrInfo.addr = nullptr;
+    addrInfo.addr       = nullptr;
+    addrInfo.accessType = IAT_VALUE;
 
     if (jmpEpilog && lastNode->gtOper == GT_JMP)
     {

diff --git a/src/jit/morph.cpp b/src/jit/morph.cpp
index d750d22..4dcc591 100644 (file)
--- a/src/jit/morph.cpp
+++ b/src/jit/morph.cpp
@@ -18906,6 +18906,10 @@ bool Compiler::fgCheckStmtAfterTailCall()
     return nextMorphStmt == nullptr;
 }
 
+static const int      numberOfTrackedFlags               = 5;
+static const unsigned trackedFlags[numberOfTrackedFlags] = {GTF_ASG, GTF_CALL, GTF_EXCEPT, GTF_GLOB_REF,
+                                                            GTF_ORDER_SIDEEFF};
+
 //------------------------------------------------------------------------
 // fgMorphArgList: morph argument list tree without recursion.
 //
@@ -18921,11 +18925,7 @@ GenTreeArgList* Compiler::fgMorphArgList(GenTreeArgList* args, MorphAddrContext*
     // Use a non-recursive algorithm that morphs all actual list values,
     // memorizes the last node for each effect flag and resets
     // them during the second iteration.
-    constexpr int      numberOfTrackedFlags               = 5;
-    constexpr unsigned trackedFlags[numberOfTrackedFlags] = {GTF_ASG, GTF_CALL, GTF_EXCEPT, GTF_GLOB_REF,
-                                                             GTF_ORDER_SIDEEFF};
-    static_assert_no_msg((trackedFlags[0] | trackedFlags[1] | trackedFlags[2] | trackedFlags[3] | trackedFlags[4]) ==
-                         GTF_ALL_EFFECT);
+    assert((trackedFlags[0] | trackedFlags[1] | trackedFlags[2] | trackedFlags[3] | trackedFlags[4]) == GTF_ALL_EFFECT);
 
     GenTree* memorizedLastNodes[numberOfTrackedFlags] = {nullptr};