Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

System.Text.Json emits uncompilable code #103565

Merged
merged 3 commits into from
Jun 17, 2024
Merged

System.Text.Json emits uncompilable code #103565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
308d857
Fixes #103515 - first pass
SteveDunn Jun 17, 2024
5bdea3e
PR feedback - add test and fix an instance of `!= null` to `is not null`
SteveDunn Jun 17, 2024
bb907e4
PR feedback
SteveDunn Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libraries/System.Text.Json/gen/JsonSourceGenerator.Emitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ private void GenerateFastPathFuncForObject(SourceWriter writer, ContextGeneratio
switch (defaultCheckType)
{
case SerializedValueCheckType.IgnoreWhenNull:
writer.WriteLine($"if ({propValueExpr} != null)");
writer.WriteLine($"if ({propValueExpr} is not null)");
writer.WriteLine('{');
writer.Indentation++;

Expand Down Expand Up @@ -974,7 +974,7 @@ private static void GenerateFastPathFuncHeader(SourceWriter writer, TypeGenerati
if (!skipNullCheck && typeGenSpec.TypeRef.CanBeNull)
{
writer.WriteLine($$"""
if ({{ValueVarName}} == null)
if ({{ValueVarName}} is null)
{
{{WriterVarName}}.WriteNullValue();
return;
Expand Down
34 changes: 34 additions & 0 deletions ....Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/JsonSourceGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,40 @@ internal partial class JsonContext : JsonSerializerContext
result.AssertContainsType("int");
}

[Fact]
public static void NoErrorsWhenUsingTypesWithMultipleEqualsOperators()
{
// Regression test for https://github.com/dotnet/runtime/issues/103515
string source = """
using System.Text.Json.Serialization;

namespace Test
{
public class Foo
{
public override bool Equals(object obj) => false;

public static bool operator ==(Foo left, Foo right) => false;
public static bool operator !=(Foo left, Foo right) => false;

public static bool operator ==(Foo left, string right) => false;
public static bool operator !=(Foo left, string right) => false;

public override int GetHashCode() => 1;
}

[JsonSourceGenerationOptions(WriteIndented = true)]
[JsonSerializable(typeof(Foo))]
internal partial class JsonSourceGenerationContext : JsonSerializerContext
{
}
}
""";

Compilation compilation = CompilationHelper.CreateCompilation(source);
CompilationHelper.RunJsonSourceGenerator(compilation);
}

[Fact]
public static void NoErrorsWhenUsingIgnoredReservedCSharpKeywords()
{
Expand Down
Loading