hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-29 10:45:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix code review findings

Browse Source
This commit is contained in:
Tamas Vajk
2021-01-05 15:15:13 +01:00
parent 8e8c3a9ded
commit 12c28547fc
5 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
csharp/change-notes/2020-12-18-extract-custom-modifiers.md
View File

@@ -1,4 +1,4 @@
lgtm,codescanning
* CIL extraction has been improved to store `modreq` and `modopt` custom modifiers.
The extracted information is surfaced through the `CustomModifierReceiver` class. Additionally,
the information is also used to evaluate the new `Setter.isInitOnly` predicate.
the information is also used to evaluate the new `Setter::isInitOnly` predicate.

13
csharp/extractor/Semmle.Extraction.CIL/Entities/ModifiedType.cs
View File

@@ -33,17 +33,10 @@ namespace Semmle.Extraction.CIL.Entities
public override Type Construct(IEnumerable<Type> typeArguments) => throw new NotImplementedException();
public override string Name => Unmodified.Name + (IsRequired ? " modreq" : " modopt") + $"({Modifier.Name})";
public override string Name => $"{Unmodified.Name} {(IsRequired ? "modreq" : "modopt")}({Modifier.Name})";
public override void WriteAssemblyPrefix(TextWriter trapFile) => Unmodified.WriteAssemblyPrefix(trapFile);
public override void WriteAssemblyPrefix(TextWriter trapFile) => throw new NotImplementedException();
public override void WriteId(TextWriter trapFile, bool inContext)
{
Unmodified.WriteId(trapFile, inContext);
trapFile.Write(IsRequired ? " modreq" : " modopt");
trapFile.Write("(");
Modifier.WriteId(trapFile, inContext);
trapFile.Write(")");
}
public override void WriteId(TextWriter trapFile, bool inContext) => throw new NotImplementedException();
}
}

10
csharp/ql/src/semmle/code/cil/CustomModifierReceiver.qll
View File

@@ -6,7 +6,7 @@ private import CIL
private import dotnet
/**
* A class to represent entities that can recive custom modifiers. Custom modifiers can be attached to
* A class to represent entities that can receive custom modifiers. Custom modifiers can be attached to
* - the type of a `Field`,
* - the return type of a `Method` or `Property`,
* - the type of parameters.
@@ -18,12 +18,4 @@ class CustomModifierReceiver extends Declaration, @cil_custom_modifier_receiver
/** Holds if this targeted type has `modifier` applied as `modopt`. */
predicate hasOptionalCustomModifier(Type modifier) { cil_custom_modifiers(this, modifier, 0) }
/**
* Holds if this targeted type has `modifier` applied as `kind`. `kind` 1 means `modreq`,
* `kind` 0 represents `modopt`.
*/
predicate hasCustomModifier(Type modifier, int kind) {
cil_custom_modifiers(this, modifier, kind)
}
}

2
csharp/ql/src/semmle/code/cil/Method.qll
View File

@@ -251,7 +251,7 @@ class Setter extends Accessor {
/** Holds if this setter is an `init` accessor. */
predicate isInitOnly() {
exists(Type t | t.getQualifiedName() = "System.Runtime.CompilerServices.IsExternalInit" |
cil_custom_modifiers(this, t, 1)
this.hasRequiredCustomModifier(t)
)
}
}

2
csharp/ql/test/library-tests/cil/init-only-prop/customModifiers.ql
View File

@@ -7,7 +7,7 @@ from string receiver, string modifier, int kind
where
exists(Type modType, CustomModifierReceiver cmr |
receiver = cmr.toString() and
cmr.hasCustomModifier(modType, kind) and
cil_custom_modifiers(cmr, modType, kind) and
modType.getQualifiedName() = modifier
)
select receiver, modifier, getKind(kind)