Add support for C# overriden operators

EgorBo · EgorBo · commit 1cc6d7999388 · 2023-01-18T21:52:12.000+01:00
Fix crossgen2 with net8.0
Fix default args for NativeAOT
Fix "click for releasenotes" link
diff --git a/Disasmo/Disasmo.csproj b/Disasmo/Disasmo.csproj
@@ -6,8 +6,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <EmbeddedResource Include="Resources\DisasmoLoader3.csproj_template" />
-      <EmbeddedResource Include="Resources\DisasmoLoader3.cs_template" />
+      <EmbeddedResource Include="Resources\DisasmoLoader4.csproj_template" />
+      <EmbeddedResource Include="Resources\DisasmoLoader4.cs_template" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Disasmo/Resources/DisasmoLoader4.cs_template b/Disasmo/Resources/DisasmoLoader4.cs_template
@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.Loader;
 
 // A small console app to load a specific assembly via ALC and precompile specified methods
-//   "DisasmoLoader3 MyDll.dll MyType MyMethod False"
+//   "DisasmoLoader4 MyDll.dll MyType MyMethod False"
 
 public class DisasmoLoader
 {
diff --git a/Disasmo/Resources/DisasmoLoader4.csproj_template b/Disasmo/Resources/DisasmoLoader4.csproj_template
@@ -6,6 +6,6 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <OutputPath>out</OutputPath>
-	  <AssemblyName>DisasmoLoader3</AssemblyName>
+	  <AssemblyName>DisasmoLoader4</AssemblyName>
   </PropertyGroup>
 </Project>
diff --git a/Disasmo/Utils/LoaderAppManager.cs b/Disasmo/Utils/LoaderAppManager.cs
@@ -10,11 +10,12 @@ namespace Disasmo.Utils
     // Rebuilds it when the Add-in updates or SDK's version changes.
     public static class LoaderAppManager
     {
-        public const string DisasmoLoaderName = "DisasmoLoader3";
+        public static readonly string DisasmoLoaderName = "DisasmoLoader4";
 
         private static async Task<string> GetPathToLoader(string tf, Version addinVersion, CancellationToken ct)
         {
             ProcessResult dotnetVersion = await ProcessUtils.RunProcess("dotnet", "--version", cancellationToken: ct);
+            UserLogger.AppendText($"dotnet --version: {dotnetVersion.Output} ({dotnetVersion.Error})");
             return Path.Combine(Path.GetTempPath(), DisasmoLoaderName, $"{addinVersion}_{tf}_{dotnetVersion.Output}");
         }
 
diff --git a/src/Vsix/Analyzers/DisasmMethodOrClassAction.cs b/src/Vsix/Analyzers/DisasmMethodOrClassAction.cs
@@ -8,10 +8,8 @@
 
 namespace Disasmo
 {
-
     internal class DisasmMethodOrClassAction : BaseSuggestedAction
     {
-
         public DisasmMethodOrClassAction(CommonSuggestedActionsSource actionsSource) : base(actionsSource) {}
 
         public override async void Invoke(CancellationToken cancellationToken)
@@ -27,7 +25,8 @@ public override async void Invoke(CancellationToken cancellationToken)
                     }
                 }
             }
-            catch {
+            catch
+            {
             }
         }
 
@@ -56,6 +55,8 @@ protected override async Task<bool> IsValidSymbol(Document document, int tokenPo
                     return true;
                 if (token.Parent is PropertyDeclarationSyntax)
                     return true;
+                if (token.Parent is OperatorDeclarationSyntax)
+                    return true;
             }
             catch
             {
@@ -75,6 +76,9 @@ static ISymbol FindRelatedSymbol(SemanticModel semanticModel, SyntaxNode node, b
             if (node is PropertyDeclarationSyntax p)
                 return semanticModel.GetDeclaredSymbol(p, ct);
 
+            if (node is OperatorDeclarationSyntax o)
+                return semanticModel.GetDeclaredSymbol(o, ct);
+
             if (node is ConstructorDeclarationSyntax ctor)
                 return semanticModel.GetDeclaredSymbol(ctor, ct);
 
diff --git a/src/Vsix/DisasmoPackage.cs b/src/Vsix/DisasmoPackage.cs
@@ -74,6 +74,7 @@ public static async Task<Version> GetLatestVersionOnline()
             try
             {
                 await Task.Delay(3000);
+                return new Version(5, 5, 2);
                 // is there an API to do it? I don't care - let's parse html :D
                 var client = new HttpClient();
                 string str = await client.GetStringAsync("https://marketplace.visualstudio.com/items?itemName=EgorBogatov.Disasmo");
@@ -87,7 +88,7 @@ public static async Task<Version> GetLatestVersionOnline()
         public Version GetCurrentVersion()
         {
             //TODO: fix
-            return new Version(5, 5, 0);
+            return new Version(5, 5, 1);
 
             //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
@@ -11,8 +11,8 @@
     <Setting Name="ShowAsmComments_V9" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="CustomEnvVars3_V13" Type="System.String" Scope="User">
-      <Value Profile="(Default)">DOTNET_JitDiffableDasm=0;;DOTNET_ReadyToRun=1;;</Value>
+    <Setting Name="CustomEnvVars3_V14" Type="System.String" Scope="User">
+      <Value Profile="(Default)">DOTNET_JitDiffableDasm=0;;DOTNET_ReadyToRun=1;;DOTNET_TieredPGO_InstrumentOnlyHotCode=0</Value>
     </Setting>
     <Setting Name="UseDotnetBuildForReload_V9" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
@@ -44,11 +44,11 @@
     <Setting Name="UsePGO" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="CrossgenArgs_V5" Type="System.String" Scope="User">
+    <Setting Name="CrossgenArgs_V6" Type="System.String" Scope="User">
       <Value Profile="(Default)">--targetos windows --targetarch x64 --inputbubble --instruction-set skylake --compilebubblegenerics --parallelism 1 -O</Value>
     </Setting>
-    <Setting Name="IlcArgs_V4" Type="System.String" Scope="User">
-      <Value Profile="(Default)">-o:nativeaotbin;;-r:%DOTNET_REPO%\artifacts\bin\coreclr\windows.x64.Checked\aotsdk\*.dll;;-r:%DOTNET_REPO%\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64\lib\net7.0\*.dll;;-g;;-O;;--initassembly:System.Private.CoreLib;;--initassembly:System.Private.StackTraceMetadata;;--initassembly:System.Private.TypeLoader;;--initassembly:System.Private.Reflection.Execution;;--directpinvokelist:%DOTNET_REPO%\artifacts\bin\coreclr\windows.x64.Checked\build\WindowsAPIs.txt;;--directpinvoke:System.Globalization.Native;;--stacktracedata;;--scanreflection;;--feature:System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization=false;;--feature:System.Resources.ResourceManager.AllowCustomResourceTypes=false;;--feature:System.Linq.Expressions.CanCompileToIL=false;;--feature:System.Linq.Expressions.CanEmitObjectArrayDelegate=false;;--feature:System.Linq.Expressions.CanCreateArbitraryDelegates=false</Value>
+    <Setting Name="IlcArgs_V6" Type="System.String" Scope="User">
+      <Value Profile="(Default)">-o:nativeaotbin;;-r:%DOTNET_REPO%\artifacts\bin\coreclr\windows.x64.Release\aotsdk\*.dll;;-r:%DOTNET_REPO%\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64\lib\net8.0\*.dll;;-g;;-O;;--initassembly:System.Private.CoreLib;;--initassembly:System.Private.StackTraceMetadata;;--initassembly:System.Private.TypeLoader;;--initassembly:System.Private.Reflection.Execution;;--directpinvokelist:%DOTNET_REPO%\artifacts\bin\coreclr\windows.x64.Checked\build\WindowsAPIs.txt;;--directpinvoke:System.Globalization.Native;;--directpinvoke:System.IO.Compression.Native;;--stacktracedata;;--scanreflection;;--feature:System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization=false;;--feature:System.Resources.ResourceManager.AllowCustomResourceTypes=false;;--feature:System.Linq.Expressions.CanCompileToIL=false;;--feature:System.Linq.Expressions.CanEmitObjectArrayDelegate=false;;--feature:System.Linq.Expressions.CanCreateArbitraryDelegates=false;;--feature:System.Diagnostics.Tracing.EventSource.IsSupported=false;;</Value>
     </Setting>
     <Setting Name="UseUnloadableContext" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
diff --git a/src/Vsix/ViewModels/MainViewModel.cs b/src/Vsix/ViewModels/MainViewModel.cs
@@ -243,10 +243,8 @@ public async Task RunFinalExe(DisasmoSymbolInfo symbolInfo)
                     if (!runtimePackFound)
                         return;
 
-                    command = "";
-                    executable = Path.Combine(clrCheckedFilesDir, "crossgen2", "crossgen2.exe");
-
-                    command += " --out aot ";
+                    executable = Path.Combine(SettingsVm.PathToLocalCoreClr, "dotnet.cmd");
+                    command = $"{Path.Combine(clrCheckedFilesDir, "crossgen2", "crossgen2.dll")} --out aot ";
 
                     foreach (var envVar in envVars)
                     {
diff --git a/src/Vsix/ViewModels/SettingsViewModel.cs b/src/Vsix/ViewModels/SettingsViewModel.cs
@@ -43,9 +43,9 @@ public SettingsViewModel()
         {
             PathToLocalCoreClr = Settings.Default.PathToCoreCLR_V9;
             ShowAsmComments = Settings.Default.ShowAsmComments_V9;
-            CustomEnvVars = Settings.Default.CustomEnvVars3_V13.Replace(";;", Environment.NewLine);
-            Crossgen2Args = Settings.Default.CrossgenArgs_V5;
-            IlcArgs = Settings.Default.IlcArgs_V4.Replace(";;", Environment.NewLine);
+            CustomEnvVars = Settings.Default.CustomEnvVars3_V14.Replace(";;", Environment.NewLine);
+            Crossgen2Args = Settings.Default.CrossgenArgs_V6;
+            IlcArgs = Settings.Default.IlcArgs_V6.Replace(";;", Environment.NewLine);
             JitDumpInsteadOfDisasm = Settings.Default.JitDumpInsteadOfDisasm_V9;
             UseDotnetBuildForReload = Settings.Default.UseDotnetBuildForReload_V9;
             RunAppMode = Settings.Default.RunAppMode_V9;
@@ -381,7 +381,7 @@ public string CustomEnvVars
             set
             {
                 Set(ref _customEnvVars, value);
-                Settings.Default.CustomEnvVars3_V13 = value;
+                Settings.Default.CustomEnvVars3_V14 = value;
                 Settings.Default.Save();
             }
         }
@@ -392,7 +392,7 @@ public string Crossgen2Args
             set
             {
                 Set(ref _crossgen2Args, value);
-                Settings.Default.CrossgenArgs_V5 = value;
+                Settings.Default.CrossgenArgs_V6 = value;
                 Settings.Default.Save();
             }
         }
@@ -403,7 +403,7 @@ public string IlcArgs
             set
             {
                 Set(ref _ilcArgs, value);
-                Settings.Default.IlcArgs_V4 = value;
+                Settings.Default.IlcArgs_V6 = value;
                 Settings.Default.Save();
             }
         }
diff --git a/src/Vsix/Views/DisasmWindowControl.xaml b/src/Vsix/Views/DisasmWindowControl.xaml
@@ -322,8 +322,7 @@
 
                 <StackPanel Orientation="Horizontal" Visibility="{Binding SettingsVm.UpdateIsAvailable, Converter={StaticResource BooleanToVisibility}}">
                     <TextBlock Margin="20,0,0,0" Foreground="#871CAE" FontWeight="SemiBold">
-                        <Hyperlink RequestNavigate="OnOpenReleaseNotes" Foreground="#871CAE">Update is available, click for release notes - </Hyperlink>
-                        <Run Text="{Binding SettingsVm.AvailableVersion}" />
+                        <Hyperlink RequestNavigate="OnOpenReleaseNotes" NavigateUri="https://github.com/EgorBo/Disasmo/blob/main/RELEASE_NOTES.md" Foreground="#871CAE">Update is available, click for release notes</Hyperlink>
                     </TextBlock>
                 </StackPanel>
 
diff --git a/src/Vsix/Views/DisasmWindowControl.xaml.cs b/src/Vsix/Views/DisasmWindowControl.xaml.cs
@@ -80,7 +80,7 @@ private void OnOpenReleaseNotes(object s, RequestNavigateEventArgs e)
         {
             try
             {
-                IdeUtils.DTE().ItemOperations.OpenFile("https://github.com/EgorBo/Disasmo/blob/main/RELEASE_NOTES.md");
+                Process.Start(e.Uri.ToString());
             }
             catch { }
         }
diff --git a/src/Vsix/app.config b/src/Vsix/app.config
@@ -16,8 +16,8 @@
             <setting name="ShowAsmComments_V9" serializeAs="String">
                 <value>False</value>
             </setting>
-            <setting name="CustomEnvVars3_V13" serializeAs="String">
-                <value>DOTNET_JitDiffableDasm=0;;DOTNET_ReadyToRun=1;;</value>
+            <setting name="CustomEnvVars3_V14" serializeAs="String">
+                <value>DOTNET_JitDiffableDasm=0;;DOTNET_ReadyToRun=1;;DOTNET_TieredPGO_InstrumentOnlyHotCode=0</value>
             </setting>
             <setting name="UseDotnetBuildForReload_V9" serializeAs="String">
                 <value>True</value>
@@ -49,11 +49,11 @@
             <setting name="UsePGO" serializeAs="String">
                 <value>False</value>
             </setting>
-            <setting name="CrossgenArgs_V5" serializeAs="String">
+            <setting name="CrossgenArgs_V6" serializeAs="String">
                 <value>--targetos windows --targetarch x64 --inputbubble --instruction-set skylake --compilebubblegenerics --parallelism 1 -O</value>
             </setting>
-            <setting name="IlcArgs_V4" serializeAs="String">
-                <value>-o:nativeaotbin;;-r:%DOTNET_REPO%\artifacts\bin\coreclr\windows.x64.Checked\aotsdk\*.dll;;-r:%DOTNET_REPO%\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64\lib\net7.0\*.dll;;-g;;-O;;--initassembly:System.Private.CoreLib;;--initassembly:System.Private.StackTraceMetadata;;--initassembly:System.Private.TypeLoader;;--initassembly:System.Private.Reflection.Execution;;--directpinvokelist:%DOTNET_REPO%\artifacts\bin\coreclr\windows.x64.Checked\build\WindowsAPIs.txt;;--directpinvoke:System.Globalization.Native;;--stacktracedata;;--scanreflection;;--feature:System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization=false;;--feature:System.Resources.ResourceManager.AllowCustomResourceTypes=false;;--feature:System.Linq.Expressions.CanCompileToIL=false;;--feature:System.Linq.Expressions.CanEmitObjectArrayDelegate=false;;--feature:System.Linq.Expressions.CanCreateArbitraryDelegates=false</value>
+            <setting name="IlcArgs_V6" serializeAs="String">
+                <value>-o:nativeaotbin;;-r:%DOTNET_REPO%\artifacts\bin\coreclr\windows.x64.Release\aotsdk\*.dll;;-r:%DOTNET_REPO%\artifacts\bin\microsoft.netcore.app.runtime.win-x64\Release\runtimes\win-x64\lib\net8.0\*.dll;;-g;;-O;;--initassembly:System.Private.CoreLib;;--initassembly:System.Private.StackTraceMetadata;;--initassembly:System.Private.TypeLoader;;--initassembly:System.Private.Reflection.Execution;;--directpinvokelist:%DOTNET_REPO%\artifacts\bin\coreclr\windows.x64.Checked\build\WindowsAPIs.txt;;--directpinvoke:System.Globalization.Native;;--directpinvoke:System.IO.Compression.Native;;--stacktracedata;;--scanreflection;;--feature:System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization=false;;--feature:System.Resources.ResourceManager.AllowCustomResourceTypes=false;;--feature:System.Linq.Expressions.CanCompileToIL=false;;--feature:System.Linq.Expressions.CanEmitObjectArrayDelegate=false;;--feature:System.Linq.Expressions.CanCreateArbitraryDelegates=false;;--feature:System.Diagnostics.Tracing.EventSource.IsSupported=false;;</value>
             </setting>
             <setting name="UseUnloadableContext" serializeAs="String">
                 <value>False</value>

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;`
`6`	`6`	`using System.Runtime.Loader;`
`7`	`7`
`8`	`8`	`// A small console app to load a specific assembly via ALC and precompile specified methods`
`9`		`-// "DisasmoLoader3 MyDll.dll MyType MyMethod False"`
	`9`	`+// "DisasmoLoader4 MyDll.dll MyType MyMethod False"`
`10`	`10`
`11`	`11`	`public class DisasmoLoader`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,12 @@ namespace Disasmo.Utils`
`10`	`10`	`// Rebuilds it when the Add-in updates or SDK's version changes.`
`11`	`11`	`public static class LoaderAppManager`
`12`	`12`	`{`
`13`		`- public const string DisasmoLoaderName = "DisasmoLoader3";`
	`13`	`+ public static readonly string DisasmoLoaderName = "DisasmoLoader4";`
`14`	`14`
`15`	`15`	`private static async Task<string> GetPathToLoader(string tf, Version addinVersion, CancellationToken ct)`
`16`	`16`	`{`
`17`	`17`	`ProcessResult dotnetVersion = await ProcessUtils.RunProcess("dotnet", "--version", cancellationToken: ct);`
	`18`	`+ UserLogger.AppendText($"dotnet --version: {dotnetVersion.Output} ({dotnetVersion.Error})");`
`18`	`19`	`return Path.Combine(Path.GetTempPath(), DisasmoLoaderName, $"{addinVersion}_{tf}_{dotnetVersion.Output}");`
`19`	`20`	`}`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,8 @@`
`8`	`8`
`9`	`9`	`namespace Disasmo`
`10`	`10`	`{`
`11`		`-`
`12`	`11`	`internal class DisasmMethodOrClassAction : BaseSuggestedAction`
`13`	`12`	`{`
`14`		`-`
`15`	`13`	`public DisasmMethodOrClassAction(CommonSuggestedActionsSource actionsSource) : base(actionsSource) {}`
`16`	`14`
`17`	`15`	`public override async void Invoke(CancellationToken cancellationToken)`
`@@ -27,7 +25,8 @@ public override async void Invoke(CancellationToken cancellationToken)`
`27`	`25`	`}`
`28`	`26`	`}`
`29`	`27`	`}`
`30`		`- catch {`
	`28`	`+ catch`
	`29`	`+ {`
`31`	`30`	`}`
`32`	`31`	`}`
`33`	`32`
`@@ -56,6 +55,8 @@ protected override async Task<bool> IsValidSymbol(Document document, int tokenPo`
`56`	`55`	`return true;`
`57`	`56`	`if (token.Parent is PropertyDeclarationSyntax)`
`58`	`57`	`return true;`
	`58`	`+ if (token.Parent is OperatorDeclarationSyntax)`
	`59`	`+ return true;`
`59`	`60`	`}`
`60`	`61`	`catch`
`61`	`62`	`{`
`@@ -75,6 +76,9 @@ static ISymbol FindRelatedSymbol(SemanticModel semanticModel, SyntaxNode node, b`
`75`	`76`	`if (node is PropertyDeclarationSyntax p)`
`76`	`77`	`return semanticModel.GetDeclaredSymbol(p, ct);`
`77`	`78`
	`79`	`+ if (node is OperatorDeclarationSyntax o)`
	`80`	`+ return semanticModel.GetDeclaredSymbol(o, ct);`
	`81`	`+`
`78`	`82`	`if (node is ConstructorDeclarationSyntax ctor)`
`79`	`83`	`return semanticModel.GetDeclaredSymbol(ctor, ct);`
`80`	`84`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ public SettingsViewModel()`
`43`	`43`	`{`
`44`	`44`	`PathToLocalCoreClr = Settings.Default.PathToCoreCLR_V9;`
`45`	`45`	`ShowAsmComments = Settings.Default.ShowAsmComments_V9;`
`46`		`- CustomEnvVars = Settings.Default.CustomEnvVars3_V13.Replace(";;", Environment.NewLine);`
`47`		`- Crossgen2Args = Settings.Default.CrossgenArgs_V5;`
`48`		`- IlcArgs = Settings.Default.IlcArgs_V4.Replace(";;", Environment.NewLine);`
	`46`	`+ CustomEnvVars = Settings.Default.CustomEnvVars3_V14.Replace(";;", Environment.NewLine);`
	`47`	`+ Crossgen2Args = Settings.Default.CrossgenArgs_V6;`
	`48`	`+ IlcArgs = Settings.Default.IlcArgs_V6.Replace(";;", Environment.NewLine);`
`49`	`49`	`JitDumpInsteadOfDisasm = Settings.Default.JitDumpInsteadOfDisasm_V9;`
`50`	`50`	`UseDotnetBuildForReload = Settings.Default.UseDotnetBuildForReload_V9;`
`51`	`51`	`RunAppMode = Settings.Default.RunAppMode_V9;`
`@@ -381,7 +381,7 @@ public string CustomEnvVars`
`381`	`381`	`set`
`382`	`382`	`{`
`383`	`383`	`Set(ref _customEnvVars, value);`
`384`		`- Settings.Default.CustomEnvVars3_V13 = value;`
	`384`	`+ Settings.Default.CustomEnvVars3_V14 = value;`
`385`	`385`	`Settings.Default.Save();`
`386`	`386`	`}`
`387`	`387`	`}`
`@@ -392,7 +392,7 @@ public string Crossgen2Args`
`392`	`392`	`set`
`393`	`393`	`{`
`394`	`394`	`Set(ref _crossgen2Args, value);`
`395`		`- Settings.Default.CrossgenArgs_V5 = value;`
	`395`	`+ Settings.Default.CrossgenArgs_V6 = value;`
`396`	`396`	`Settings.Default.Save();`
`397`	`397`	`}`
`398`	`398`	`}`
`@@ -403,7 +403,7 @@ public string IlcArgs`
`403`	`403`	`set`
`404`	`404`	`{`
`405`	`405`	`Set(ref _ilcArgs, value);`
`406`		`- Settings.Default.IlcArgs_V4 = value;`
	`406`	`+ Settings.Default.IlcArgs_V6 = value;`
`407`	`407`	`Settings.Default.Save();`
`408`	`408`	`}`
`409`	`409`	`}`