Skip to content

Commit 840ec5f

Browse files
committed
bump the min R2R version and GCInfo version
1 parent a5b967b commit 840ec5f

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

src/coreclr/inc/gcinfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const unsigned this_OFFSET_FLAG = 0x2; // the offset is "this"
3636
// The current GCInfo Version
3737
//-----------------------------------------------------------------------------
3838

39-
#define GCINFO_VERSION 3
39+
#define GCINFO_VERSION 4
4040

4141
//-----------------------------------------------------------------------------
4242
// GCInfoToken: A wrapper that contains the GcInfo data and version number.

src/coreclr/inc/readytorun.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
// src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h
2020
// If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
2121
// and handle pending work.
22-
#define READYTORUN_MAJOR_VERSION 10
23-
#define READYTORUN_MINOR_VERSION 0x0001
22+
#define READYTORUN_MAJOR_VERSION 11
23+
#define READYTORUN_MINOR_VERSION 0x0000
2424

25-
#define MINIMUM_READYTORUN_MAJOR_VERSION 10
25+
#define MINIMUM_READYTORUN_MAJOR_VERSION 11
2626

2727
// R2R Version 2.1 adds the InliningInfo section
2828
// R2R Version 2.2 adds the ProfileDataInfo section
@@ -38,6 +38,7 @@
3838
// uses GCInfo v3, which makes safe points in partially interruptible code interruptible.
3939
// R2R Version 10.0 adds support for the statics being allocated on a per type basis instead of on a per module basis, disable support for LogMethodEnter helper
4040
// R2R Version 10.1 adds Unbox_TypeTest helper
41+
// R2R Version 11 uses GCInfo v4, which encodes safe points without -1 offset
4142

4243
struct READYTORUN_CORE_HEADER
4344
{

src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/Amd64/GcInfo.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,11 @@ private int ReadyToRunVersionToGcInfoVersion(int readyToRunMajorVersion, int rea
403403
if (readyToRunMajorVersion < 9 || (readyToRunMajorVersion == 9 && readyToRunMinorVersion < 2))
404404
return 2;
405405

406+
// R2R 11.0+ uses GCInfo v4
407+
if (readyToRunMajorVersion < 11)
406408
return 3;
409+
410+
return 4;
407411
}
408412

409413
private List<List<BaseGcSlot>> GetLiveSlotsAtSafepoints(byte[] image, ref int bitOffset)

0 commit comments

Comments
 (0)