Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 f1a8213e 编写于 作者: J Julien Couvreur 提交者： GitHub
浏览文件
操作

Cannot assign maybe-null value to TNotNull variable (#41445)

上级 0cff1ac1
隐藏空白更改
内联 并排
Showing with 91 addition and 33 deletion
src/Compilers/CSharp/Portable/FlowAnalysis/NullableWalker.cs
浏览文件 @ f1a8213e
......@@ -1415,7 +1415,7 @@ private static bool ShouldReportNullableAssignment(TypeWithAnnotations type, Nul
return false;
case NullableFlowState.MaybeNull:
// https://github.com/dotnet/roslyn/issues/46044: Skip the following check if /langversion > 8?
if (type.Type.IsTypeParameterDisallowingAnnotationInCSharp8())
if (type.Type.IsTypeParameterDisallowingAnnotationInCSharp8() && !(type.Type is TypeParameterSymbol { IsNotNullable: true }))
{
return false;
}
......
src/Compilers/CSharp/Portable/Symbols/TypeSymbolExtensions.cs
浏览文件 @ f1a8213e
......@@ -52,6 +52,7 @@ public static bool CanBeConst(this TypeSymbol typeSymbol)
/// T where T : class? => true
/// T where T : IComparable => true
/// T where T : IComparable? => true
/// T where T : notnull => true
/// </summary>
/// <remarks>
/// In C#9, annotations are allowed regardless of constraints.
......
src/Compilers/CSharp/Test/Semantic/Semantics/NullableReferenceTypesTests.cs
浏览文件 @ f1a8213e
......@@ -35137,96 +35137,97 @@ class C<T>
comp.VerifyDiagnostics();
}
[Theory]
[InlineData("T")]
[InlineData("TNotNull")]
[Fact]
[WorkItem(39922, "https://github.com/dotnet/roslyn/issues/39922")]
public void EnforcedInMethodBody_MaybeNullWhen(string type)
public void EnforcedInMethodBody_MaybeNullWhen()
{
var source = @"
#nullable enable
using System.Diagnostics.CodeAnalysis;
class C<T, TNotNull>
where TNotNull : notnull
class C<T>
{
static void GetValue(TYPE x, [MaybeNull] out TYPE y)
static void GetValue(T x, [MaybeNull] out T y)
{
y = x;
}
static bool TryGetValue(TYPE x, [MaybeNullWhen(true)] out TYPE y)
static bool TryGetValue(T x, [MaybeNullWhen(true)] out T y)
{
y = x;
return y == null;
}
static bool TryGetValue2(TYPE x, [MaybeNullWhen(true)] out TYPE y)
static bool TryGetValue2(T x, [MaybeNullWhen(true)] out T y)
{
y = x;
return y != null;
}
static bool TryGetValue3(TYPE x, [MaybeNullWhen(false)] out TYPE y)
static bool TryGetValue3(T x, [MaybeNullWhen(false)] out T y)
{
y = x;
return y == null;
}
static bool TryGetValue4(TYPE x, [MaybeNullWhen(false)] out TYPE y)
static bool TryGetValue4(T x, [MaybeNullWhen(false)] out T y)
{
y = x;
return y != null;
}
}
";
var comp = CreateNullableCompilation(new[] { MaybeNullAttributeDefinition, MaybeNullWhenAttributeDefinition, source.Replace("TYPE", type) });
var comp = CreateNullableCompilation(new[] { MaybeNullAttributeDefinition, MaybeNullWhenAttributeDefinition, source });
comp.VerifyDiagnostics();
}
[Fact, WorkItem(39922, "https://github.com/dotnet/roslyn/issues/39922")]
public void EnforcedInMethodBody_MaybeNullWhen_ReferenceType()
[Theory]
[InlineData("TClass")]
[InlineData("TNotNull")]
[WorkItem(39922, "https://github.com/dotnet/roslyn/issues/39922")]
public void EnforcedInMethodBody_MaybeNullWhen_NotNullableTypes(string type)
{
var source = @"
#nullable enable
using System.Diagnostics.CodeAnalysis;
class C<TClass>
class C<TClass, TNotNull>
where TClass : class
where TNotNull : notnull
{
static bool TryGetValue(TClass x, [MaybeNullWhen(true)] out TClass y)
static bool TryGetValue(TYPE x, [MaybeNullWhen(true)] out TYPE y)
{
y = x;
return y == null;
}
static bool TryGetValue2(TClass x, [MaybeNullWhen(true)] out TClass y)
static bool TryGetValue2(TYPE x, [MaybeNullWhen(true)] out TYPE y)
{
y = x;
return y != null; // 1
}
static bool TryGetValue3(TClass x, [MaybeNullWhen(false)] out TClass y)
static bool TryGetValue3(TYPE x, [MaybeNullWhen(false)] out TYPE y)
{
y = x;
return y == null; // 2
}
static bool TryGetValue4(TClass x, [MaybeNullWhen(false)] out TClass y)
static bool TryGetValue4(TYPE x, [MaybeNullWhen(false)] out TYPE y)
{
y = x;
return y != null;
}
}
";
var comp = CreateNullableCompilation(new[] { MaybeNullWhenAttributeDefinition, source });
var comp = CreateNullableCompilation(new[] { MaybeNullWhenAttributeDefinition, source.Replace("TYPE", type) });
comp.VerifyDiagnostics(
// (17,9): error CS8762: Parameter 'y' must have a non-null value when exiting with 'false'.
// (18,9): warning CS8762: Parameter 'y' must have a non-null value when exiting with 'false'.
// return y != null; // 1
Diagnostic(ErrorCode.WRN_ParameterConditionallyDisallowsNull, "return y != null;").WithArguments("y", "false").WithLocation(17, 9),
// (23,9): error CS8762: Parameter 'y' must have a non-null value when exiting with 'true'.
Diagnostic(ErrorCode.WRN_ParameterConditionallyDisallowsNull, "return y != null;").WithArguments("y", "false").WithLocation(18, 9),
// (24,9): warning CS8762: Parameter 'y' must have a non-null value when exiting with 'true'.
// return y == null; // 2
Diagnostic(ErrorCode.WRN_ParameterConditionallyDisallowsNull, "return y == null;").WithArguments("y", "true").WithLocation(23, 9)
Diagnostic(ErrorCode.WRN_ParameterConditionallyDisallowsNull, "return y == null;").WithArguments("y", "true").WithLocation(24, 9)
);
}
......@@ -36133,11 +36134,8 @@ public class Derived : Base
}
";
var comp = CreateNullableCompilation(new[] { MaybeNullWhenAttributeDefinition, source });
// Note: we're missing warnings on F1 because the overridden method with substituted T from Derived has an oblivious T
// Note: we're missing warnings on F1 and F6 because the overridden method with substituted T from Derived has an oblivious T
// https://github.com/dotnet/roslyn/issues/41368
// Note: assignment of `[MaybeNull] TNotNull` to `TNotNull` is currently not detected
// This is a known issue: https://github.com/dotnet/roslyn/issues/41437
comp.VerifyDiagnostics(
// (14,26): warning CS8765: Type of parameter 't2' doesn't match overridden member because of nullability attributes.
// public override bool F2<T>([MaybeNullWhen(false)]T t1, [MaybeNullWhen(false)] out T t2, [MaybeNullWhen(false)] ref T t3, [MaybeNullWhen(false)] in T t4) where T : class => throw null!; // t2, t3
......@@ -36148,6 +36146,29 @@ public class Derived : Base
);
}
[Fact, WorkItem(41437, "https://github.com/dotnet/roslyn/issues/41437")]
public void AssigningMaybeNullTNotNullToTNotNullInOverride()
{
var source =
@"using System.Diagnostics.CodeAnalysis;
public class Base
{
public virtual bool F6<T>([AllowNull] in T t4) where T : notnull => throw null!;
}
public class Derived : Base
{
public override bool F6<T>(in T t4) => throw null!;
}
";
var comp = CreateNullableCompilation(new[] { AllowNullAttributeDefinition, source });
comp.VerifyDiagnostics(
// (8,26): warning CS8765: Nullability of type of parameter 't4' doesn't match overridden member (possibly because of nullability attributes).
// public override bool F6<T>(in T t4) => throw null!;
Diagnostic(ErrorCode.WRN_TopLevelNullabilityMismatchInParameterTypeOnOverride, "F6").WithArguments("t4").WithLocation(8, 26)
);
}
[Fact, WorkItem(41437, "https://github.com/dotnet/roslyn/issues/41437")]
public void MaybeNullWhenTrue_Parameter_Generic_OnOverrides_WithMaybeNull()
{
......@@ -36172,11 +36193,8 @@ public class Derived : Base
public override bool F6<T>([MaybeNull]T t1, [MaybeNull] out T t2, [MaybeNull] ref T t3, [MaybeNull] in T t4) => throw null!;
}
";
// Note: we're missing warnings on F1 because the overridden method with substituted T from Derived has an oblivious T
// Note: we're missing warnings on F1 and F6 because the overridden method with substituted T from Derived has an oblivious T
// https://github.com/dotnet/roslyn/issues/41368
// Note: assignment of `[MaybeNull] TNotNull` to `TNotNull` is currently not detected
// This is a known issue: https://github.com/dotnet/roslyn/issues/41437
var comp = CreateNullableCompilation(new[] { MaybeNullWhenAttributeDefinition, MaybeNullAttributeDefinition, source });
comp.VerifyDiagnostics(
// (14,26): warning CS8765: Type of parameter 't2' doesn't match overridden member because of nullability attributes.
......@@ -133261,6 +133279,45 @@ public static void Main()
CompileAndVerify(executeComp, expectedOutput: "ran");
}
[Fact, WorkItem(41437, "https://github.com/dotnet/roslyn/issues/41437")]
public void CannotAssignMaybeNullToTNotNull()
{
var source = @"
class C
{
TNotNull M<TNotNull>(TNotNull t) where TNotNull : notnull
{
if (t is null) System.Console.WriteLine();
return t; // 1
}
}";
var comp = CreateNullableCompilation(source);
comp.VerifyDiagnostics(
// (8,16): warning CS8603: Possible null reference return.
// return t; // 1
Diagnostic(ErrorCode.WRN_NullReferenceReturn, "t").WithLocation(8, 16)
);
}
[Fact, WorkItem(41437, "https://github.com/dotnet/roslyn/issues/41437")]
public void CanAssignMaybeNullToMaybeNullTNotNull()
{
var source = @"
using System.Diagnostics.CodeAnalysis;
class C
{
[return: MaybeNull] TNotNull M<TNotNull>(TNotNull t) where TNotNull : notnull
{
if (t is null) System.Console.WriteLine();
return t;
}
}";
var comp = CreateNullableCompilation(new[] { source, MaybeNullAttributeDefinition });
comp.VerifyDiagnostics();
}
[Fact]
[WorkItem(35602, "https://github.com/dotnet/roslyn/issues/35602")]
public void PureNullTestOnUnconstrainedType()
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或