Merge remote-tracking branch 'origin/master' into dnSpy

dnSpyEx · Dec 5, 2024 · 2ca661a · 2ca661a
2 parents 2855a03 + 76b00ae
commit 2ca661a
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 21 deletions.
diff --git a/CSharp/CSharpExpressionCompiler/CSharpExpressionCompiler.vsdconfigxml b/CSharp/CSharpExpressionCompiler/CSharpExpressionCompiler.vsdconfigxml
@@ -23,6 +23,7 @@
         <InterfaceGroup
           CallOnlyWhenLoaded="true">
           <NoFilter/>
+          <Interface Name="IDkmMetaDataPointerInvalidatedNotification"/>
           <Interface Name="IDkmModuleModifiedNotification"/>
           <Interface Name="IDkmModuleInstanceUnloadNotification"/>
         </InterfaceGroup>

diff --git a/CSharp/CSharpExpressionCompiler/Symbols/EELocalSymbol.cs b/CSharp/CSharpExpressionCompiler/Symbols/EELocalSymbol.cs
@@ -22,7 +22,6 @@ internal sealed class EELocalSymbol : EELocalSymbolBase
         private readonly bool _isCompilerGenerated;
         private readonly ImmutableArray<Location> _locations;
         private readonly string _nameOpt;
-        private readonly int _ordinal; // index in locals of containing block
         private readonly bool _isPinned;
         private readonly RefKind _refKind;
         private readonly bool _canScheduleToStack;
@@ -62,7 +61,7 @@ public EELocalSymbol(
             _method = method;
             _locations = locations;
             _nameOpt = nameOpt;
-            _ordinal = ordinal;
+            Ordinal = ordinal;
             _declarationKind = declarationKind;
             _type = type;
             _refKind = refKind;
@@ -74,11 +73,11 @@ public EELocalSymbol(
         internal override EELocalSymbolBase ToOtherMethod(MethodSymbol method, TypeMap typeMap)
         {
             var type = typeMap.SubstituteType(_type);
-            return new EELocalSymbol(method, _locations, _nameOpt, _ordinal, _declarationKind, type, _refKind, _isPinned, _isCompilerGenerated, _canScheduleToStack);
+            return new EELocalSymbol(method, _locations, _nameOpt, Ordinal, _declarationKind, type, _refKind, _isPinned, _isCompilerGenerated, _canScheduleToStack);
         }
 
         internal override LocalAndMethodKind LocalAndMethodKind => LocalAndMethodKind.Local;
-        internal override int Index => _ordinal;
+        internal override int Index => Ordinal;
 
         internal override LocalDeclarationKind DeclarationKind
         {
@@ -90,10 +89,7 @@ internal override bool CanScheduleToStack
             get { return _canScheduleToStack; }
         }
 
-        internal int Ordinal
-        {
-            get { return _ordinal; }
-        }
+        internal int Ordinal { get; }
 
         public override string Name
         {

diff --git a/CSharp/CSharpExpressionCompiler/Symbols/EEMethodSymbol.cs b/CSharp/CSharpExpressionCompiler/Symbols/EEMethodSymbol.cs
@@ -226,7 +226,7 @@ internal override bool IsMetadataNewSlot(bool ignoreInterfaceImplementationChang
             return false;
         }
 
-        internal override bool IsMetadataVirtual(bool ignoreInterfaceImplementationChanges = false)
+        internal override bool IsMetadataVirtual(IsMetadataVirtualOption option = IsMetadataVirtualOption.None)
         {
             return false;
         }
@@ -770,5 +770,7 @@ internal sealed override bool HasAsyncMethodBuilderAttribute(out TypeSymbol buil
             builderArgument = null;
             return false;
         }
+
+        internal override int? TryGetOverloadResolutionPriority() => null;
     }
 }
diff --git a/CSharp/CSharpExpressionCompiler/Symbols/EENamedTypeSymbol.cs b/CSharp/CSharpExpressionCompiler/Symbols/EENamedTypeSymbol.cs
@@ -23,7 +23,6 @@ internal sealed class EENamedTypeSymbol : NamedTypeSymbol
         private readonly NamedTypeSymbol _baseType;
         private readonly string _name;
         private readonly ImmutableArray<TypeParameterSymbol> _typeParameters;
-        private readonly ImmutableArray<MethodSymbol> _methods;
 
         internal EENamedTypeSymbol(
             CompilerKind compiler,
@@ -54,7 +53,7 @@ internal EENamedTypeSymbol(
             this.SourceTypeParameters = sourceTypeParameters;
             _typeParameters = getTypeParameters(currentFrame.ContainingType, this);
             VerifyTypeParameters(this, _typeParameters);
-            _methods = getMethods(currentFrame, this);
+            Methods = getMethods(currentFrame, this);
         }
 
         internal EENamedTypeSymbol(
@@ -94,16 +93,13 @@ internal EENamedTypeSymbol(
             this.SubstitutedSourceType = typeMap.SubstituteNamedType(sourceType);
             TypeParameterChecker.Check(this.SubstitutedSourceType, _typeParameters);
 
-            _methods = getMethods(currentFrame, this);
+            Methods = getMethods(currentFrame, this);
         }
 
         protected override NamedTypeSymbol WithTupleDataCore(TupleExtraData newData)
             => throw ExceptionUtilities.Unreachable();
 
-        internal ImmutableArray<MethodSymbol> Methods
-        {
-            get { return _methods; }
-        }
+        internal ImmutableArray<MethodSymbol> Methods { get; }
 
         internal override IEnumerable<FieldSymbol> GetFieldsToEmit()
         {
@@ -112,7 +108,7 @@ internal override IEnumerable<FieldSymbol> GetFieldsToEmit()
 
         internal override IEnumerable<MethodSymbol> GetMethodsToEmit()
         {
-            return _methods;
+            return Methods;
         }
 
         internal override ImmutableArray<NamedTypeSymbol> GetInterfacesToEmit()
@@ -174,7 +170,7 @@ public override IEnumerable<string> MemberNames
 
         public override ImmutableArray<Symbol> GetMembers()
         {
-            return _methods.Cast<MethodSymbol, Symbol>();
+            return Methods.Cast<MethodSymbol, Symbol>();
         }
 
         public override ImmutableArray<Symbol> GetMembers(string name)

diff --git a/CSharp/CSharpExpressionCompiler/Symbols/PlaceholderMethodSymbol.cs b/CSharp/CSharpExpressionCompiler/Symbols/PlaceholderMethodSymbol.cs
@@ -265,7 +265,7 @@ internal override bool IsMetadataNewSlot(bool ignoreInterfaceImplementationChang
             return false;
         }
 
-        internal override bool IsMetadataVirtual(bool ignoreInterfaceImplementationChanges = false)
+        internal override bool IsMetadataVirtual(IsMetadataVirtualOption option = IsMetadataVirtualOption.None)
         {
             return false;
         }
@@ -284,6 +284,8 @@ internal sealed override bool HasAsyncMethodBuilderAttribute(out TypeSymbol buil
             builderArgument = null;
             return false;
         }
+
+        internal override int? TryGetOverloadResolutionPriority() => null;
     }
 
     internal partial class PlaceholderMethodSymbol :

diff --git a/CSharp/CSharpExpressionCompiler/Symbols/SynthesizedContextMethodSymbol.cs b/CSharp/CSharpExpressionCompiler/Symbols/SynthesizedContextMethodSymbol.cs
@@ -214,7 +214,7 @@ internal override bool IsMetadataNewSlot(bool ignoreInterfaceImplementationChang
             throw ExceptionUtilities.Unreachable();
         }
 
-        internal override bool IsMetadataVirtual(bool ignoreInterfaceImplementationChanges = false)
+        internal override bool IsMetadataVirtual(IsMetadataVirtualOption option = IsMetadataVirtualOption.None)
         {
             throw ExceptionUtilities.Unreachable();
         }

diff --git a/Core/ExpressionCompiler/ExpressionCompiler.cs b/Core/ExpressionCompiler/ExpressionCompiler.cs
@@ -8,7 +8,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
-using Microsoft.CodeAnalysis.Collections;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.VisualStudio.Debugger;
 using Microsoft.VisualStudio.Debugger.CallStack;
@@ -23,6 +22,7 @@ namespace Microsoft.CodeAnalysis.ExpressionEvaluator
     public abstract class ExpressionCompiler :
         IDkmClrExpressionCompiler,
         IDkmClrExpressionCompilerCallback,
+        IDkmMetaDataPointerInvalidatedNotification,
         IDkmModuleModifiedNotification,
         IDkmModuleInstanceUnloadNotification,
         IDkmLanguageFrameDecoder,
@@ -247,6 +247,11 @@ internal static bool ShouldTryAgainWithMoreMetadataBlocks(DkmUtilities.GetMetada
             return false;
         }
 
+        void IDkmMetaDataPointerInvalidatedNotification.OnMetaDataPointerInvalidated(DkmClrModuleInstance moduleInstance)
+        {
+            RemoveDataItemIfNecessary(moduleInstance);
+        }
+
         void IDkmModuleModifiedNotification.OnModuleModified(DkmModuleInstance moduleInstance)
         {
             RemoveDataItemIfNecessary(moduleInstance);

diff --git a/Core/ExpressionCompiler/ExpressionEvaluatorFatalError.cs b/Core/ExpressionCompiler/ExpressionEvaluatorFatalError.cs
@@ -76,6 +76,7 @@ internal static bool CrashIfFailFastEnabled(Exception exception)
             {
                 switch (dkmException.Code)
                 {
+                    case DkmExceptionCode.E_METADATA_UPDATE_DEADLOCK: // Metadata was updated while EE had component lock
                     case DkmExceptionCode.E_PROCESS_DESTROYED:
                     case DkmExceptionCode.E_XAPI_REMOTE_CLOSED:
                     case DkmExceptionCode.E_XAPI_REMOTE_DISCONNECTED:

diff --git a/VisualBasic/BasicExpressionCompiler/BasicExpressionCompiler.vsdconfigxml b/VisualBasic/BasicExpressionCompiler/BasicExpressionCompiler.vsdconfigxml
@@ -25,6 +25,7 @@
         <InterfaceGroup
           CallOnlyWhenLoaded="true">
           <NoFilter/>
+          <Interface Name="IDkmMetaDataPointerInvalidatedNotification"/>
           <Interface Name="IDkmModuleModifiedNotification"/>
           <Interface Name="IDkmModuleInstanceUnloadNotification"/>
         </InterfaceGroup>