misc fixes

Author: VSadov

src/coreclr/jit/lower.cpp

@@ -5499,9 +5499,10 @@ GenTree* Lowering::ResetGCGen()
 
     GenTree* base = new (comp, GT_LCL_VAR) GenTreeLclVar(GT_LCL_VAR, TYP_I_IMPL, comp->info.compLvFrameListRoot);
 
-    GenTree* stateNode    = new (comp, GT_CNS_INT) GenTreeIntCon(TYP_BYTE, 0);
-    GenTree* addr         = new (comp, GT_LEA) GenTreeAddrMode(TYP_I_IMPL, base, nullptr, 1, pInfo->offsetOfGCState + sizeof(uint32_t));
-    GenTree* storeGcGen   = new (comp, GT_STOREIND) GenTreeStoreInd(TYP_BYTE, addr, stateNode);
+    GenTree* stateNode = new (comp, GT_CNS_INT) GenTreeIntCon(TYP_BYTE, 0);
+    GenTree* addr =
+        new (comp, GT_LEA) GenTreeAddrMode(TYP_I_IMPL, base, nullptr, 1, pInfo->offsetOfGCState + sizeof(uint32_t));
+    GenTree* storeGcGen = new (comp, GT_STOREIND) GenTreeStoreInd(TYP_BYTE, addr, stateNode);
     return storeGcGen;
 }
 

src/coreclr/nativeaot/Runtime/GCHelpers.cpp

@@ -476,7 +476,7 @@ static Object* GcAllocInternal(MethodTable* pEEType, uint32_t uFlags, uintptr_t
     ASSERT(!pThread->IsDoNotTriggerGcSet());
     ASSERT(pThread->IsCurrentThreadInCooperativeMode());
 
-    _ASSERT_EXPR(pThread->GetGeneration() == 0, "generation should be reset when running managed code");
+    ASSERT_MSG(pThread->GetGeneration() == 0, "generation should be reset when running managed code");
 
     if (pEEType->ContainsPointers())
     {

src/coreclr/nativeaot/Runtime/arm/PInvoke.S

@@ -51,10 +51,10 @@ LEAF_ENTRY RhpPInvokeReturn, _TEXT
         mov     r2, #0
         str     r2, [r3, #OFFSETOF__Thread__m_pTransitionFrame]
 
-        PREPARE_EXTERNAL_VAR_INDIRECT RhpTrapThreads, r3
-        cbnz    r3, LOCAL_LABEL(ReturnRareTrapThread)  // TrapThreadsFlags_None = 0
+        PREPARE_EXTERNAL_VAR_INDIRECT RhpTrapThreads, r2
+        cbnz    r2, LOCAL_LABEL(ReturnRareTrapThread)  // TrapThreadsFlags_None = 0
 
-        str     r2, [x10, #OFFSETOF__Thread__m_generation]
+        str     r2, [r3, #OFFSETOF__Thread__m_generation]
         bx      lr
 LOCAL_LABEL(ReturnRareTrapThread):
         // passing transition frame pointer in r0

src/coreclr/vm/arm/asmconstants.h

@@ -134,13 +134,17 @@ ASMCONSTANTS_C_ASSERT(UnmanagedToManagedFrame__m_pvDatum == offsetof(UnmanagedTo
 
 #endif // FEATURE_COMINTEROP
 
-#define               Thread__m_fPreemptiveGCDisabled   0x04
-ASMCONSTANTS_C_ASSERT(Thread__m_fPreemptiveGCDisabled == offsetof(Thread, m_fPreemptiveGCDisabled));
-#define Thread_m_fPreemptiveGCDisabled Thread__m_fPreemptiveGCDisabled
-
+#define               Thread__m_fPreemptiveGCDisabled   0x00
+#define               Thread__m_generation              0x04
 #define               Thread__m_pFrame                  0x08
+
+ASMCONSTANTS_C_ASSERT(Thread__m_fPreemptiveGCDisabled == offsetof(Thread, m_fPreemptiveGCDisabled));
+ASMCONSTANTS_C_ASSERT(Thread__m_generation == offsetof(Thread, m_generation));
 ASMCONSTANTS_C_ASSERT(Thread__m_pFrame == offsetof(Thread, m_pFrame));
+
 #define Thread_m_pFrame Thread__m_pFrame
+#define Thread_m_fPreemptiveGCDisabled Thread__m_fPreemptiveGCDisabled
+#define Thread_m_generation Thread__m_generation
 
 #define               DomainLocalModule__m_pDataBlob                 0x18
 ASMCONSTANTS_C_ASSERT(DomainLocalModule__m_pDataBlob == offsetof(DomainLocalModule, m_pDataBlob));

src/coreclr/vm/arm/pinvokestubs.S

@@ -159,6 +159,8 @@
         ldr     r2, [r2]
         cbnz    r2, LOCAL_LABEL(RarePath)
 
+        str     r2, [r1, #Thread_m_generation]
+
         // pThread->m_pFrame = pFrame->m_Next
         ldr     r2, [r0, #Frame__m_Next]
         str     r2, [r1, #Thread_m_pFrame]

src/coreclr/vm/i386/asmconstants.h

@@ -174,17 +174,14 @@ ASMCONSTANTS_C_ASSERT(CORINFO_ArgumentException_ASM == CORINFO_ArgumentException
 
 
 
-#define               Thread__m_fPreemptiveGCDisabled   0x00
-#define               Thread__m_generation              0x04
-#define               Thread__m_pFrame                  0x08
+#define Thread_m_fPreemptiveGCDisabled     0x00
+ASMCONSTANTS_C_ASSERT(Thread_m_fPreemptiveGCDisabled == offsetof(Thread, m_fPreemptiveGCDisabled))
 
-ASMCONSTANTS_C_ASSERT(Thread__m_fPreemptiveGCDisabled == offsetof(Thread, m_fPreemptiveGCDisabled));
-ASMCONSTANTS_C_ASSERT(Thread__m_generation == offsetof(Thread, m_generation));
-ASMCONSTANTS_C_ASSERT(Thread__m_pFrame == offsetof(Thread, m_pFrame));
+#define Thread_m_generation     0x04
+ASMCONSTANTS_C_ASSERT(Thread_m_generation == offsetof(Thread, m_generation))
 
-#define Thread_m_pFrame Thread__m_pFrame
-#define Thread_m_fPreemptiveGCDisabled Thread__m_fPreemptiveGCDisabled
-#define Thread_m_generation Thread__m_generation
+#define Thread_m_pFrame     0x08
+ASMCONSTANTS_C_ASSERT(Thread_m_pFrame == offsetof(Thread, m_pFrame))
 
 
 #ifdef FEATURE_HIJACK

src/coreclr/vm/jithelpers.cpp

@@ -5980,6 +5980,10 @@ HCIMPL3_RAW(void, JIT_ReversePInvokeEnterTrackTransitions, ReversePInvokeFrame*
             // not the next instruction in the stub.
             JIT_ReversePInvokeEnterRare2(frame, _ReturnAddress(), GetMethod(handle)->IsILStub() ? (UMEntryThunk*)secretArg : (UMEntryThunk*)NULL);
         }
+        else
+        {
+            thread->m_generation = 0;
+        }
     }
     else
     {
@@ -6015,6 +6019,10 @@ HCIMPL1_RAW(void, JIT_ReversePInvokeEnter, ReversePInvokeFrame* frame)
         {
             JIT_ReversePInvokeEnterRare2(frame, _ReturnAddress());
         }
+        else
+        {
+            thread->m_generation = 0;
+        }
     }
     else
     {