Add support for Properties (get/set) + make Disasmo less fragile around weirdly configured projects

EgorBo · EgorBo · commit 38e26cdb1496 · 2022-11-07T20:03:58.000+01:00
diff --git a/Disasmo/Resources/DisasmoLoader3.cs_template b/Disasmo/Resources/DisasmoLoader3.cs_template
@@ -32,6 +32,7 @@ public class DisasmoLoader
         if (fastType != null)
         {
             PrecompileMethods(fastType, methodName);
+            PrecompileProperties(fastType, methodName);
             return;
         }
 
@@ -44,6 +45,21 @@ public class DisasmoLoader
             if (type.FullName?.Replace('+', '.').Contains(typeName) == true)
             {
                 PrecompileMethods(type, methodName);
+                PrecompileProperties(type, methodName);
+            }
+        }
+    }
+
+    private static void PrecompileProperties(Type type, string propertyName)
+    {
+        foreach (PropertyInfo propInfo in type.GetProperties((BindingFlags)60))
+        {
+            if (propInfo.Name == "*" || propInfo.Name == propertyName)
+            {
+                if (propInfo.GetMethod != null)
+                    RuntimeHelpers.PrepareMethod(propInfo.GetMethod.MethodHandle);
+                if (propInfo.SetMethod != null)
+                    RuntimeHelpers.PrepareMethod(propInfo.SetMethod.MethodHandle);
             }
         }
     }
diff --git a/Disasmo/Utils/RemoteCheckedJitManager.cs b/Disasmo/Utils/RemoteCheckedJitManager.cs
diff --git a/Disasmo/Utils/SymbolUtils.cs b/Disasmo/Utils/SymbolUtils.cs
@@ -32,6 +32,12 @@ public static DisasmoSymbolInfo FromSymbol(ISymbol symbol)
                 methodName = symbol.Name;
             }
         }
+        else if (symbol is IPropertySymbol prop)
+        {
+            target = "*" + symbol.ContainingType.Name + ":get_" + symbol.Name + " " + "*" + symbol.ContainingType.Name + ":set_" + symbol.Name;
+            hostType = symbol.ContainingType.ToString();
+            methodName = symbol.Name;
+        }
         else
         {
             // the whole class
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+# 5.5.0
+
+* Added support for getters/setters (properties)
+* Minor improvements around dotnet-build
+
 # 5.4.1
 
 * Hot-fix for flowgraphs
diff --git a/src/Vsix/Analyzers/DisasmMethodOrClassAction.cs b/src/Vsix/Analyzers/DisasmMethodOrClassAction.cs
@@ -54,6 +54,8 @@ protected override async Task<bool> IsValidSymbol(Document document, int tokenPo
                     return true;
                 if (token.Parent is ConstructorDeclarationSyntax)
                     return true;
+                if (token.Parent is PropertyDeclarationSyntax)
+                    return true;
             }
             catch
             {
@@ -70,6 +72,9 @@ static ISymbol FindRelatedSymbol(SemanticModel semanticModel, SyntaxNode node, b
             if (node is MethodDeclarationSyntax m)
                 return semanticModel.GetDeclaredSymbol(m, ct);
 
+            if (node is PropertyDeclarationSyntax p)
+                return semanticModel.GetDeclaredSymbol(p, ct);
+
             if (node is ConstructorDeclarationSyntax ctor)
                 return semanticModel.GetDeclaredSymbol(ctor, ct);
 
diff --git a/src/Vsix/DisasmoPackage.cs b/src/Vsix/DisasmoPackage.cs
@@ -87,7 +87,7 @@ public static async Task<Version> GetLatestVersionOnline()
         public Version GetCurrentVersion()
         {
             //TODO: fix
-            return new Version(5, 4, 1);
+            return new Version(5, 5, 0);
 
             //try
             //{
diff --git a/src/Vsix/Properties/Settings.Designer.cs b/src/Vsix/Properties/Settings.Designer.cs
diff --git a/src/Vsix/Properties/Settings.settings b/src/Vsix/Properties/Settings.settings
@@ -56,5 +56,8 @@
     <Setting Name="DisableLightBulb" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="DontGuessTFM" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/src/Vsix/Utils/IdeUtils.cs b/src/Vsix/Utils/IdeUtils.cs
@@ -7,6 +7,7 @@
 using System.Windows;
 using Disasmo.Utils;
 using EnvDTE;
+using Microsoft.VisualStudio.ProjectSystem;
 using Microsoft.VisualStudio.ProjectSystem.Properties;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
@@ -98,8 +99,30 @@ public static void RunDiffTools(string contentLeft, string contentRight)
             }
         }
 
+        public static async Task<IProjectProperties> GetProjectProperties(UnconfiguredProject unconfiguredProject, string config)
+        {
+            try
+            {
+                // it will throw "Release config was not found" to the Output if there is no such config in the project
+                ProjectConfiguration releaseConfig = await unconfiguredProject.Services.ProjectConfigurationsService.GetProjectConfigurationAsync("Release");
+                ConfiguredProject configuredProject = await unconfiguredProject.LoadConfiguredProjectAsync(releaseConfig);
+                return configuredProject.Services.ProjectPropertiesProvider.GetCommonProperties();
+            }
+            catch
+            {
+                // VS was not able to find the given config (but it still might exist)
+                return null;
+            }
+        }
+
         public static async Task<(string, int)> GetTargetFramework(IProjectProperties projectProperties)
         {
+            if (projectProperties == null)
+            {
+                // It is likely hidden somewhere in props, TODO: find a better way
+                return ("net7.0", 7);
+            }
+
             try
             {
                 string tfms = await projectProperties.GetEvaluatedPropertyValueAsync("TargetFrameworks");
diff --git a/src/Vsix/ViewModels/MainViewModel.cs b/src/Vsix/ViewModels/MainViewModel.cs
@@ -16,7 +16,6 @@
 using Microsoft.VisualStudio.ProjectSystem;
 using Microsoft.VisualStudio.ProjectSystem.Properties;
 using System.Collections.ObjectModel;
-using Disasmo.Properties;
 
 namespace Disasmo
 {
@@ -40,8 +39,8 @@ public class MainViewModel : ViewModelBase
         // let's use new name for the temp folder each version to avoid possible issues (e.g. changes in the Disasmo.Loader)
         private string DisasmoFolder => "Disasmo-v" + DisasmoPackage.Current?.GetCurrentVersion();
 
-        public SettingsViewModel SettingsVm { get; } = new SettingsViewModel();
-        public IntrinsicsViewModel IntrinsicsVm { get; } = new IntrinsicsViewModel();
+        public SettingsViewModel SettingsVm { get; } = new();
+        public IntrinsicsViewModel IntrinsicsVm { get; } = new();
 
         public event Action MainPageRequested;
 
@@ -128,7 +127,6 @@ public string FgPngPath
             get => _fgPngPath;
             set => Set(ref _fgPngPath, value);
         }
-        
 
         public ICommand RefreshCommand => new RelayCommand(() => RunOperationAsync(_currentSymbol));
 
@@ -550,12 +548,7 @@ public async void RunOperationAsync(ISymbol symbol)
 
                 // Find Release-x64 configuration:
                 Project currentProject = dte.GetActiveProject();
-                UnconfiguredProject unconfiguredProject = GetUnconfiguredProject(currentProject);
-
-                // it will throw "Release config was not found" to the Output if there is no such config in the project
-                ProjectConfiguration releaseConfig = await unconfiguredProject.Services.ProjectConfigurationsService.GetProjectConfigurationAsync("Release");
-                ConfiguredProject configuredProject = await unconfiguredProject.LoadConfiguredProjectAsync(releaseConfig);
-                IProjectProperties projectProperties = configuredProject.Services.ProjectPropertiesProvider.GetCommonProperties();
+                IProjectProperties projectProperties = await IdeUtils.GetProjectProperties(GetUnconfiguredProject(currentProject), "Release");
 
                 ThrowIfCanceled();
 
@@ -635,7 +628,8 @@ public async void RunOperationAsync(ISymbol symbol)
                     }
                 }
 
-                DisasmoOutDir = Path.Combine(await projectProperties.GetEvaluatedPropertyValueAsync("OutputPath"), DisasmoFolder + (SettingsVm.UseDotnetPublishForReload ? "_published" : ""));
+                string outputDir = projectProperties == null ? "bin" : await projectProperties.GetEvaluatedPropertyValueAsync("OutputPath");
+                DisasmoOutDir = Path.Combine(outputDir, DisasmoFolder + (SettingsVm.UseDotnetPublishForReload ? "_published" : ""));
                 string currentProjectDirPath = Path.GetDirectoryName(_currentProjectPath);
 
                 dte.SaveAllActiveDocuments();
@@ -648,13 +642,15 @@ public async void RunOperationAsync(ISymbol symbol)
                     return;
                 }
 
+                string tfmPart = SettingsVm.DontGuessTFM ? "" : $"-f {_currentTf}";
+
                 ProcessResult publishResult;
                 if (SettingsVm.UseDotnetPublishForReload)
                 {
                     LoadingStatus = $"dotnet publish -r win-x64 -c Release -o ...";
 
                     string dotnetPublishArgs =
-                        $"publish -f {_currentTf} -r win-x64 -c Release -o {DisasmoOutDir} --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=false /p:WarningLevel=0 /p:TreatWarningsAsErrors=false -v:q";
+                        $"publish {tfmPart} -r win-x64 -c Release -o {DisasmoOutDir} --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=false /p:WarningLevel=0 /p:TreatWarningsAsErrors=false -v:q";
 
                     publishResult = await ProcessUtils.RunProcess("dotnet", dotnetPublishArgs, null, currentProjectDirPath, cancellationToken: UserCt);
                 }
@@ -669,23 +665,25 @@ public async void RunOperationAsync(ISymbol symbol)
 
                     LoadingStatus = "dotnet build -c Release -o ...";
 
-                    string dotnetBuildArgs = $"build -f {_currentTf} -c Release -o {DisasmoOutDir} --no-self-contained " +
+                    string dotnetBuildArgs = $"build {tfmPart} -c Release -o {DisasmoOutDir} --no-self-contained " +
                                              "/p:RuntimeIdentifier=\"\" " +
                                              "/p:RuntimeIdentifiers=\"\" " +
                                              "/p:WarningLevel=0 " +
                                              "/p:TreatWarningsAsErrors=false ";
-                    
-                    if (SettingsVm.UseNoRestoreFlag)
-                        dotnetBuildArgs += " --no-restore --no-dependencies --nologo";
 
-                    var fasterBuildArgs = new Dictionary<string, string>
+                    Dictionary<string, string> fasterBuildEnvVars = new Dictionary<string, string>
                     {
-                        ["DOTNET_TC_QuickJitForLoops"] = "1", // slightly speeds up build (not needed for >=.net7.0)
                         ["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1",
-                        ["DOTNET_MULTILEVEL_LOOKUP"] = "0",
                         ["DOTNET_CLI_TELEMETRY_OPTOUT"] = "1"
                     };
-                    publishResult = await ProcessUtils.RunProcess("dotnet", dotnetBuildArgs, fasterBuildArgs,
+
+                    if (SettingsVm.UseNoRestoreFlag)
+                    {
+                        dotnetBuildArgs += " --no-restore --no-dependencies --nologo";
+                        fasterBuildEnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0";
+                    }
+
+                    publishResult = await ProcessUtils.RunProcess("dotnet", dotnetBuildArgs, fasterBuildEnvVars,
                         currentProjectDirPath,
                         cancellationToken: UserCt);
                 }
diff --git a/src/Vsix/ViewModels/SettingsViewModel.cs b/src/Vsix/ViewModels/SettingsViewModel.cs
@@ -32,6 +32,7 @@ public class SettingsViewModel : ViewModelBase
         private bool _useTieredJit;
         private bool _useUnloadableContext;
         private bool _usePGO;
+        private bool _dontGuessTFM;
         private bool _useCustomRuntime;
         private ObservableCollection<string> _customJits;
         private string _selectedCustomJit;
@@ -59,6 +60,7 @@ public SettingsViewModel()
             UsePGO = Settings.Default.UsePGO;
             UseUnloadableContext = Settings.Default.UseUnloadableContext;
             DisableLightBulb = Settings.Default.DisableLightBulb;
+            DontGuessTFM = Settings.Default.DontGuessTFM;
             CheckUpdates();
         }
 
@@ -336,6 +338,17 @@ public bool UseTieredJit
             }
         }
 
+        public bool DontGuessTFM
+        {
+            get => _dontGuessTFM;
+            set
+            {
+                Set(ref _dontGuessTFM, value);
+                Settings.Default.DontGuessTFM = value;
+                Settings.Default.Save();
+            }
+        }
+
         public bool UseUnloadableContext
         {
             get => _useUnloadableContext;
diff --git a/src/Vsix/Views/DisasmWindowControl.xaml b/src/Vsix/Views/DisasmWindowControl.xaml
@@ -220,7 +220,10 @@
                                     <Run Foreground="Gray" Text=" (makes it faster, but can lead to build issues)" />
                                 </TextBlock>
                             </CheckBox>
+
+                            <!--DontGuessTFM-->
                         </StackPanel>
+                        <CheckBox Content="Don't guess project's TargetFramework" IsChecked="{Binding DontGuessTFM, Mode=TwoWay}" Margin="8,6,0,3"/>
 
                         <StackPanel Margin="12,16,0,0" Orientation="Horizontal">
                             <TextBlock Text="Path to Graphviz's dot.exe:"/>
diff --git a/src/Vsix/app.config b/src/Vsix/app.config
@@ -61,6 +61,9 @@
             <setting name="DisableLightBulb" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="DontGuessTFM" serializeAs="String">
+                <value>False</value>
+            </setting>
         </Disasmo.Properties.Settings>
     </userSettings>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
diff --git a/src/Vsix/source.extension.vsixmanifest b/src/Vsix/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="Disasmo.39513ef5-c3ee-4547-b7be-f29c752b591d" Version="5.4.1" Language="en-US" Publisher="Egor Bogatov" />
+        <Identity Id="Disasmo.39513ef5-c3ee-4547-b7be-f29c752b591d" Version="5.5.0" Language="en-US" Publisher="Egor Bogatov" />
         <DisplayName>Disasmo</DisplayName>
         <Description xml:space="preserve" >VS2022 Add-in. Click on any method to see what ASM JIT will generate for it. </Description>
         <MoreInfo>https://github.com/EgorBo/disasmo</MoreInfo>

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public class DisasmoLoader`
`32`	`32`	`if (fastType != null)`
`33`	`33`	`{`
`34`	`34`	`PrecompileMethods(fastType, methodName);`
	`35`	`+ PrecompileProperties(fastType, methodName);`
`35`	`36`	`return;`
`36`	`37`	`}`
`37`	`38`
`@@ -44,6 +45,21 @@ public class DisasmoLoader`
`44`	`45`	`if (type.FullName?.Replace('+', '.').Contains(typeName) == true)`
`45`	`46`	`{`
`46`	`47`	`PrecompileMethods(type, methodName);`
	`48`	`+ PrecompileProperties(type, methodName);`
	`49`	`+ }`
	`50`	`+ }`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ private static void PrecompileProperties(Type type, string propertyName)`
	`54`	`+ {`
	`55`	`+ foreach (PropertyInfo propInfo in type.GetProperties((BindingFlags)60))`
	`56`	`+ {`
	`57`	`+ if (propInfo.Name == "*" \|\| propInfo.Name == propertyName)`
	`58`	`+ {`
	`59`	`+ if (propInfo.GetMethod != null)`
	`60`	`+ RuntimeHelpers.PrepareMethod(propInfo.GetMethod.MethodHandle);`
	`61`	`+ if (propInfo.SetMethod != null)`
	`62`	`+ RuntimeHelpers.PrepareMethod(propInfo.SetMethod.MethodHandle);`
`47`	`63`	`}`
`48`	`64`	`}`
`49`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,12 @@ public static DisasmoSymbolInfo FromSymbol(ISymbol symbol)`
`32`	`32`	`methodName = symbol.Name;`
`33`	`33`	`}`
`34`	`34`	`}`
	`35`	`+ else if (symbol is IPropertySymbol prop)`
	`36`	`+ {`
	`37`	`+ target = "" + symbol.ContainingType.Name + ":get_" + symbol.Name + " " + "" + symbol.ContainingType.Name + ":set_" + symbol.Name;`
	`38`	`+ hostType = symbol.ContainingType.ToString();`
	`39`	`+ methodName = symbol.Name;`
	`40`	`+ }`
`35`	`41`	`else`
`36`	`42`	`{`
`37`	`43`	`// the whole class`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public static async Task<Version> GetLatestVersionOnline()`
`87`	`87`	`public Version GetCurrentVersion()`
`88`	`88`	`{`
`89`	`89`	`//TODO: fix`
`90`		`- return new Version(5, 4, 1);`
	`90`	`+ return new Version(5, 5, 0);`
`91`	`91`
`92`	`92`	`//try`
`93`	`93`	`//{`