From: Jan Kotas Date: Sat, 30 Jun 2018 03:43:08 +0000 (-0700) Subject: Fix build breaks with older MSVC compiler (dotnet/coreclr#18725) X-Git-Tag: submit/tizen/20210909.063632~11030^2~4475 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=048b62b59b5011a37e3195fb488ecc516b93e45b;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Fix build breaks with older MSVC compiler (dotnet/coreclr#18725) Commit migrated from https://github.com/dotnet/coreclr/commit/7ec464269fe29790cc940aa3958c9ca21496610c --- diff --git a/src/coreclr/src/jit/codegencommon.cpp b/src/coreclr/src/jit/codegencommon.cpp index 201824f..fcc0676 100644 --- a/src/coreclr/src/jit/codegencommon.cpp +++ b/src/coreclr/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/coreclr/src/jit/morph.cpp b/src/coreclr/src/jit/morph.cpp index d750d22..4dcc591 100644 --- a/src/coreclr/src/jit/morph.cpp +++ b/src/coreclr/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};