Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update dependencies from mono/linker #50232

Merged
merged 6 commits into from
Mar 29, 2021
Merged

[main] Update dependencies from mono/linker #50232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db50866
Update dependencies from https://github.com/mono/linker build 20210324.1
dotnet-maestro[bot] Mar 25, 2021
1c92ebf
Update dependencies from https://github.com/mono/linker build 20210326.1
dotnet-maestro[bot] Mar 27, 2021
ee26d45
Update dependencies from https://github.com/mono/linker build 20210327.1
dotnet-maestro[bot] Mar 27, 2021
223e4c0
Add missing annotations
marek-safar Mar 28, 2021
8b33f93
Always keep ValueType constructor
marek-safar Mar 28, 2021
1b6e11f
Fix exceptions descriptors to match what native lookup expects
marek-safar Mar 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21172.2">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21177.1">
<Uri>https://github.com/mono/linker</Uri>
<Sha>2f5594e95e1a5227103b9b7d6b92f4b2250be2d7</Sha>
<Sha>318105ce4619c651d26caeed4cb32c63eefdf3ee</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21173.1">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>6.0.100-preview.2.21172.2</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkTasksVersion>6.0.100-preview.2.21177.1</MicrosoftNETILLinkTasksVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.4.21172.5</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- Mono LLVM -->
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ internal static bool HasElementType(RuntimeType type)
return outHandles;
}

internal static object CreateInstanceForAnotherGenericParameter(RuntimeType type, RuntimeType genericParameter)
internal static object CreateInstanceForAnotherGenericParameter([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.NonPublicConstructors)] RuntimeType type, RuntimeType genericParameter)
{
object? instantiatedObject = null;

Expand All @@ -224,7 +224,7 @@ internal static object CreateInstanceForAnotherGenericParameter(RuntimeType type
return instantiatedObject!;
}

internal static object CreateInstanceForAnotherGenericParameter(RuntimeType type, RuntimeType genericParameter1, RuntimeType genericParameter2)
internal static object CreateInstanceForAnotherGenericParameter([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.NonPublicConstructors)] RuntimeType type, RuntimeType genericParameter1, RuntimeType genericParameter2)
{
object? instantiatedObject = null;

Expand Down
39 changes: 20 additions & 19 deletions src/mono/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<!-- exception.c (mono_get_exception_argument_null) -->
<type fullname="System.ArgumentNullException">
<!-- mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
<!-- create_exception_two_strings -->
<method signature="System.Void .ctor(System.String,System.String)" />
</type>
Expand Down Expand Up @@ -61,7 +61,7 @@
<!-- exception.c / mono-error.c -->
<type fullname="System.BadImageFormatException">
<!-- mono_get_exception_bad_image_format / mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
<!-- mono_get_exception_bad_image_format2 / mono_exception_from_name_two_strings -->
<method signature="System.Void .ctor(System.String,System.String)" />
</type>
Expand Down Expand Up @@ -125,7 +125,7 @@
<!-- loader.c: returned (as a string) from mono_lookup_pinvoke_call and used in … -->
<type fullname="System.EntryPointNotFoundException">
<!-- mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
</type>

<type fullname="System.Environment">
Expand Down Expand Up @@ -156,13 +156,13 @@

<type fullname="System.FormatException">
<!-- icall.c (base64_to_byte_array) mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
</type>

<!-- exception.c: mono_get_exception_index_out_of_range - used by many in icall.c and in socket-io.c -->
<type fullname="System.IndexOutOfRangeException">
<!-- mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
</type>

<!-- domain.c: mono_defaults.int16_class -->
Expand Down Expand Up @@ -195,13 +195,12 @@
<!-- exception.c (mono_get_exception_invalid_operation) -->
<type fullname="System.InvalidOperationException">
<!-- mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
</type>

<!-- mini.c: mono_jit_compile_method_inner (looks like one case is JITted, AOT too) -->
<type fullname="System.InvalidProgramException">
<!-- mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<!-- mono_runtime_object_init_handle -->
<method signature="System.Void .ctor()" />
</type>
Expand All @@ -214,15 +213,12 @@
<type fullname="System.MethodAccessException">
<!-- exception.c: mono_get_exception_method_access / mono_exception_from_name -->
<method signature="System.Void .ctor()" />
<!-- exception.c: mono_get_exception_method_access_msg / mono_exception_from_name_msg -->
<!-- mini.c (mono_jit_compiler_method_inner) mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
</type>

<!-- mini.c (mono_jit_compiler_method_inner) / mono-error.c -->
<type fullname="System.MissingFieldException">
<!-- mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
</type>

<type fullname="System.MissingMethodException">
Expand Down Expand Up @@ -386,7 +382,7 @@
<!-- exception.c (mono_get_exception_type_load) -->
<type fullname="System.TypeLoadException">
<!-- mini.c (mono_jit_compiler_method_inner) mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
<!-- mono_exception_from_name_two_strings -->
<method signature="System.Void .ctor(System.String,System.String)" />
</type>
Expand Down Expand Up @@ -448,7 +444,7 @@

<type fullname="System.IO.FileNotFoundException">
<!-- mini.c (mono_jit_compiler_method_inner) mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
<!-- exception.c (mono_get_exception_file_not_found and mono_get_exception_file_not_found) -->
<!-- mono_exception_from_name_two_strings -->
<method signature="System.Void .ctor(System.String,System.String)" />
Expand All @@ -457,7 +453,7 @@
<!-- exception.c (mono_get_exception_io) -->
<type fullname="System.IO.IOException">
<!-- mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
</type>

<!-- appdomain.c (ves_icall_System_Runtime_Loader_AssemblyLoadContext_InternalGetLoadedAssemblies) -->
Expand Down Expand Up @@ -537,13 +533,13 @@
<!-- icall.c: ves_icall_InternalInvoke -->
<type fullname="System.Reflection.TargetException">
<!-- mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
</type>

<!-- icall.c: ves_icall_InternalInvoke -->
<type fullname="System.Reflection.TargetParameterCountException">
<!-- mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
</type>

<!-- exception.c: mono_get_exception_runtime_wrapped () -->
Expand All @@ -566,7 +562,8 @@

<!-- marshal.c: mono_mb_emit_exception_marshal_directive -->
<type fullname="System.Runtime.InteropServices.MarshalDirectiveException">
<method signature="System.Void .ctor(System.String)" />
<!-- mono_mb_emit_exception_marshal_directive -->
<method signature="System.Void .ctor()" />
</type>

<!-- native-library.c: mono_class_get_native_library_class -->
Expand All @@ -585,7 +582,7 @@
<!-- exception.c (mono_get_exception_synchronization_lock) -->
<type fullname="System.Threading.SynchronizationLockException">
<!-- mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
</type>

<!-- domain.c: mono_defaults.thread_class -->
Expand All @@ -608,7 +605,7 @@
<!-- exception.c (mono_get_exception_thread_abort) -->
<type fullname="System.Threading.ThreadStateException">
<!-- mono_exception_from_name_msg -->
<method signature="System.Void .ctor(System.String)" />
<method signature="System.Void .ctor()" />
</type>

<!-- mini-generic-sharing.c -->
Expand Down Expand Up @@ -651,5 +648,9 @@
<method name="ApplyUpdateSdb" />
</type>

<type fullname="System.ValueType">
<!-- https://github.com/dotnet/runtime/issues/47909 -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why this issue is attached to this entry. The issue says

Remove DynamicDependency from ValueType in browser builds

But this entry is unconditionally preserving the constructor on ValueType, which are two different things in my mind.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can remove it from the xml if you want. It's only a reminder to remove it once we land final solution for System.Runtime.InteropServices.JavaScript.Runtime dependency.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain why we need ValueType.ctor() in the xml?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have some tiny sample which managed to not require ValueType hence dropping the required dependency.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to remove this comment, since it isn't relevant to what is being done here in the xml. I can do that in a follow up PR, so we can merge this to unblock the integration.

<method signature="System.Void .ctor()" />
</type>
</assembly>
</linker>