Skip to content

Commit 11940c9

Browse files
authored
Update mscorlib declaration (#3123)
1 parent 8f3eb00 commit 11940c9

File tree

2 files changed

+31
-36
lines changed

2 files changed

+31
-36
lines changed

src/CLR/CorLib/corlib_native.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
505505
NULL,
506506
NULL,
507507
NULL,
508-
NULL,
509-
NULL,
510508
Library_corlib_native_System_Reflection_Assembly::get_FullName___STRING,
511509
Library_corlib_native_System_Reflection_Assembly::GetType___SystemType__STRING,
512510
NULL,
@@ -683,7 +681,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
683681
NULL,
684682
NULL,
685683
NULL,
686-
NULL,
687684
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::InitializeArray___STATIC__VOID__SystemArray__SystemRuntimeFieldHandle,
688685
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::GetObjectValue___STATIC__OBJECT__OBJECT,
689686
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::RunClassConstructor___STATIC__VOID__SystemRuntimeTypeHandle,
@@ -1258,8 +1255,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
12581255
Library_corlib_native_System_Diagnostics_Debugger::get_IsAttached___STATIC__BOOLEAN,
12591256
Library_corlib_native_System_Diagnostics_Debugger::Break___STATIC__VOID,
12601257
NULL,
1261-
NULL,
1262-
NULL,
12631258
Library_corlib_native_System_Enum::HasFlag___BOOLEAN__SystemEnum,
12641259
NULL,
12651260
NULL,
@@ -1371,7 +1366,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
13711366
NULL,
13721367
NULL,
13731368
NULL,
1374-
NULL,
13751369
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::InitializeArray___STATIC__VOID__SystemArray__SystemRuntimeFieldHandle,
13761370
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::GetObjectValue___STATIC__OBJECT__OBJECT,
13771371
Library_corlib_native_System_Runtime_CompilerServices_RuntimeHelpers::RunClassConstructor___STATIC__VOID__SystemRuntimeTypeHandle,
@@ -1503,18 +1497,18 @@ const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =
15031497

15041498
#if (NANOCLR_REFLECTION == TRUE)
15051499

1506-
0x6386D1B4,
1500+
0x9F295833,
15071501

15081502
#elif (NANOCLR_REFLECTION == FALSE)
15091503

1510-
0xA145623D,
1504+
0xFDC67F52,
15111505

15121506
#else
15131507
#error "NANOCLR_REFLECTION has to be define either TRUE or FALSE. Check the build options."
15141508
#endif
15151509

15161510
method_lookup,
1517-
{ 100, 5, 0, 22 }
1511+
{ 100, 5, 0, 23 }
15181512
};
15191513

15201514
// clang-format on

src/CLR/CorLib/corlib_native.h

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,22 @@ struct Library_corlib_native_System_Exception
322322

323323
struct Library_corlib_native_System_ArgumentException
324324
{
325+
static const int FIELD_STATIC__Arg_ArgumentException = 3;
326+
static const int FIELD_STATIC__Arg_ParamName_Name = 4;
327+
static const int FIELD_STATIC__Argument_EmptyString = 5;
328+
325329
static const int FIELD___paramName = 5;
326330

327331
//--//
328332
};
329333

334+
struct Library_corlib_native_System_ArgumentNullException
335+
{
336+
static const int FIELD_STATIC__ArgumentNull_Generic = 6;
337+
338+
//--//
339+
};
340+
330341
struct Library_corlib_native_System_Array
331342
{
332343
NANOCLR_NATIVE_DECLARE(System_Collections_IList_get_Item___OBJECT__I4);
@@ -404,7 +415,6 @@ struct Library_corlib_native_System_BitConverter
404415

405416
struct Library_corlib_native_System_Byte
406417
{
407-
408418
static const int FIELD__m_value = 1;
409419

410420
//--//
@@ -427,16 +437,8 @@ struct Library_corlib_native_System_Collections_ArrayList
427437
//--//
428438
};
429439

430-
struct Library_corlib_native_System_ComponentModel_EditorBrowsableState
431-
{
432-
433-
static const int FIELD__value__ = 1;
434-
435-
//--//
436-
};
437440
struct Library_corlib_native_System_Double
438441
{
439-
440442
static const int FIELD__m_value = 1;
441443

442444
NANOCLR_NATIVE_DECLARE(CompareTo___STATIC__I4__R8__R8);
@@ -450,9 +452,9 @@ struct Library_corlib_native_System_Double
450452

451453
struct Library_corlib_native_System_TimeSpan
452454
{
453-
static const int FIELD_STATIC__Zero = 3;
454-
static const int FIELD_STATIC__MaxValue = 4;
455-
static const int FIELD_STATIC__MinValue = 5;
455+
static const int FIELD_STATIC__Zero = 7;
456+
static const int FIELD_STATIC__MaxValue = 8;
457+
static const int FIELD_STATIC__MinValue = 9;
456458

457459
static const int FIELD___ticks = 1;
458460

@@ -482,9 +484,9 @@ struct Library_corlib_native_System_TimeSpan
482484

483485
struct Library_corlib_native_System_DateTime
484486
{
485-
static const int FIELD_STATIC__MinValue = 6;
486-
static const int FIELD_STATIC__MaxValue = 7;
487-
static const int FIELD_STATIC__UnixEpoch = 8;
487+
static const int FIELD_STATIC__MinValue = 10;
488+
static const int FIELD_STATIC__MaxValue = 11;
489+
static const int FIELD_STATIC__UnixEpoch = 12;
488490

489491
static const int FIELD___ticks = 1;
490492

@@ -552,13 +554,6 @@ struct Library_corlib_native_System_Diagnostics_Debugger
552554
//--//
553555
};
554556

555-
struct Library_corlib_native_System_Diagnostics_DebuggerBrowsableAttribute
556-
{
557-
static const int FIELD___state = 1;
558-
559-
//--//
560-
};
561-
562557
struct Library_corlib_native_System_UInt16
563558
{
564559
static const int FIELD__m_value = 1;
@@ -593,7 +588,7 @@ struct Library_corlib_native_System_Enum
593588

594589
struct Library_corlib_native_System_EventArgs
595590
{
596-
static const int FIELD_STATIC__Empty = 9;
591+
static const int FIELD_STATIC__Empty = 13;
597592

598593
//--//
599594
};
@@ -800,9 +795,16 @@ struct Library_corlib_native_System_Reflection_RuntimeMethodInfo
800795
//--//
801796
};
802797

803-
struct Library_corlib_native_System_Runtime_CompilerServices_AccessedThroughPropertyAttribute
798+
struct Library_corlib_native_System_Runtime_CompilerServices_NullableAttribute
804799
{
805-
static const int FIELD___propertyName = 1;
800+
static const int FIELD__NullableFlags = 1;
801+
802+
//--//
803+
};
804+
805+
struct Library_corlib_native_System_Runtime_CompilerServices_NullableContextAttribute
806+
{
807+
static const int FIELD__Flag = 1;
806808

807809
//--//
808810
};
@@ -862,7 +864,6 @@ struct Library_corlib_native_System_RuntimeType
862864

863865
struct Library_corlib_native_System_SByte
864866
{
865-
866867
static const int FIELD__m_value = 1;
867868

868869
//--//
@@ -971,7 +972,7 @@ struct Library_corlib_native_System_Threading_Thread
971972

972973
struct Library_corlib_native_System_Threading_Timeout
973974
{
974-
static const int FIELD_STATIC__InfiniteTimeSpan = 11;
975+
static const int FIELD_STATIC__InfiniteTimeSpan = 15;
975976

976977
//--//
977978
};

0 commit comments

Comments
 (0)