C#: Remove unused parameters

tamasvajk · tamasvajk · commit 0c9aaa3dce5b · 2020-10-13T13:27:45.000+02:00
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Method.cs
@@ -194,7 +194,7 @@ public override IEnumerable<IExtractionProduct> Contents
                     for (int i = 0; i < genericParams.Length; ++i)
                         genericParams[i] = cx.Populate(new MethodTypeParameter(this, this, i));
                     for (int i = 0; i < genericParams.Length; ++i)
-                        genericParams[i].PopulateHandle(this, md.GetGenericParameters()[i]);
+                        genericParams[i].PopulateHandle(md.GetGenericParameters()[i]);
                     foreach (var p in genericParams)
                         yield return p;
                 }
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Type.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Type.cs
@@ -438,7 +438,7 @@ IEnumerable<TypeTypeParameter> MakeTypeParameters()
             for (int i = 0; i < newTypeParams.Length; ++i)
                 newTypeParams[i] = cx.Populate(new TypeTypeParameter(this, this, i));
             for (int i = 0; i < newTypeParams.Length; ++i)
-                newTypeParams[i].PopulateHandle(this, genericParams[i + toSkip]);
+                newTypeParams[i].PopulateHandle(genericParams[i + toSkip]);
             return newTypeParams;
         }
 
@@ -983,7 +983,7 @@ public TypeParameter(GenericContext gc) : base(gc.cx)
 
         public override Type Construct(IEnumerable<Type> typeArguments) => throw new InternalError("Attempt to construct a type parameter");
 
-        public IEnumerable<IExtractionProduct> PopulateHandle(GenericContext gc, GenericParameterHandle parameterHandle)
+        public IEnumerable<IExtractionProduct> PopulateHandle(GenericParameterHandle parameterHandle)
         {
             if (!parameterHandle.IsNil)
             {
diff --git a/csharp/extractor/Semmle.Extraction.CIL/PDB/NativePdbReader.cs b/csharp/extractor/Semmle.Extraction.CIL/PDB/NativePdbReader.cs
@@ -87,7 +87,7 @@ public override bool Equals(object? obj)
         readonly ISymUnmanagedReader5 reader;
         readonly FileStream pdbStream;
 
-        public static NativePdbReader? CreateFromAssembly(string assemblyPath, PEReader peReader)
+        public static NativePdbReader? CreateFromAssembly(PEReader peReader)
         {
             // The Native PDB reader uses an unmanaged Windows DLL
             // so only works on Windows.
diff --git a/csharp/extractor/Semmle.Extraction.CIL/PDB/PdbReader.cs b/csharp/extractor/Semmle.Extraction.CIL/PDB/PdbReader.cs
@@ -150,7 +150,7 @@ class PdbReader
         public static IPdb? Create(string assemblyPath, PEReader peReader)
         {
             return (IPdb?)MetadataPdbReader.CreateFromAssembly(assemblyPath, peReader) ??
-                NativePdbReader.CreateFromAssembly(assemblyPath, peReader);
+                NativePdbReader.CreateFromAssembly(peReader);
         }
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
@@ -12,7 +12,7 @@ public abstract class Method : CachedSymbol<IMethodSymbol>, IExpressionParentEnt
         public Method(Context cx, IMethodSymbol init)
             : base(cx, init) { }
 
-        protected void PopulateParameters(TextWriter trapFile)
+        protected void PopulateParameters()
         {
             var originalMethod = OriginalDefinition;
             IEnumerable<IParameterSymbol> parameters = symbol.Parameters;
@@ -332,7 +332,7 @@ protected void PopulateMethod(TextWriter trapFile)
             // Common population code for all callables
             BindComments();
             PopulateAttributes();
-            PopulateParameters(trapFile);
+            PopulateParameters();
             PopulateMethodBody(trapFile);
             PopulateGenerics(trapFile);
             PopulateMetadataHandle(trapFile);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
@@ -125,10 +125,6 @@ public static Property Create(Context cx, IPropertySymbol prop)
             return isIndexer ? Indexer.Create(cx, prop) : PropertyFactory.Instance.CreateEntityFromSymbol(cx, prop);
         }
 
-        public void VisitDeclaration(Context cx, PropertyDeclarationSyntax p)
-        {
-        }
-
         class PropertyFactory : ICachedEntityFactory<IPropertySymbol, Property>
         {
             public static readonly PropertyFactory Instance = new PropertyFactory();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Populators/Ast.cs b/csharp/extractor/Semmle.Extraction.CSharp/Populators/Ast.cs
@@ -23,12 +23,6 @@ public override void DefaultVisit(SyntaxNode node)
             cx.ModelError(node, $"Unhandled syntax node {node.Kind()}");
         }
 
-        public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node)
-        {
-            ((Property)parent).VisitDeclaration(cx, node);
-        }
-
-
         public override void VisitArgumentList(ArgumentListSyntax node)
         {
             int c = 0;
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Layout.cs b/csharp/extractor/Semmle.Extraction.Tests/Layout.cs
@@ -204,8 +204,6 @@ class LoggerMock : ILogger
             public void Dispose() { }
 
             public void Log(Severity s, string text) { }
-
-            public void Log(Severity s, string text, params object[] args) { }
         }
     }
 
diff --git a/csharp/extractor/Semmle.Extraction.Tests/TrapWriter.cs b/csharp/extractor/Semmle.Extraction.Tests/TrapWriter.cs
@@ -49,8 +49,6 @@ class LoggerMock : ILogger
             public void Dispose() { }
 
             public void Log(Severity s, string text) { }
-
-            public void Log(Severity s, string text, params object[] args) { }
         }
     }
 }
diff --git a/csharp/extractor/Semmle.Util.Tests/CanonicalPathCache.cs b/csharp/extractor/Semmle.Util.Tests/CanonicalPathCache.cs
@@ -177,8 +177,6 @@ class LoggerMock : ILogger
             public void Dispose() { }
 
             public void Log(Severity s, string text) { }
-
-            public void Log(Severity s, string text, params object[] args) { }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public override IEnumerable<IExtractionProduct> Contents`
`194`	`194`	`for (int i = 0; i < genericParams.Length; ++i)`
`195`	`195`	`genericParams[i] = cx.Populate(new MethodTypeParameter(this, this, i));`
`196`	`196`	`for (int i = 0; i < genericParams.Length; ++i)`
`197`		`- genericParams[i].PopulateHandle(this, md.GetGenericParameters()[i]);`
	`197`	`+ genericParams[i].PopulateHandle(md.GetGenericParameters()[i]);`
`198`	`198`	`foreach (var p in genericParams)`
`199`	`199`	`yield return p;`
`200`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ IEnumerable<TypeTypeParameter> MakeTypeParameters()`
`438`	`438`	`for (int i = 0; i < newTypeParams.Length; ++i)`
`439`	`439`	`newTypeParams[i] = cx.Populate(new TypeTypeParameter(this, this, i));`
`440`	`440`	`for (int i = 0; i < newTypeParams.Length; ++i)`
`441`		`- newTypeParams[i].PopulateHandle(this, genericParams[i + toSkip]);`
	`441`	`+ newTypeParams[i].PopulateHandle(genericParams[i + toSkip]);`
`442`	`442`	`return newTypeParams;`
`443`	`443`	`}`
`444`	`444`
`@@ -983,7 +983,7 @@ public TypeParameter(GenericContext gc) : base(gc.cx)`
`983`	`983`
`984`	`984`	`public override Type Construct(IEnumerable<Type> typeArguments) => throw new InternalError("Attempt to construct a type parameter");`
`985`	`985`
`986`		`- public IEnumerable<IExtractionProduct> PopulateHandle(GenericContext gc, GenericParameterHandle parameterHandle)`
	`986`	`+ public IEnumerable<IExtractionProduct> PopulateHandle(GenericParameterHandle parameterHandle)`
`987`	`987`	`{`
`988`	`988`	`if (!parameterHandle.IsNil)`
`989`	`989`	`{`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public override bool Equals(object? obj)`
`87`	`87`	`readonly ISymUnmanagedReader5 reader;`
`88`	`88`	`readonly FileStream pdbStream;`
`89`	`89`
`90`		`- public static NativePdbReader? CreateFromAssembly(string assemblyPath, PEReader peReader)`
	`90`	`+ public static NativePdbReader? CreateFromAssembly(PEReader peReader)`
`91`	`91`	`{`
`92`	`92`	`// The Native PDB reader uses an unmanaged Windows DLL`
`93`	`93`	`// so only works on Windows.`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ class PdbReader`
`150`	`150`	`public static IPdb? Create(string assemblyPath, PEReader peReader)`
`151`	`151`	`{`
`152`	`152`	`return (IPdb?)MetadataPdbReader.CreateFromAssembly(assemblyPath, peReader) ??`
`153`		`- NativePdbReader.CreateFromAssembly(assemblyPath, peReader);`
	`153`	`+ NativePdbReader.CreateFromAssembly(peReader);`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,10 +125,6 @@ public static Property Create(Context cx, IPropertySymbol prop)`
`125`	`125`	`return isIndexer ? Indexer.Create(cx, prop) : PropertyFactory.Instance.CreateEntityFromSymbol(cx, prop);`
`126`	`126`	`}`
`127`	`127`
`128`		`- public void VisitDeclaration(Context cx, PropertyDeclarationSyntax p)`
`129`		`- {`
`130`		`- }`
`131`		`-`
`132`	`128`	`class PropertyFactory : ICachedEntityFactory<IPropertySymbol, Property>`
`133`	`129`	`{`
`134`	`130`	`public static readonly PropertyFactory Instance = new PropertyFactory();`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,6 @@ public override void DefaultVisit(SyntaxNode node)`
`23`	`23`	`cx.ModelError(node, $"Unhandled syntax node {node.Kind()}");`
`24`	`24`	`}`
`25`	`25`
`26`		`- public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node)`
`27`		`- {`
`28`		`- ((Property)parent).VisitDeclaration(cx, node);`
`29`		`- }`
`30`		`-`
`31`		`-`
`32`	`26`	`public override void VisitArgumentList(ArgumentListSyntax node)`
`33`	`27`	`{`
`34`	`28`	`int c = 0;`
Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,6 @@ class LoggerMock : ILogger`
`204`	`204`	`public void Dispose() { }`
`205`	`205`
`206`	`206`	`public void Log(Severity s, string text) { }`
`207`		`-`
`208`		`- public void Log(Severity s, string text, params object[] args) { }`
`209`	`207`	`}`
`210`	`208`	`}`
`211`	`209`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,6 @@ class LoggerMock : ILogger`
`49`	`49`	`public void Dispose() { }`
`50`	`50`
`51`	`51`	`public void Log(Severity s, string text) { }`
`52`		`-`
`53`		`- public void Log(Severity s, string text, params object[] args) { }`
`54`	`52`	`}`
`55`	`53`	`}`
`56`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,6 @@ class LoggerMock : ILogger`
`177`	`177`	`public void Dispose() { }`
`178`	`178`
`179`	`179`	`public void Log(Severity s, string text) { }`
`180`		`-`
`181`		`- public void Log(Severity s, string text, params object[] args) { }`
`182`	`180`	`}`
`183`	`181`	`}`
`184`	`182`	`}`