[Proto] Serialize the fields as uint to avoid signed extend

Linwenxuan04 · Linwenxuan04 · commit 1223f18be1cc · 2025-09-13T21:21:40.000+08:00
diff --git a/Lagrange.Proto.Generator/ProtoSourceGenerator.Emitter.Measure.cs b/Lagrange.Proto.Generator/ProtoSourceGenerator.Emitter.Measure.cs
@@ -60,7 +60,7 @@ private void EmitConstant(SourceWriter source)
                 int field = kv.Key;
                 var info = kv.Value;
 
-                var tag = ProtoHelper.EncodeVarInt(field << 3 | (byte)info.WireType);
+                var tag = ProtoHelper.EncodeVarInt((uint)field << 3 | (byte)info.WireType);
                 if (info.TypeSymbol.IsValueType && !info.TypeSymbol.IsNullable()) constant += tag.Length;
             }
 
@@ -69,7 +69,7 @@ private void EmitConstant(SourceWriter source)
 
         private void EmitLengthStatement(SourceWriter source, int field, ProtoFieldInfo info)
         {
-            int tag = field << 3 | (byte)info.WireType;
+            uint tag = (uint)field << 3 | (byte)info.WireType;
             var encodedTag = ProtoHelper.EncodeVarInt(tag);
 
             string memberName;
@@ -130,7 +130,7 @@ WireType.VarInt when info.TypeSymbol.IsIntegerType() => $"{GetVarIntLengthMethod
         
         private static string GenerateIfNotDefaultExpression(string variableName, string left, string right) => $"({variableName} != default ? {left} : {right})";
         
-        private string GenerateShouldSerializeExpression(int tag, string left, string right) =>
+        private string GenerateShouldSerializeExpression(uint tag, string left, string right) =>
             $"({_fullQualifiedName}.{TypeInfoPropertyName}.Fields[{tag}].{ShouldSerializeTypeRef}({ObjectVarName}, {parser.IgnoreDefaultFields.ToString().ToLower()}) ? {left} : {right})";
     }
 }
diff --git a/Lagrange.Proto.Generator/ProtoSourceGenerator.Emitter.Serialize.cs b/Lagrange.Proto.Generator/ProtoSourceGenerator.Emitter.Serialize.cs
@@ -47,7 +47,7 @@ private void EmitSerializeMethod(SourceWriter source)
 
         private void EmitMembers(SourceWriter source, int field, ProtoFieldInfo info)
         {
-            int tag = field << 3 | (byte)info.WireType;
+            uint tag = (uint)field << 3 | (byte)info.WireType;
             var encodedTag = ProtoHelper.EncodeVarInt(tag);
             
             string memberName =  info.TypeSymbol.IsValueType && info.TypeSymbol.IsNullable() 
@@ -161,7 +161,7 @@ private static void EmitIfNotDefaultStatement(SourceWriter source, string variab
             source.WriteLine("}");
         }
         
-        private void EmitIfShouldSerializeStatement(SourceWriter source, int tag, Action<SourceWriter> emitAction)
+        private void EmitIfShouldSerializeStatement(SourceWriter source, uint tag, Action<SourceWriter> emitAction)
         {
             source.WriteLine($"if ({_fullQualifiedName}.{TypeInfoPropertyName}.Fields[{tag}].{ShouldSerializeTypeRef}({ObjectVarName}, {parser.IgnoreDefaultFields.ToString().ToLower()}))");
             source.WriteLine("{");
diff --git a/Lagrange.Proto.Generator/ProtoSourceGenerator.Emitter.TypeInfo.cs b/Lagrange.Proto.Generator/ProtoSourceGenerator.Emitter.TypeInfo.cs
@@ -61,7 +61,7 @@ private void EmitTypeInfo(SourceWriter source)
             source.WriteLine('{');
             source.Indentation++;
             
-            source.WriteLine($"Fields = new global::System.Collections.Generic.Dictionary<int, {string.Format(ProtoFieldInfoTypeRef)}>()");
+            source.WriteLine($"Fields = new global::System.Collections.Generic.Dictionary<uint, {string.Format(ProtoFieldInfoTypeRef)}>()");
             source.WriteLine('{');
             source.Indentation++;
             foreach (var kv in parser.Fields)
diff --git a/Lagrange.Proto.Generator/Utility/ProtoHelper.cs b/Lagrange.Proto.Generator/Utility/ProtoHelper.cs
@@ -6,7 +6,7 @@ namespace Lagrange.Proto.Generator.Utility;
 
 public static class ProtoHelper
 {
-    public static byte[] EncodeVarInt(int value)
+    public static byte[] EncodeVarInt(uint value)
     {
         Span<byte> result = stackalloc byte[5];
         int i = 0;
diff --git a/Lagrange.Proto/Nodes/ProtoObject.cs b/Lagrange.Proto/Nodes/ProtoObject.cs
@@ -14,7 +14,7 @@ public override void WriteTo(int field, ProtoWriter writer)
         
         foreach (var (f, node) in _fields)
         {
-            writer.EncodeVarInt(f << 3 | (int)node.WireType);
+            writer.EncodeVarInt((uint)f << 3 | (uint)node.WireType);
             node.WriteTo(f, writer);
         }
     }
@@ -26,7 +26,7 @@ public override int Measure(int field)
         {
             if (node is ProtoArray { Count: 0 }) continue;
             
-            size += ProtoHelper.GetVarIntLength(f << 3 | (int)node.WireType);
+            size += ProtoHelper.GetVarIntLength((uint)f << 3 | (uint)node.WireType);
             size += node.Measure(f);
         }
         return size;
@@ -89,7 +89,7 @@ public byte[] Serialize()
             {
                 if (node is ProtoArray { Count: 0 }) continue;
                 
-                writer.EncodeVarInt(f << 3 | (int)node.WireType);
+                writer.EncodeVarInt((uint)f << 3 | (uint)node.WireType);
                 node.WriteTo(f, writer);
             }
             writer.Flush();
@@ -109,7 +109,7 @@ public void Serialize(IBufferWriter<byte> buffer)
         {
             foreach (var (f, node) in _fields)
             {
-                writer.EncodeVarInt(f << 3 | (int)node.WireType);
+                writer.EncodeVarInt((uint)f << 3 | (uint)node.WireType);
                 node.WriteTo(f, writer);
             } 
             writer.Flush();
diff --git a/Lagrange.Proto/Serialization/Converter/Object/ProtoObjectConverter.cs b/Lagrange.Proto/Serialization/Converter/Object/ProtoObjectConverter.cs
@@ -57,7 +57,7 @@ public override T Read(int field, WireType wireType, ref ProtoReader reader)
         var subReader = new ProtoReader(subSpan);
         while (!subReader.IsCompleted)
         {
-            int tag = subReader.DecodeVarIntUnsafe<int>();
+            uint tag = subReader.DecodeVarIntUnsafe<uint>();
             if (ObjectInfo.Fields.TryGetValue(tag, out var fieldInfo))
             {
                 fieldInfo.Read(ref subReader, boxed);
diff --git a/Lagrange.Proto/Serialization/Metadata/ProtoObjectInfo.cs b/Lagrange.Proto/Serialization/Metadata/ProtoObjectInfo.cs
@@ -5,7 +5,7 @@ namespace Lagrange.Proto.Serialization.Metadata;
 [DebuggerDisplay("Fields = {Fields.Count}")]
 public class ProtoObjectInfo<T>
 {
-    public Dictionary<int, ProtoFieldInfo> Fields { get; init; } = new();
+    public Dictionary<uint, ProtoFieldInfo> Fields { get; init; } = new();
     
     public Func<T>? ObjectCreator { get; init; }
     
diff --git a/Lagrange.Proto/Serialization/Metadata/ProtoTypeResolver.Dynamic.cs b/Lagrange.Proto/Serialization/Metadata/ProtoTypeResolver.Dynamic.cs
@@ -66,15 +66,15 @@ internal static ProtoObjectInfo<T> CreateObjectInfo<T>()
     {
         var ctor = typeof(T).IsValueType ? null : typeof(T).GetConstructor(Type.EmptyTypes);
         bool ignoreDefaultFields = typeof(T).GetCustomAttribute<ProtoPackableAttribute>()?.IgnoreDefaultFields == true;
-        var fields = new Dictionary<int, ProtoFieldInfo>();
+        var fields = new Dictionary<uint, ProtoFieldInfo>();
         
         foreach (var field in typeof(T).GetFields(BindingFlags.Public | BindingFlags.Instance))
         {
             if (field.IsStatic) continue;
             var fieldInfo = CreateFieldInfo(typeof(T), field);
             if (fieldInfo == null) continue;
 
-            int tag = (fieldInfo.Field << 3) | (byte)fieldInfo.WireType;
+            uint tag = ((uint)fieldInfo.Field << 3) | (byte)fieldInfo.WireType;
             if (fields.ContainsKey(tag)) ThrowHelper.ThrowInvalidOperationException_DuplicateField(typeof(T), fieldInfo.Field);
             fields[tag] = fieldInfo;
         }
@@ -84,7 +84,7 @@ internal static ProtoObjectInfo<T> CreateObjectInfo<T>()
             var fieldInfo = CreateFieldInfo(typeof(T), field);
             if (fieldInfo == null) continue;
             
-            int tag = (fieldInfo.Field << 3) | (byte)fieldInfo.WireType;
+            uint tag = ((uint)fieldInfo.Field << 3) | (byte)fieldInfo.WireType;
             if (fields.ContainsKey(tag)) ThrowHelper.ThrowInvalidOperationException_DuplicateField(typeof(T), fieldInfo.Field);
             fields[tag] = fieldInfo;
         }
diff --git a/Lagrange.Proto/Serialization/ProtoSerializer.Deserialize.cs b/Lagrange.Proto/Serialization/ProtoSerializer.Deserialize.cs
@@ -29,7 +29,7 @@ private static T DeserializeProtoPackableCore<T>(ref ProtoReader reader) where T
 
         while (!reader.IsCompleted)
         {
-            int tag = reader.DecodeVarIntUnsafe<int>();
+            uint tag = reader.DecodeVarIntUnsafe<uint>();
             if (objectInfo.Fields.TryGetValue(tag, out var fieldInfo))
             {
                 fieldInfo.Read(ref reader, target);
@@ -86,7 +86,7 @@ private static T DeserializeProtoPackableCore<T>(ref ProtoReader reader) where T
 
         while (!reader.IsCompleted)
         {
-            int tag = reader.DecodeVarIntUnsafe<int>();
+            uint tag = reader.DecodeVarIntUnsafe<uint>();
             if (converter.ObjectInfo.Fields.TryGetValue(tag, out var fieldInfo))
             {
                 fieldInfo.Read(ref reader, boxed);

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private void EmitConstant(SourceWriter source)`
`60`	`60`	`int field = kv.Key;`
`61`	`61`	`var info = kv.Value;`
`62`	`62`
`63`		`- var tag = ProtoHelper.EncodeVarInt(field << 3 \| (byte)info.WireType);`
	`63`	`+ var tag = ProtoHelper.EncodeVarInt((uint)field << 3 \| (byte)info.WireType);`
`64`	`64`	`if (info.TypeSymbol.IsValueType && !info.TypeSymbol.IsNullable()) constant += tag.Length;`
`65`	`65`	`}`
`66`	`66`
`@@ -69,7 +69,7 @@ private void EmitConstant(SourceWriter source)`
`69`	`69`
`70`	`70`	`private void EmitLengthStatement(SourceWriter source, int field, ProtoFieldInfo info)`
`71`	`71`	`{`
`72`		`- int tag = field << 3 \| (byte)info.WireType;`
	`72`	`+ uint tag = (uint)field << 3 \| (byte)info.WireType;`
`73`	`73`	`var encodedTag = ProtoHelper.EncodeVarInt(tag);`
`74`	`74`
`75`	`75`	`string memberName;`
`@@ -130,7 +130,7 @@ WireType.VarInt when info.TypeSymbol.IsIntegerType() => $"{GetVarIntLengthMethod`
`130`	`130`
`131`	`131`	`private static string GenerateIfNotDefaultExpression(string variableName, string left, string right) => $"({variableName} != default ? {left} : {right})";`
`132`	`132`
`133`		`- private string GenerateShouldSerializeExpression(int tag, string left, string right) =>`
	`133`	`+ private string GenerateShouldSerializeExpression(uint tag, string left, string right) =>`
`134`	`134`	`$"({_fullQualifiedName}.{TypeInfoPropertyName}.Fields[{tag}].{ShouldSerializeTypeRef}({ObjectVarName}, {parser.IgnoreDefaultFields.ToString().ToLower()}) ? {left} : {right})";`
`135`	`135`	`}`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ private void EmitSerializeMethod(SourceWriter source)`
`47`	`47`
`48`	`48`	`private void EmitMembers(SourceWriter source, int field, ProtoFieldInfo info)`
`49`	`49`	`{`
`50`		`- int tag = field << 3 \| (byte)info.WireType;`
	`50`	`+ uint tag = (uint)field << 3 \| (byte)info.WireType;`
`51`	`51`	`var encodedTag = ProtoHelper.EncodeVarInt(tag);`
`52`	`52`
`53`	`53`	`string memberName = info.TypeSymbol.IsValueType && info.TypeSymbol.IsNullable()`
`@@ -161,7 +161,7 @@ private static void EmitIfNotDefaultStatement(SourceWriter source, string variab`
`161`	`161`	`source.WriteLine("}");`
`162`	`162`	`}`
`163`	`163`
`164`		`- private void EmitIfShouldSerializeStatement(SourceWriter source, int tag, Action<SourceWriter> emitAction)`
	`164`	`+ private void EmitIfShouldSerializeStatement(SourceWriter source, uint tag, Action<SourceWriter> emitAction)`
`165`	`165`	`{`
`166`	`166`	`source.WriteLine($"if ({_fullQualifiedName}.{TypeInfoPropertyName}.Fields[{tag}].{ShouldSerializeTypeRef}({ObjectVarName}, {parser.IgnoreDefaultFields.ToString().ToLower()}))");`
`167`	`167`	`source.WriteLine("{");`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace Lagrange.Proto.Generator.Utility;`
`6`	`6`
`7`	`7`	`public static class ProtoHelper`
`8`	`8`	`{`
`9`		`- public static byte[] EncodeVarInt(int value)`
	`9`	`+ public static byte[] EncodeVarInt(uint value)`
`10`	`10`	`{`
`11`	`11`	`Span<byte> result = stackalloc byte[5];`
`12`	`12`	`int i = 0;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public override void WriteTo(int field, ProtoWriter writer)`
`14`	`14`
`15`	`15`	`foreach (var (f, node) in _fields)`
`16`	`16`	`{`
`17`		`- writer.EncodeVarInt(f << 3 \| (int)node.WireType);`
	`17`	`+ writer.EncodeVarInt((uint)f << 3 \| (uint)node.WireType);`
`18`	`18`	`node.WriteTo(f, writer);`
`19`	`19`	`}`
`20`	`20`	`}`
`@@ -26,7 +26,7 @@ public override int Measure(int field)`
`26`	`26`	`{`
`27`	`27`	`if (node is ProtoArray { Count: 0 }) continue;`
`28`	`28`
`29`		`- size += ProtoHelper.GetVarIntLength(f << 3 \| (int)node.WireType);`
	`29`	`+ size += ProtoHelper.GetVarIntLength((uint)f << 3 \| (uint)node.WireType);`
`30`	`30`	`size += node.Measure(f);`
`31`	`31`	`}`
`32`	`32`	`return size;`
`@@ -89,7 +89,7 @@ public byte[] Serialize()`
`89`	`89`	`{`
`90`	`90`	`if (node is ProtoArray { Count: 0 }) continue;`
`91`	`91`
`92`		`- writer.EncodeVarInt(f << 3 \| (int)node.WireType);`
	`92`	`+ writer.EncodeVarInt((uint)f << 3 \| (uint)node.WireType);`
`93`	`93`	`node.WriteTo(f, writer);`
`94`	`94`	`}`
`95`	`95`	`writer.Flush();`
`@@ -109,7 +109,7 @@ public void Serialize(IBufferWriter<byte> buffer)`
`109`	`109`	`{`
`110`	`110`	`foreach (var (f, node) in _fields)`
`111`	`111`	`{`
`112`		`- writer.EncodeVarInt(f << 3 \| (int)node.WireType);`
	`112`	`+ writer.EncodeVarInt((uint)f << 3 \| (uint)node.WireType);`
`113`	`113`	`node.WriteTo(f, writer);`
`114`	`114`	`}`
`115`	`115`	`writer.Flush();`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public override T Read(int field, WireType wireType, ref ProtoReader reader)`
`57`	`57`	`var subReader = new ProtoReader(subSpan);`
`58`	`58`	`while (!subReader.IsCompleted)`
`59`	`59`	`{`
`60`		`- int tag = subReader.DecodeVarIntUnsafe<int>();`
	`60`	`+ uint tag = subReader.DecodeVarIntUnsafe<uint>();`
`61`	`61`	`if (ObjectInfo.Fields.TryGetValue(tag, out var fieldInfo))`
`62`	`62`	`{`
`63`	`63`	`fieldInfo.Read(ref subReader, boxed);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Lagrange.Proto.Serialization.Metadata;`
`5`	`5`	`[DebuggerDisplay("Fields = {Fields.Count}")]`
`6`	`6`	`public class ProtoObjectInfo<T>`
`7`	`7`	`{`
`8`		`- public Dictionary<int, ProtoFieldInfo> Fields { get; init; } = new();`
	`8`	`+ public Dictionary<uint, ProtoFieldInfo> Fields { get; init; } = new();`
`9`	`9`
`10`	`10`	`public Func<T>? ObjectCreator { get; init; }`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -66,15 +66,15 @@ internal static ProtoObjectInfo<T> CreateObjectInfo<T>()`
`66`	`66`	`{`
`67`	`67`	`var ctor = typeof(T).IsValueType ? null : typeof(T).GetConstructor(Type.EmptyTypes);`
`68`	`68`	`bool ignoreDefaultFields = typeof(T).GetCustomAttribute<ProtoPackableAttribute>()?.IgnoreDefaultFields == true;`
`69`		`- var fields = new Dictionary<int, ProtoFieldInfo>();`
	`69`	`+ var fields = new Dictionary<uint, ProtoFieldInfo>();`
`70`	`70`
`71`	`71`	`foreach (var field in typeof(T).GetFields(BindingFlags.Public \| BindingFlags.Instance))`
`72`	`72`	`{`
`73`	`73`	`if (field.IsStatic) continue;`
`74`	`74`	`var fieldInfo = CreateFieldInfo(typeof(T), field);`
`75`	`75`	`if (fieldInfo == null) continue;`
`76`	`76`
`77`		`- int tag = (fieldInfo.Field << 3) \| (byte)fieldInfo.WireType;`
	`77`	`+ uint tag = ((uint)fieldInfo.Field << 3) \| (byte)fieldInfo.WireType;`
`78`	`78`	`if (fields.ContainsKey(tag)) ThrowHelper.ThrowInvalidOperationException_DuplicateField(typeof(T), fieldInfo.Field);`
`79`	`79`	`fields[tag] = fieldInfo;`
`80`	`80`	`}`
`@@ -84,7 +84,7 @@ internal static ProtoObjectInfo<T> CreateObjectInfo<T>()`
`84`	`84`	`var fieldInfo = CreateFieldInfo(typeof(T), field);`
`85`	`85`	`if (fieldInfo == null) continue;`
`86`	`86`
`87`		`- int tag = (fieldInfo.Field << 3) \| (byte)fieldInfo.WireType;`
	`87`	`+ uint tag = ((uint)fieldInfo.Field << 3) \| (byte)fieldInfo.WireType;`
`88`	`88`	`if (fields.ContainsKey(tag)) ThrowHelper.ThrowInvalidOperationException_DuplicateField(typeof(T), fieldInfo.Field);`
`89`	`89`	`fields[tag] = fieldInfo;`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ private static T DeserializeProtoPackableCore<T>(ref ProtoReader reader) where T`
`29`	`29`
`30`	`30`	`while (!reader.IsCompleted)`
`31`	`31`	`{`
`32`		`- int tag = reader.DecodeVarIntUnsafe<int>();`
	`32`	`+ uint tag = reader.DecodeVarIntUnsafe<uint>();`
`33`	`33`	`if (objectInfo.Fields.TryGetValue(tag, out var fieldInfo))`
`34`	`34`	`{`
`35`	`35`	`fieldInfo.Read(ref reader, target);`
`@@ -86,7 +86,7 @@ private static T DeserializeProtoPackableCore<T>(ref ProtoReader reader) where T`
`86`	`86`
`87`	`87`	`while (!reader.IsCompleted)`
`88`	`88`	`{`
`89`		`- int tag = reader.DecodeVarIntUnsafe<int>();`
	`89`	`+ uint tag = reader.DecodeVarIntUnsafe<uint>();`
`90`	`90`	`if (converter.ObjectInfo.Fields.TryGetValue(tag, out var fieldInfo))`
`91`	`91`	`{`
`92`	`92`	`fieldInfo.Read(ref reader, boxed);`