Fix asserts

Author: filipnavara

src/coreclr/jit/codegencommon.cpp

@@ -1642,7 +1642,7 @@ void CodeGen::genUpdateCurrentFunclet(BasicBlock* block)
     }
     else
     {
-        assert(compiler->compCurrFuncIdx <= compiler->compFuncInfoCount);
+        assert(compiler->funCurrentFuncIdx() <= compiler->compFuncInfoCount);
         if (compiler->funCurrentFunc()->funKind == FUNC_FILTER)
         {
             assert(compiler->ehGetDsc(compiler->funCurrentFunc()->funEHIndex)->InFilterRegionBBRange(block));

src/coreclr/jit/compiler.h

@@ -8417,7 +8417,7 @@ class Compiler
 
     // Things that MAY belong either in CodeGen or CodeGenContext
     FuncInfoDsc*   compFuncInfos;
-    unsigned short compCurrFuncIdx = 0;
+    unsigned short compCurrFuncIdx;
     unsigned short compFuncInfoCount;
     FuncInfoDsc    compFuncInfoRoot;
 
@@ -8434,6 +8434,11 @@ class Compiler
         }
     }
 
+    unsigned short funCurrentFuncIdx()
+    {
+        return UsesFunclets() ? compCurrFuncIdx : 0;
+    }
+
     FuncInfoDsc* funCurrentFunc();
     void funSetCurrentFunc(unsigned funcIdx);
     FuncInfoDsc* funGetFunc(unsigned funcIdx);

src/coreclr/jit/emit.cpp

@@ -2101,8 +2101,7 @@ void emitter::emitCreatePlaceholderIG(insGroupPlaceholderType igType,
      * case, we need to make sure any re-used fields, such as igFuncIdx, are correct.
      */
 
-    assert(emitComp->UsesFunclets() || emitComp->compCurrFuncIdx == 0);
-    igPh->igFuncIdx = emitComp->compCurrFuncIdx;
+    igPh->igFuncIdx = emitComp->funCurrentFuncIdx();
 
     /* Create a separate block of memory to store placeholder information.
      * We could use unions to put some of this into the insGroup itself, but we don't
@@ -9553,8 +9552,7 @@ void emitter::emitInitIG(insGroup* ig)
 
     /* Set the current function index */
 
-    assert(emitComp->UsesFunclets() || emitComp->compCurrFuncIdx == 0);
-    ig->igFuncIdx = emitComp->compCurrFuncIdx;
+    ig->igFuncIdx = emitComp->funCurrentFuncIdx();
 
     ig->igFlags = 0;
 

src/coreclr/jit/fgbasic.cpp

@@ -5694,7 +5694,7 @@ BasicBlock* Compiler::fgRelocateEHRange(unsigned regionIndex, FG_RELOCATE_TYPE r
     BasicBlock* bPrev   = nullptr;
 
     // We don't support moving try regions... yet?
-    noway_assert(UsesFunclets() && relocateType == FG_RELOCATE_HANDLER);
+    noway_assert(!UsesFunclets() || relocateType == FG_RELOCATE_HANDLER);
 
     HBtab = ehGetDsc(regionIndex);