Skip to content

Remove unnecessary reflection in Environment.GetFolderPathCore.Unix.cs #55677

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
stephentoub merged 1 commit into from
Jul 15, 2021
Merged

Remove unnecessary reflection in Environment.GetFolderPathCore.Unix.cs #55677

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 1 addition & 12 deletions src/libraries/System.Private.CoreLib/src/System/Environment.GetFolderPathCore.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ namespace System
{
public static partial class Environment
{
private static Func<string, object>? s_directoryCreateDirectory;

private static string GetFolderPathCore(SpecialFolder folder, SpecialFolderOption option)
{
// Get the path for the SpecialFolder
Expand All @@ -40,16 +38,7 @@ private static string GetFolderPathCore(SpecialFolder folder, SpecialFolderOptio

Debug.Assert(option == SpecialFolderOption.Create);

Func<string, object>? createDirectory = Volatile.Read(ref s_directoryCreateDirectory);
if (createDirectory is null)
{
Type dirType = Type.GetType("System.IO.Directory, System.IO.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", throwOnError: true)!;
MethodInfo mi = dirType.GetMethod("CreateDirectory", BindingFlags.Public | BindingFlags.Static)!;
createDirectory = mi.CreateDelegate<Func<string, object>>();
Volatile.Write(ref s_directoryCreateDirectory, createDirectory);
}

createDirectory(path);
Directory.CreateDirectory(path);

return path;
}
Expand Down