Skip to content

Ifdef out DynamicDependencies that are not necessary #87209

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

Merged
merged 2 commits into from
Jun 8, 2023
Merged

Ifdef out DynamicDependencies that are not necessary #87209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b1bd18
Ifdef out DynamicDependencies that are not necessary
MichalStrehovsky Jun 7, 2023
82de734
FB
MichalStrehovsky Jun 7, 2023
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: 4 additions & 0 deletions src/libraries/System.Private.CoreLib/src/System/AppContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,14 @@ public static void SetData(string name, object? data)
}

#pragma warning disable CS0067 // events raised by the VM
#if !NATIVEAOT
[field: DynamicDependency(DynamicallyAccessedMemberTypes.PublicConstructors, typeof(UnhandledExceptionEventArgs))]
#endif
internal static event UnhandledExceptionEventHandler? UnhandledException;

#if !NATIVEAOT
[field: DynamicDependency(DynamicallyAccessedMemberTypes.PublicConstructors, typeof(FirstChanceExceptionEventArgs))]
#endif
internal static event EventHandler<FirstChanceExceptionEventArgs>? FirstChanceException;
#pragma warning restore CS0067

Expand Down
18 changes: 18 additions & 0 deletions src/libraries/System.Private.CoreLib/src/System/String.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ public sealed partial class String
*/

[MethodImpl(MethodImplOptions.InternalCall)]
#if !NATIVEAOT
[DynamicDependency("Ctor(System.Char[])")]
#endif
public extern String(char[]? value);

private static string Ctor(char[]? value)
Expand All @@ -88,7 +90,9 @@ private static string Ctor(char[]? value)
}

[MethodImpl(MethodImplOptions.InternalCall)]
#if !NATIVEAOT
[DynamicDependency("Ctor(System.Char[],System.Int32,System.Int32)")]
#endif
public extern String(char[] value, int startIndex, int length);

private static string Ctor(char[] value, int startIndex, int length)
Expand All @@ -113,7 +117,9 @@ private static string Ctor(char[] value, int startIndex, int length)

[CLSCompliant(false)]
[MethodImpl(MethodImplOptions.InternalCall)]
#if !NATIVEAOT
[DynamicDependency("Ctor(System.Char*)")]
#endif
public extern unsafe String(char* value);

private static unsafe string Ctor(char* ptr)
Expand All @@ -137,7 +143,9 @@ private static unsafe string Ctor(char* ptr)

[CLSCompliant(false)]
[MethodImpl(MethodImplOptions.InternalCall)]
#if !NATIVEAOT
[DynamicDependency("Ctor(System.Char*,System.Int32,System.Int32)")]
#endif
public extern unsafe String(char* value, int startIndex, int length);

private static unsafe string Ctor(char* ptr, int startIndex, int length)
Expand Down Expand Up @@ -169,7 +177,9 @@ private static unsafe string Ctor(char* ptr, int startIndex, int length)

[CLSCompliant(false)]
[MethodImpl(MethodImplOptions.InternalCall)]
#if !NATIVEAOT
[DynamicDependency("Ctor(System.SByte*)")]
#endif
public extern unsafe String(sbyte* value);

private static unsafe string Ctor(sbyte* value)
Expand All @@ -185,7 +195,9 @@ private static unsafe string Ctor(sbyte* value)

[CLSCompliant(false)]
[MethodImpl(MethodImplOptions.InternalCall)]
#if !NATIVEAOT
[DynamicDependency("Ctor(System.SByte*,System.Int32,System.Int32)")]
#endif
public extern unsafe String(sbyte* value, int startIndex, int length);

private static unsafe string Ctor(sbyte* value, int startIndex, int length)
Expand Down Expand Up @@ -239,7 +251,9 @@ private static unsafe string CreateStringForSByteConstructor(byte* pb, int numBy

[CLSCompliant(false)]
[MethodImpl(MethodImplOptions.InternalCall)]
#if !NATIVEAOT
[DynamicDependency("Ctor(System.SByte*,System.Int32,System.Int32,System.Text.Encoding)")]
#endif
public extern unsafe String(sbyte* value, int startIndex, int length, Encoding enc);

private static unsafe string Ctor(sbyte* value, int startIndex, int length, Encoding? enc)
Expand Down Expand Up @@ -268,7 +282,9 @@ private static unsafe string Ctor(sbyte* value, int startIndex, int length, Enco
}

[MethodImpl(MethodImplOptions.InternalCall)]
#if !NATIVEAOT
[DynamicDependency("Ctor(System.Char,System.Int32)")]
#endif
public extern String(char c, int count);

private static string Ctor(char c, int count)
Expand All @@ -288,7 +304,9 @@ private static string Ctor(char c, int count)
}

[MethodImpl(MethodImplOptions.InternalCall)]
#if !NATIVEAOT
[DynamicDependency("Ctor(System.ReadOnlySpan{System.Char})")]
#endif
public extern String(ReadOnlySpan<char> value);

private static unsafe string Ctor(ReadOnlySpan<char> value)
Expand Down