Skip to content

Commit 2e6e2ea

Browse files
michaelnebelmichaelnebel
authored
Merge pull request github#15036 from michaelnebel/csharp/intptrdefaultssimple
C#: Parameter defaults for `nint` and `nuint` in compiled code.
2 parents 51adcf5 + d9c6d4e commit 2e6e2ea

File tree

6 files changed

+43
-8
lines changed

6 files changed

+43
-8
lines changed

‎csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,19 @@ private static bool ContainsPattern(SyntaxNode node) =>
214214

215215
if (type.SpecialType is SpecialType.None)
216216
{
217-
return ImplicitCast.CreateGenerated(cx, parent, childIndex, type, defaultValue, location);
217+
return ImplicitCast.CreateGeneratedConversion(cx, parent, childIndex, type, defaultValue, location);
218218
}
219219

220220
if (type.SpecialType is SpecialType.System_DateTime)
221221
{
222222
return DateTimeObjectCreation.CreateGenerated(cx, parent, childIndex, type, defaultValue, location);
223223
}
224224

225+
if (type.SpecialType is SpecialType.System_IntPtr || type.SpecialType is SpecialType.System_UIntPtr)
226+
{
227+
return ImplicitCast.CreateGenerated(cx, parent, childIndex, type, defaultValue, location);
228+
}
229+
225230
// const literal:
226231
return Literal.CreateGenerated(cx, parent, childIndex, type, defaultValue, location);
227232
}

‎csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ImplicitCast.cs

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ private void AddOperatorCall(IMethodSymbol method)
5151
)
5252
.FirstOrDefault();
5353

54-
// Creates a new generated expression with an implicit cast added, if needed.
55-
public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, ITypeSymbol type, object value,
54+
/// <summary>
55+
/// Creates a new generated expression with an implicit conversion added.
56+
/// </summary>
57+
public static Expression CreateGeneratedConversion(Context cx, IExpressionParentEntity parent, int childIndex, ITypeSymbol type, object value,
5658
Extraction.Entities.Location location)
5759
{
5860
ExpressionInfo create(ExprKind kind, string? v) =>
@@ -79,7 +81,27 @@ ExpressionInfo create(ExprKind kind, string? v) =>
7981
}
8082
}
8183

82-
// Creates a new expression, adding casts as required.
84+
/// <summary>
85+
/// Creates a new generated cast expression.
86+
/// </summary>
87+
public static Expression CreateGenerated(Context cx, IExpressionParentEntity parent, int childIndex, ITypeSymbol type, object value,
88+
Extraction.Entities.Location location)
89+
{
90+
var info = new ExpressionInfo(cx,
91+
AnnotatedTypeSymbol.CreateNotAnnotated(type),
92+
location,
93+
ExprKind.CAST,
94+
parent,
95+
childIndex,
96+
true,
97+
ValueAsString(value));
98+
99+
return new Expression(info);
100+
}
101+
102+
/// <summary>
103+
/// Creates a new expression, adding casts as required.
104+
/// </summary>
83105
public static Expression Create(ExpressionNodeInfo info)
84106
{
85107
var resolvedType = info.ResolvedType;

‎csharp/ql/test/library-tests/parameters/Parameters.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public class Parameters
2727
public void M19([Optional, DecimalConstant(1, 0, 0, 0, 103)] decimal arg9) => throw null;
2828
public void M20([Optional, DefaultParameterValue(7)] MyStruct arg10) => throw null;
2929
public void M21([Optional, DefaultParameterValue("mystring")] MyStruct arg10) => throw null;
30+
public void M22(nuint arg11 = 0) => throw null;
31+
public void M23(nint arg12 = 0) => throw null;
3032

3133
public struct MyStruct
3234
{
@@ -35,4 +37,4 @@ public struct MyStruct
3537

3638
}
3739
public enum MyEnum { A = 1, B = 2 }
38-
}
40+
}

‎csharp/ql/test/library-tests/parameters/Parameters.cs_

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public class ParametersDll
2727
public void M19([Optional, DecimalConstant(1, 0, 0, 0, 103)] decimal arg9) => throw null;
2828
public void M20([Optional, DefaultParameterValue(7)] MyStruct arg10) => throw null;
2929
public void M21([Optional, DefaultParameterValue("mystring")] MyStruct arg10) => throw null;
30+
public void M22(nuint arg11 = 0) => throw null;
31+
public void M23(nint arg12 = 0) => throw null;
3032

3133
public struct MyStruct
3234
{
@@ -35,4 +37,4 @@ public class ParametersDll
3537

3638
}
3739
public enum MyEnum { A = 1, B = 2 }
38-
}
40+
}

‎csharp/ql/test/library-tests/parameters/Parameters.dll

0 Bytes
Binary file not shown.

‎csharp/ql/test/library-tests/parameters/Parameters.expected

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ noDefaultValue
55
| Parameters.cs:8:17:8:18 | M2 | Parameters.cs:8:24:8:24 | a | 0 |
66
| Parameters.cs:12:17:12:18 | M6 | Parameters.cs:12:29:12:30 | s1 | 0 |
77
| Parameters.cs:13:17:13:18 | M7 | Parameters.cs:13:27:13:28 | e1 | 0 |
8-
| Parameters.cs:33:32:33:39 | implicit conversion | Parameters.cs:33:54:33:54 | i | 0 |
9-
| Parameters.cs:34:32:34:39 | implicit conversion | Parameters.cs:34:57:34:57 | s | 0 |
8+
| Parameters.cs:35:32:35:39 | implicit conversion | Parameters.cs:35:54:35:54 | i | 0 |
9+
| Parameters.cs:36:32:36:39 | implicit conversion | Parameters.cs:36:57:36:57 | s | 0 |
1010
| Parameters.dll:0:0:0:0 | M1 | Parameters.dll:0:0:0:0 | a | 0 |
1111
| Parameters.dll:0:0:0:0 | M1 | Parameters.dll:0:0:0:0 | b | 1 |
1212
| Parameters.dll:0:0:0:0 | M1 | Parameters.dll:0:0:0:0 | c | 2 |
@@ -45,6 +45,8 @@ withDefaultValue
4545
| Parameters.cs:27:17:27:19 | M19 | Parameters.cs:27:74:27:77 | arg9 | 0 | Parameters.cs:27:21:27:77 | 10.3 | 10.3 |
4646
| Parameters.cs:28:17:28:19 | M20 | Parameters.cs:28:67:28:71 | arg10 | 0 | Parameters.cs:28:21:28:71 | call to operator implicit conversion | - |
4747
| Parameters.cs:29:17:29:19 | M21 | Parameters.cs:29:76:29:80 | arg10 | 0 | Parameters.cs:29:21:29:80 | call to operator implicit conversion | - |
48+
| Parameters.cs:30:17:30:19 | M22 | Parameters.cs:30:27:30:31 | arg11 | 0 | Parameters.cs:30:35:30:35 | (...) ... | 0 |
49+
| Parameters.cs:31:17:31:19 | M23 | Parameters.cs:31:26:31:30 | arg12 | 0 | Parameters.cs:31:34:31:34 | (...) ... | 0 |
4850
| Parameters.dll:0:0:0:0 | M2 | Parameters.dll:0:0:0:0 | b | 1 | Parameters.dll:0:0:0:0 | default | null |
4951
| Parameters.dll:0:0:0:0 | M2 | Parameters.dll:0:0:0:0 | c | 2 | Parameters.dll:0:0:0:0 | "default string" | default string |
5052
| Parameters.dll:0:0:0:0 | M3 | Parameters.dll:0:0:0:0 | a | 0 | Parameters.dll:0:0:0:0 | 1 | 1 |
@@ -74,6 +76,8 @@ withDefaultValue
7476
| Parameters.dll:0:0:0:0 | M19 | Parameters.dll:0:0:0:0 | arg9 | 0 | Parameters.dll:0:0:0:0 | 10.3 | 10.3 |
7577
| Parameters.dll:0:0:0:0 | M20 | Parameters.dll:0:0:0:0 | arg10 | 0 | Parameters.dll:0:0:0:0 | call to operator implicit conversion | - |
7678
| Parameters.dll:0:0:0:0 | M21 | Parameters.dll:0:0:0:0 | arg10 | 0 | Parameters.dll:0:0:0:0 | call to operator implicit conversion | - |
79+
| Parameters.dll:0:0:0:0 | M22 | Parameters.dll:0:0:0:0 | arg11 | 0 | Parameters.dll:0:0:0:0 | (...) ... | 0 |
80+
| Parameters.dll:0:0:0:0 | M23 | Parameters.dll:0:0:0:0 | arg12 | 0 | Parameters.dll:0:0:0:0 | (...) ... | 0 |
7781
dateTimeDefaults
7882
| Parameters.cs:22:17:22:19 | M14 | Parameters.cs:22:64:22:67 | arg4 | Parameters.cs:22:21:22:67 | object creation of type DateTime | DateTime(long) | 14 |
7983
| Parameters.cs:23:17:23:19 | M15 | Parameters.cs:23:68:23:71 | arg5 | Parameters.cs:23:21:23:71 | object creation of type DateTime | DateTime(long) | 10001 |

0 commit comments

Comments
 (0)