Disable IL offset mapping validation (#117809)

jakobbotsch · web-flow · commit 68cb956f1737 · 2025-07-21T15:56:28.000+02:00
diff --git a/src/coreclr/vm/debugdebugger.cpp b/src/coreclr/vm/debugdebugger.cpp
@@ -1314,7 +1314,6 @@ size_t WalkILOffsetsCallback(ICorDebugInfo::OffsetMapping *pOffsetMapping, void
             }
             pWalkData->dwCurrentNativeOffset = pOffsetMapping->nativeOffset;
             pWalkData->prevILOffsetFound = pWalkData->dwILOffsetFound;
-            pWalkData->dwCurrentNativeOffset = pOffsetMapping->nativeOffset;
             pWalkData->dwILOffsetFound = pOffsetMapping->ilOffset;
         }
         else if (((int32_t)pOffsetMapping->ilOffset < (int32_t)pWalkData->dwILOffsetFound) && (pOffsetMapping->ilOffset != (DWORD)ICorDebugInfo::NO_MAPPING))
diff --git a/src/coreclr/vm/jitinterface.cpp b/src/coreclr/vm/jitinterface.cpp
@@ -13103,9 +13103,12 @@ static TADDR UnsafeJitFunctionWorker(
         if (g_pDebugInterface)
         {
             g_pDebugInterface->JITComplete(nativeCodeVersion, (TADDR)nativeEntry);
-#ifdef DEBUG
-            ValidateILOffsets(ftn, NULL, 0, (uint8_t*)nativeEntry, sizeOfCode);
-#endif // DEBUG
+
+            // Validation currently disabled, see https://github.com/dotnet/runtime/issues/117561
+            //
+//#ifdef DEBUG
+//            ValidateILOffsets(ftn, NULL, 0, (uint8_t*)nativeEntry, sizeOfCode);
+//#endif // DEBUG
         }
 #endif // DEBUGGING_SUPPORTED
     }

Original file line number	Diff line number	Diff line change
`@@ -1314,7 +1314,6 @@ size_t WalkILOffsetsCallback(ICorDebugInfo::OffsetMapping *pOffsetMapping, void`
`1314`	`1314`	`}`
`1315`	`1315`	`pWalkData->dwCurrentNativeOffset = pOffsetMapping->nativeOffset;`
`1316`	`1316`	`pWalkData->prevILOffsetFound = pWalkData->dwILOffsetFound;`
`1317`		`- pWalkData->dwCurrentNativeOffset = pOffsetMapping->nativeOffset;`
`1318`	`1317`	`pWalkData->dwILOffsetFound = pOffsetMapping->ilOffset;`
`1319`	`1318`	`}`
`1320`	`1319`	`else if (((int32_t)pOffsetMapping->ilOffset < (int32_t)pWalkData->dwILOffsetFound) && (pOffsetMapping->ilOffset != (DWORD)ICorDebugInfo::NO_MAPPING))`
Original file line number	Diff line number	Diff line change
`@@ -13103,9 +13103,12 @@ static TADDR UnsafeJitFunctionWorker(`
`13103`	`13103`	`if (g_pDebugInterface)`
`13104`	`13104`	`{`
`13105`	`13105`	`g_pDebugInterface->JITComplete(nativeCodeVersion, (TADDR)nativeEntry);`
`13106`		`-#ifdef DEBUG`
`13107`		`- ValidateILOffsets(ftn, NULL, 0, (uint8_t*)nativeEntry, sizeOfCode);`
`13108`		`-#endif // DEBUG`
	`13106`	`+`
	`13107`	`+ // Validation currently disabled, see https://github.com/dotnet/runtime/issues/117561`
	`13108`	`+ //`
	`13109`	`+//#ifdef DEBUG`
	`13110`	`+// ValidateILOffsets(ftn, NULL, 0, (uint8_t*)nativeEntry, sizeOfCode);`
	`13111`	`+//#endif // DEBUG`
`13109`	`13112`	`}`
`13110`	`13113`	`#endif // DEBUGGING_SUPPORTED`
`13111`	`13114`	`}`