From: Jan Vorlicek <janvorli@microsoft.com>
Date: Fri, 31 May 2019 16:46:12 +0000 (+0200)
Subject: Fix overlooked moduleIndex initial value (#24881)
X-Git-Tag: accepted/tizen/unified/20190813.215958~42^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=795f2fd2a67047519b477cd1776626368c88e73c;p=platform%2Fupstream%2Fcoreclr.git

Fix overlooked moduleIndex initial value (#24881)

When adding the signature copying some time ago, I have overlooked one
place where the moduleIndex was set to -1 instead of MODULE_INDEX_NONE.
I was using the -1 during the development and replaced it by creating
MODULE_INDEX_NONE during final cleanup at all but one places.

This caused issues during crossgen even without large version bubble
enabled. Methods requiring generic constraint were not crossgen-ed due
to this.
---

diff --git a/src/vm/zapsig.cpp b/src/vm/zapsig.cpp
index 4914246..08d9228 100644
--- a/src/vm/zapsig.cpp
+++ b/src/vm/zapsig.cpp
@@ -1530,7 +1530,7 @@ BOOL ZapSig::EncodeMethod(
         {
             _ASSERTE(pConstrainedResolvedToken->cbTypeSpec > 0);
 
-            DWORD moduleIndex = (DWORD)-1;
+            DWORD moduleIndex = MODULE_INDEX_NONE;
             if (IsReadyToRunCompilation() && pMethod->GetModule()->IsInCurrentVersionBubble() && pInfoModule != (Module *) pConstrainedResolvedToken->tokenScope)
             {
                 moduleIndex = (*((EncodeModuleCallback)pfnEncodeModule))(pEncodeModuleContext, (Module *) pConstrainedResolvedToken->tokenScope);