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

Fix build breaks with older MSVC compiler #18725

Merged
merged 1 commit into from
Jun 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/jit/codegencommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
10 changes: 5 additions & 5 deletions src/jit/morph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
//
Expand All @@ -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};

Expand Down