Merge pull request #232 from Cysharp/hadashiA/fix-warns

Fix warnings for source generator
Cysharp · Mar 14, 2024 · efc72a2 · efc72a2
2 parents 0010ae8 + b5cf608
commit efc72a2
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/sandbox/Benchmark/Benchmarks/ListFormatterVsDirect.cs b/sandbox/Benchmark/Benchmarks/ListFormatterVsDirect.cs
@@ -47,7 +47,7 @@ public void SerializeFormatter()
     public void SerializePackable()
     {
         var writer = new MemoryPackWriter<ArrayBufferWriter<byte>>(ref buffer, state);
-        MemoryPack.Formatters.ListFormatter.SerializePackable(ref writer, ref value!);
+        MemoryPack.Formatters.ListFormatter.SerializePackable(ref writer, value!);
         writer.Flush();
         buffer.Clear();
     }

diff --git a/src/MemoryPack.Core/Formatters/CollectionFormatters.cs b/src/MemoryPack.Core/Formatters/CollectionFormatters.cs
@@ -53,7 +53,7 @@ public static class ListFormatter
     {
         [Preserve]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void SerializePackable<T, TBufferWriter>(ref MemoryPackWriter<TBufferWriter> writer, scoped ref List<T?>? value)
+        public static void SerializePackable<T, TBufferWriter>(ref MemoryPackWriter<TBufferWriter> writer, List<T?>? value)
             where T : IMemoryPackable<T>
 #if NET7_0_OR_GREATER
             where TBufferWriter : IBufferWriter<byte>

diff --git a/src/MemoryPack.Generator/MemoryPackGenerator.Emitter.cs b/src/MemoryPack.Generator/MemoryPackGenerator.Emitter.cs
@@ -485,7 +485,7 @@ private string EmitDeserializeBody()
         }
 {{circularReferenceBody}}
 {{readBeginBody}}
-{{circularReferenceBody2}}        
+{{circularReferenceBody2}}
 {{Members.Where(x => x.Symbol != null).Select(x => $"        {x.MemberType.FullyQualifiedToString()} __{x.Name};").NewLine()}}
 
         {{(!isVersionTolerant ? "" : "var readCount = " + count + ";")}}
@@ -532,7 +532,7 @@ private string EmitDeserializeBody()
             {
                 goto NEW;
             }
-{{(IsValueType ? "#if false" : "            else")}}            
+{{(IsValueType ? "#if false" : "            else")}}
             {
                 goto SET;
             }
@@ -669,7 +669,7 @@ string EmitVersionTorelantSerializeBody(bool isForUnity)
 {{EmitSerializeMembers(Members, "            ", toTempWriter: true, writeObjectHeader: false)}}
 
             tempWriter.Flush();
-            
+
             writer.WriteObjectHeader({{Members.Length}});
             for (int i = 0; i < {{Members.Length}}; i++)
             {
@@ -898,7 +898,7 @@ string EmitConstructor()
         }
         else
         {
-            var nameDict = Members.Where(x => x.Symbol != null && x.IsConstructorParameter).ToDictionary(x => x.ConstructorParameterName, x => x.Name, StringComparer.OrdinalIgnoreCase);
+            var nameDict = Members.Where(x => x.IsConstructorParameter).ToDictionary(x => x.ConstructorParameterName, x => x.Name, StringComparer.OrdinalIgnoreCase);
             var parameters = this.Constructor.Parameters
                 .Select(x =>
                 {
@@ -982,7 +982,7 @@ public override void Deserialize(ref MemoryPackReader reader, {{scopedRef}} {{Ty
         {
 {{OnDeserializing.Select(x => "            " + x.Emit()).NewLine()}}
 {{EmitUnionDeserializeBody()}}
-{{OnDeserialized.Select(x => "            " + x.Emit()).NewLine()}}            
+{{OnDeserialized.Select(x => "            " + x.Emit()).NewLine()}}
         }
     }
 }
@@ -1039,7 +1039,7 @@ public override void Deserialize(ref MemoryPackReader reader, {{scopedRef}} {{sy
         {
 {{OnDeserializing.Select(x => "            " + x.Emit()).NewLine()}}
 {{EmitUnionDeserializeBody()}}
-{{OnDeserialized.Select(x => "            " + x.Emit()).NewLine()}}            
+{{OnDeserialized.Select(x => "            " + x.Emit()).NewLine()}}
         }
 }
 
@@ -1051,7 +1051,7 @@ public static class {{initializerName}}
     public static void RegisterFormatter()
     {
 {{registerFormatterCode}}
-    }    
+    }
 }
 """;
 
@@ -1112,7 +1112,7 @@ string EmitUnionSerializeBody()
 
                 switch (tag)
                 {
-{{writeBody}}                
+{{writeBody}}
                     default:
                         break;
                 }
@@ -1162,7 +1162,7 @@ string EmitUnionDeserializeBody()
 {{OnDeserialized.Select(x => "                " + x.Emit()).NewLine()}}
                 return;
             }
-        
+
             switch (tag)
             {
 {{readBody}}
@@ -1261,7 +1261,7 @@ public string EmitSerialize(string writer)
             case MemberKind.MemoryPackableArray:
                 return $"{writer}.WritePackableArray(value.@{Name});";
             case MemberKind.MemoryPackableList:
-                return $"global::MemoryPack.Formatters.ListFormatter.SerializePackable(ref {writer}, ref System.Runtime.CompilerServices.Unsafe.AsRef(value.@{Name}));";
+                return $"global::MemoryPack.Formatters.ListFormatter.SerializePackable(ref {writer}, value.@{Name});";
             case MemberKind.Array:
                 return $"{writer}.WriteArray(value.@{Name});";
             case MemberKind.Blank:

diff --git a/...nity/Assets/Plugins/MemoryPack/Runtime/MemoryPack.Core/Formatters/CollectionFormatters.cs b/...nity/Assets/Plugins/MemoryPack/Runtime/MemoryPack.Core/Formatters/CollectionFormatters.cs
@@ -62,7 +62,7 @@ public static class ListFormatter
     {
         [Preserve]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void SerializePackable<T>(ref MemoryPackWriter writer, ref List<T?>? value)
+        public static void SerializePackable<T>(ref MemoryPackWriter writer, List<T?>? value)
             where T : IMemoryPackable<T>
 #if NET7_0_OR_GREATER
 

diff --git a/src/MemoryPack.Unity/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.cs b/src/MemoryPack.Unity/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.cs
@@ -412,7 +412,8 @@ static void Build(string sceneName, string buildPath, RuntimeUnitTestSettings se
         }
 
         // MemoryPack changed:
-        EditorUserBuildSettings.il2CppCodeGeneration = Il2CppCodeGeneration.OptimizeSpeed; //runtime
+        var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(targetGroup);
+        PlayerSettings.SetIl2CppCodeGeneration(namedBuildTarget, Il2CppCodeGeneration.OptimizeSpeed);
 
         var buildOptions = new BuildPlayerOptions
         {
@@ -471,7 +472,7 @@ static string GetExtensionForBuildTarget(BuildTarget buildTarget)
             case BuildTarget.StandaloneWindows64:
             case BuildTarget.WSAPlayer:
                 return ".exe";
-            case BuildTarget.StandaloneOSX:                
+            case BuildTarget.StandaloneOSX:
                 return ".app";
             case BuildTarget.Android:
                 return ".apk";

diff --git a/src/MemoryPack.Unity/Assets/Scripts/MemoryPackObjects/MemberKinds.cs b/src/MemoryPack.Unity/Assets/Scripts/MemoryPackObjects/MemberKinds.cs
@@ -43,6 +43,12 @@ public ref int K
             get { return ref kArray[0]; }
         }
 
+        public MemberKindsAllUnmanaged(int c, int d)
+        {
+            this.C = c;
+            this.D = d;
+        }
+
         public void SetH(int h)
         {
             this.H = h;