another merge

dotnet · Sep 8, 2022 · a2e2fd6 · a2e2fd6
1 parent 4a0d7df
commit a2e2fd6
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 56 deletions.
diff --git a/src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs b/src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs
@@ -336,7 +336,6 @@ public static Marshaller CreateMarshaller(TypeDesc parameterType,
         /// <param name="parameterType">type of the parameter to marshal</param>
         /// <returns>The created Marshaller</returns>
         public static Marshaller CreateDisabledMarshaller(TypeDesc parameterType,
-            int? parameterIndex,
             MarshallerType marshallerType,
             MarshalDirection direction,
             Marshaller[] marshallers,

diff --git a/src/coreclr/tools/Common/TypeSystem/MetadataEmitter/TypeSystemMetadataEmitter.cs b/src/coreclr/tools/Common/TypeSystem/MetadataEmitter/TypeSystemMetadataEmitter.cs
@@ -28,7 +28,7 @@ internal class TypeSystemMetadataEmitter
         private BlobHandle _noArgsVoidReturnStaticMethodSigHandle;
         protected TypeSystemContext _typeSystemContext;
 
-        public TypeSystemMetadataEmitter(AssemblyName assemblyName, TypeSystemContext context, AssemblyFlags flags = default(AssemblyFlags), byte[] publicKeyArray = null, AssemblyHashAlgorithm hashAlgorithm = AssemblyHashAlgorithm.None)
+        public TypeSystemMetadataEmitter(AssemblyName assemblyName, TypeSystemContext context, AssemblyFlags flags = default(AssemblyFlags), byte[] publicKeyArray = null)
         {
             _typeSystemContext = context;
             _metadataBuilder = new MetadataBuilder();

diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Logger.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Logger.cs
@@ -236,7 +236,7 @@ private static bool IsSuppressedOnElement(int id, TypeSystemEntity provider)
             return false;
         }
 
-        internal static bool IsWarningAsError(int code)
+        internal static bool IsWarningAsError(int _/*code*/)
         {
             // TODO: warnaserror
             return false;

diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs
@@ -1128,22 +1128,22 @@ private void ImportNewArray(int token)
             }
         }
 
-        private void ImportLoadElement(int token)
+        private void ImportLoadElement(int _)
         {
             _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.RngChkFail), "ldelem");
         }
 
-        private void ImportLoadElement(TypeDesc elementType)
+        private void ImportLoadElement(TypeDesc _)
         {
             _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.RngChkFail), "ldelem");
         }
 
-        private void ImportStoreElement(int token)
+        private void ImportStoreElement(int _)
         {
             _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.RngChkFail), "stelem");
         }
 
-        private void ImportStoreElement(TypeDesc elementType)
+        private void ImportStoreElement(TypeDesc _)
         {
             _dependencies.Add(GetHelperEntrypoint(ReadyToRunHelper.RngChkFail), "stelem");
         }
@@ -1340,40 +1340,40 @@ private TypeDesc GetWellKnownType(WellKnownType wellKnownType)
             return _compilation.TypeSystemContext.GetWellKnownType(wellKnownType);
         }
 
-        private static void ImportNop() { }
-        private static void ImportBreak() { }
-        private static void ImportLoadVar(int index, bool argument) { }
-        private static void ImportStoreVar(int index, bool argument) { }
-        private static void ImportAddressOfVar(int index, bool argument) { }
-        private static void ImportDup() { }
-        private static void ImportPop() { }
-        private static void ImportLoadNull() { }
-        private static void ImportReturn() { }
-        private static void ImportLoadInt(long value, StackValueKind kind) { }
-        private static void ImportLoadFloat(double value) { }
-        private static void ImportLoadIndirect(int token) { }
-        private static void ImportLoadIndirect(TypeDesc type) { }
-        private static void ImportStoreIndirect(int token) { }
-        private static void ImportStoreIndirect(TypeDesc type) { }
-        private static void ImportShiftOperation(ILOpcode opcode) { }
-        private static void ImportCompareOperation(ILOpcode opcode) { }
-        private static void ImportConvert(WellKnownType wellKnownType, bool checkOverflow, bool unsigned) { }
-        private static void ImportUnaryOperation(ILOpcode opCode) { }
-        private static void ImportCpOpj(int token) { }
-        private static void ImportCkFinite() { }
-        private static void ImportLocalAlloc() { }
-        private static void ImportEndFilter() { }
-        private static void ImportCpBlk() { }
-        private static void ImportInitBlk() { }
-        private static void ImportRethrow() { }
-        private static void ImportSizeOf(int token) { }
-        private static void ImportUnalignedPrefix(byte alignment) { }
-        private static void ImportVolatilePrefix() { }
-        private static void ImportTailPrefix() { }
-        private static void ImportNoPrefix(byte mask) { }
-        private static void ImportThrow() { }
-        private static void ImportInitObj(int token) { }
-        private static void ImportLoadLength() { }
-        private static void ImportEndFinally() { }
+        static partial void ImportNop();
+        static partial void ImportBreak();
+        static partial void ImportLoadVar(int index, bool argument);
+        static partial void ImportStoreVar(int index, bool argument);
+        static partial void ImportAddressOfVar(int index, bool argument);
+        static partial void ImportDup();
+        static partial void ImportPop();
+        static partial void ImportLoadNull();
+        static partial void ImportReturn();
+        static partial void ImportLoadInt(long value, StackValueKind kind);
+        static partial void ImportLoadFloat(double value);
+        static partial void ImportLoadIndirect(int token);
+        static partial void ImportLoadIndirect(TypeDesc type);
+        static partial void ImportStoreIndirect(int token);
+        static partial void ImportStoreIndirect(TypeDesc type);
+        static partial void ImportShiftOperation(ILOpcode opcode);
+        static partial void ImportCompareOperation(ILOpcode opcode);
+        static partial void ImportConvert(WellKnownType wellKnownType, bool checkOverflow, bool unsigned);
+        static partial void ImportUnaryOperation(ILOpcode opCode);
+        static partial void ImportCpOpj(int token);
+        static partial void ImportCkFinite();
+        static partial void ImportLocalAlloc();
+        static partial void ImportEndFilter();
+        static partial void ImportCpBlk();
+        static partial void ImportInitBlk();
+        static partial void ImportRethrow();
+        static partial void ImportSizeOf(int token);
+        static partial void ImportUnalignedPrefix(byte alignment);
+        static partial void ImportVolatilePrefix();
+        static partial void ImportTailPrefix();
+        static partial void ImportNoPrefix(byte mask);
+        static partial void ImportThrow();
+        static partial void ImportInitObj(int token);
+        static partial void ImportLoadLength();
+        static partial void ImportEndFinally();
     }
 }
diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Interop/IL/Marshaller.ReadyToRun.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Interop/IL/Marshaller.ReadyToRun.cs
@@ -70,7 +70,6 @@ private static Marshaller[] GetMarshallers(
                 {
                     marshallers[i] = CreateDisabledMarshaller(
                         parameterType,
-                        parameterIndex,
                         MarshallerType.Argument,
                         MarshalDirection.Forward,
                         marshallers,

diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/TypeSystem/Mutable/MutableModule.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/TypeSystem/Mutable/MutableModule.cs
@@ -81,7 +81,7 @@ public ManagedBinaryEmitterForInternalUse(AssemblyName assemblyName,
                                                       AssemblyHashAlgorithm hashAlgorithm,
                                                       Func<ModuleDesc, int> moduleToIndex,
                                                       MutableModule mutableModule)
-                : base(assemblyName, typeSystemContext, assemblyFlags, publicKeyArray, hashAlgorithm)
+                : base(assemblyName, typeSystemContext, assemblyFlags, publicKeyArray)
             {
                 _moduleToIndex = moduleToIndex;
                 _mutableModule = mutableModule;

diff --git a/src/libraries/Common/src/System/Net/NTAuthentication.Managed.cs b/src/libraries/Common/src/System/Net/NTAuthentication.Managed.cs
@@ -1013,7 +1013,7 @@ private unsafe byte[] CreateSpNegoNegotiateMessage(ReadOnlySpan<byte> ntlmNegoti
             return null;
         }
 
-        internal NegotiateAuthenticationStatusCode Wrap(ReadOnlySpan<byte> input, IBufferWriter<byte> outputWriter, bool requestEncryption, out bool isEncrypted)
+        internal NegotiateAuthenticationStatusCode Wrap(ReadOnlySpan<byte> input, IBufferWriter<byte> outputWriter, bool _/*requestEncryption*/, out bool isEncrypted)
         {
             if (_clientSeal == null)
             {

diff --git a/src/libraries/Common/src/System/Net/NetworkInformation/InterfaceInfoPal.Browser.cs b/src/libraries/Common/src/System/Net/NetworkInformation/InterfaceInfoPal.Browser.cs
@@ -5,7 +5,7 @@ namespace System.Net.NetworkInformation
 {
     internal static class InterfaceInfoPal
     {
-        public static uint InterfaceNameToIndex(string interfaceName)
+        public static uint InterfaceNameToIndex(string _/*interfaceName*/)
         {
             // zero means "unknown"
             return 0;

diff --git a/src/libraries/System.Console/src/System/ConsolePal.WebAssembly.cs b/src/libraries/System.Console/src/System/ConsolePal.WebAssembly.cs
@@ -74,7 +74,7 @@ public override void Flush()
 
     internal static partial class ConsolePal
     {
-#pragma warning disable IDE0060        
+#pragma warning disable IDE0060
         [JSImport("globalThis.console.clear")]
         public static partial void Clear();
 

diff --git a/src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Unix.cs b/src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Unix.cs
@@ -24,6 +24,7 @@ public static void VerifyPackageInfo()
         {
         }
 
+#pragma warning disable IDE0060
         public static SecurityStatusPal AcceptSecurityContext(
             ref SafeFreeCredentials? credential,
             ref SafeDeleteSslContext? context,
@@ -216,7 +217,6 @@ private static SecurityStatusPal HandshakeInternal(ref SafeDeleteSslContext? con
             }
         }
 
-#pragma warning disable IDE0060
         public static SecurityStatusPal ApplyAlertToken(SafeDeleteContext? securityContext, TlsAlertType alertType, TlsAlertMessage alertMessage)
         {
             // There doesn't seem to be an exposed API for writing an alert,
@@ -226,7 +226,7 @@ public static SecurityStatusPal ApplyAlertToken(SafeDeleteContext? securityConte
         }
 #pragma warning restore IDE0060
 
-        public static SecurityStatusPal ApplyShutdownToken(ref SafeFreeCredentials? credentialsHandle, SafeDeleteSslContext context)
+        public static SecurityStatusPal ApplyShutdownToken(SafeDeleteSslContext context)
         {
             // Unset the quiet shutdown option initially configured.
             Interop.Ssl.SslSetQuietShutdown((SafeSslHandle)context, 0);

diff --git a/...braries/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Browser.cs b/...braries/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Browser.cs
@@ -34,7 +34,7 @@ public void Abort()
             WebSocket?.Abort();
         }
 
-        public Task ConnectAsync(Uri uri, HttpMessageInvoker? invoker, CancellationToken cancellationToken, ClientWebSocketOptions options)
+        public Task ConnectAsync(Uri uri, HttpMessageInvoker? _ /*invoker*/, CancellationToken cancellationToken, ClientWebSocketOptions options)
         {
             cancellationToken.ThrowIfCancellationRequested();
 

diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.GateThread.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/PortableThreadPool.GateThread.cs
@@ -218,7 +218,7 @@ internal static void EnsureRunningSlow(PortableThreadPool threadPoolInstance)
                 }
                 else if ((numRunsMask & GateThreadRunningMask) == 0)
                 {
-                    CreateGateThread(threadPoolInstance);
+                    CreateGateThread();
                 }
             }
 
@@ -229,7 +229,7 @@ private static int GetRunningStateForNumRuns(int numRuns)
                 return GateThreadRunningMask | numRuns;
             }
 
-            private static void CreateGateThread(PortableThreadPool threadPoolInstance)
+            private static void CreateGateThread()
             {
                 try
                 {

diff --git a/...pServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSObject.References.cs b/...pServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSObject.References.cs
@@ -63,7 +63,7 @@ internal void ReleaseInFlight()
         /// <inheritdoc />
         public override string ToString() => $"(js-obj js '{JSHandle}')";
 
-        private void Dispose(bool disposing)
+        private void DisposeThis()
         {
             if (!_isDisposed)
             {
@@ -75,15 +75,15 @@ private void Dispose(bool disposing)
 
         ~JSObject()
         {
-            Dispose(disposing: false);
+            DisposeThis();
         }
 
         /// <summary>
         /// Releases any resources used by the proxy and discards the reference to its target JavaScript object.
         /// </summary>
         public void Dispose()
         {
-            Dispose(disposing: true);
+            DisposeThis();
             GC.SuppressFinalize(this);
         }
     }

diff --git a/src/mono/System.Private.CoreLib/src/System/Threading/TimerQueue.Browser.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Threading/TimerQueue.Browser.Mono.cs
@@ -23,7 +23,7 @@ internal partial class TimerQueue
         private bool _isScheduled;
         private long _scheduledDueTimeMs;
 
-        private TimerQueue(int id)
+        private TimerQueue(int _)
         {
         }