Skip to content

Commit e09d766

Browse files
jkotasmrvoorhe
authored andcommitted
Add missing dependencies in corelib binder
1 parent a2d3ab7 commit e09d766

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

src/coreclr/tools/aot/ILCompiler/ILCompiler_inbuild.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
66
<PublishDir>$(RuntimeBinDir)$(BuildArchitecture)/ilc/</PublishDir>
77
<SelfContained>true</SelfContained>
8-
<PublishTrimmed>true</PublishTrimmed>
8+
<!-- Re-enable once we pickup toolchain with https://github.com/dotnet/runtime/pull/113704 -->
9+
<!-- <PublishTrimmed>true</PublishTrimmed> -->
910
<!--
1011
Publish with AOT on Windows as Single file doesn't work well when an app has to include DiaSymReader.Native.
1112
Publish single-file elsewhere so we don't need to adjust our "AOT in build" logic to handle targeting the SDK RID.

src/coreclr/tools/aot/crossgen2/crossgen2_inbuild.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
66
<PublishDir>$(RuntimeBinDir)$(BuildArchitecture)/crossgen2/</PublishDir>
77
<SelfContained>true</SelfContained>
8-
<PublishTrimmed>true</PublishTrimmed>
8+
<!-- Re-enable once we pickup toolchain with https://github.com/dotnet/runtime/pull/113704 -->
9+
<!-- <PublishTrimmed>true</PublishTrimmed> -->
910
<!--
1011
Publish with AOT on Windows as Single file doesn't work well when an app has to include DiaSymReader.Native.
1112
Publish single-file elsewhere so we don't need to adjust our "AOT in build" logic to handle targeting the SDK RID.

src/coreclr/vm/corelib.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,9 @@ DEFINE_FIELD_U(m_value, ReflectMethodObject, m_pMD)
217217
DEFINE_CLASS(STUBMETHODINFO, System, RuntimeMethodInfoStub)
218218
DEFINE_FIELD(STUBMETHODINFO, HANDLE, m_value)
219219
DEFINE_METHOD(STUBMETHODINFO, FROMPTR, FromPtr, SM_IntPtr_RetObj)
220+
#ifdef FOR_ILLINK
221+
DEFINE_METHOD(STUBMETHODINFO, CTOR, .ctor, IM_RetVoid)
222+
#endif // FOR_ILLINK
220223

221224
DEFINE_CLASS(CONSTRUCTOR_INFO, Reflection, ConstructorInfo)
222225

@@ -548,6 +551,9 @@ DEFINE_FIELD_U(m_runtimeType, ReflectModuleBaseObject, m_runtim
548551
DEFINE_FIELD_U(m_runtimeAssembly, ReflectModuleBaseObject, m_runtimeAssembly)
549552
DEFINE_FIELD_U(m_pData, ReflectModuleBaseObject, m_pData)
550553
DEFINE_CLASS(MODULE, Reflection, RuntimeModule)
554+
#ifdef FOR_ILLINK
555+
DEFINE_METHOD(MODULE, CTOR, .ctor, IM_RetVoid)
556+
#endif // FOR_ILLINK
551557

552558
DEFINE_CLASS(TYPE_BUILDER, ReflectionEmit, TypeBuilder)
553559
DEFINE_CLASS(ENUM_BUILDER, ReflectionEmit, EnumBuilder)
@@ -610,6 +616,9 @@ DEFINE_CLASS(PARAMETER, Reflection, ParameterInfo)
610616
DEFINE_CLASS(PARAMETER_MODIFIER, Reflection, ParameterModifier)
611617

612618
DEFINE_CLASS(POINTER, Reflection, Pointer)
619+
#ifdef FOR_ILLINK
620+
DEFINE_METHOD(POINTER, CTOR, .ctor, IM_RetVoid)
621+
#endif // FOR_ILLINK
613622

614623
DEFINE_CLASS_U(Reflection, Pointer, ReflectionPointer)
615624
DEFINE_FIELD_U(_ptr, ReflectionPointer, _ptr)

0 commit comments

Comments
 (0)