Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 7ec4642

Browse files
authored
Fix build breaks with older MSVC compiler (#18725)
1 parent 20c38ed commit 7ec4642

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/jit/codegencommon.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8605,7 +8605,8 @@ void CodeGen::genFnEpilog(BasicBlock* block)
86058605
// Method handle and address info used in case of jump epilog
86068606
CORINFO_METHOD_HANDLE methHnd = nullptr;
86078607
CORINFO_CONST_LOOKUP addrInfo;
8608-
addrInfo.addr = nullptr;
8608+
addrInfo.addr = nullptr;
8609+
addrInfo.accessType = IAT_VALUE;
86098610

86108611
if (jmpEpilog && lastNode->gtOper == GT_JMP)
86118612
{

src/jit/morph.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18906,6 +18906,10 @@ bool Compiler::fgCheckStmtAfterTailCall()
1890618906
return nextMorphStmt == nullptr;
1890718907
}
1890818908

18909+
static const int numberOfTrackedFlags = 5;
18910+
static const unsigned trackedFlags[numberOfTrackedFlags] = {GTF_ASG, GTF_CALL, GTF_EXCEPT, GTF_GLOB_REF,
18911+
GTF_ORDER_SIDEEFF};
18912+
1890918913
//------------------------------------------------------------------------
1891018914
// fgMorphArgList: morph argument list tree without recursion.
1891118915
//
@@ -18921,11 +18925,7 @@ GenTreeArgList* Compiler::fgMorphArgList(GenTreeArgList* args, MorphAddrContext*
1892118925
// Use a non-recursive algorithm that morphs all actual list values,
1892218926
// memorizes the last node for each effect flag and resets
1892318927
// them during the second iteration.
18924-
constexpr int numberOfTrackedFlags = 5;
18925-
constexpr unsigned trackedFlags[numberOfTrackedFlags] = {GTF_ASG, GTF_CALL, GTF_EXCEPT, GTF_GLOB_REF,
18926-
GTF_ORDER_SIDEEFF};
18927-
static_assert_no_msg((trackedFlags[0] | trackedFlags[1] | trackedFlags[2] | trackedFlags[3] | trackedFlags[4]) ==
18928-
GTF_ALL_EFFECT);
18928+
assert((trackedFlags[0] | trackedFlags[1] | trackedFlags[2] | trackedFlags[3] | trackedFlags[4]) == GTF_ALL_EFFECT);
1892918929

1893018930
GenTree* memorizedLastNodes[numberOfTrackedFlags] = {nullptr};
1893118931

0 commit comments

Comments
 (0)