Use 'in' instead of 'ref' where possible

SergeiPavlov · SergeiPavlov · commit cc1628fc81d7 · 2022-03-15T21:48:35.000-07:00
diff --git a/Orm/Xtensive.Orm/Tuples/AccessorDelegates.cs b/Orm/Xtensive.Orm/Tuples/AccessorDelegates.cs
@@ -25,5 +25,5 @@ namespace Xtensive.Tuples
   /// <param name="tuple">Tuple to use.</param>
   /// <param name="descriptor">Field descriptor.</param>
   /// <param name="value">A value.</param>
-  internal delegate void SetValueDelegate<TValue>(PackedTuple tuple, ref PackedFieldDescriptor descriptor, TValue value);
+  internal delegate void SetValueDelegate<TValue>(PackedTuple tuple, in PackedFieldDescriptor descriptor, TValue value);
 }
diff --git a/Orm/Xtensive.Orm/Tuples/Packed/PackedFieldAccessor.cs b/Orm/Xtensive.Orm/Tuples/Packed/PackedFieldAccessor.cs
@@ -38,13 +38,14 @@ internal abstract class PackedFieldAccessor
     protected readonly long ValueBitMask;
     public readonly byte Index;
 
-    public void SetValue<T>(PackedTuple tuple, ref PackedFieldDescriptor descriptor, bool isNullable, T value)
+    public void SetValue<T>(PackedTuple tuple, in PackedFieldDescriptor descriptor, bool isNullable, T value)
     {
-      var setter = (isNullable ? NullableSetter : Setter) as SetValueDelegate<T>;
-      if (setter!=null)
-        setter.Invoke(tuple, ref descriptor, value);
-      else
-        SetUntypedValue(tuple, ref descriptor, value);
+      if ((isNullable ? NullableSetter : Setter) is SetValueDelegate<T> setter) {
+        setter.Invoke(tuple, descriptor, value);
+      }
+      else {
+        SetUntypedValue(tuple, descriptor, value);
+      }
     }
 
     public T GetValue<T>(PackedTuple tuple, in PackedFieldDescriptor descriptor, bool isNullable, out TupleFieldState fieldState)
@@ -64,10 +65,10 @@ public T GetValue<T>(PackedTuple tuple, in PackedFieldDescriptor descriptor, boo
 
     public abstract object GetUntypedValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, out TupleFieldState fieldState);
 
-    public abstract void SetUntypedValue(PackedTuple tuple, ref PackedFieldDescriptor descriptor, object value);
+    public abstract void SetUntypedValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, object value);
 
-    public abstract void CopyValue(PackedTuple source, ref PackedFieldDescriptor sourceDescriptor,
-      PackedTuple target, ref PackedFieldDescriptor targetDescriptor);
+    public abstract void CopyValue(PackedTuple source, in PackedFieldDescriptor sourceDescriptor,
+      PackedTuple target, in PackedFieldDescriptor targetDescriptor);
 
     public abstract bool ValueEquals(PackedTuple left, in PackedFieldDescriptor leftDescriptor,
       PackedTuple right, in PackedFieldDescriptor rightDescriptor);
@@ -108,17 +109,14 @@ public override object GetUntypedValue(PackedTuple tuple, in PackedFieldDescript
       return state==TupleFieldState.Available ? tuple.Objects[descriptor.ObjectIndex] : null;
     }
 
-    public override void SetUntypedValue(PackedTuple tuple, ref PackedFieldDescriptor descriptor, object value)
+    public override void SetUntypedValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, object value)
     {
       tuple.Objects[descriptor.ObjectIndex] = value;
-      if (value!=null)
-        tuple.SetFieldState(ref descriptor, TupleFieldState.Available);
-      else
-        tuple.SetFieldState(ref descriptor, TupleFieldState.Available | TupleFieldState.Null);
+      tuple.SetFieldState(descriptor, value != null ? TupleFieldState.Available : (TupleFieldState.Available | TupleFieldState.Null));
     }
 
-    public override void CopyValue(PackedTuple source, ref PackedFieldDescriptor sourceDescriptor,
-      PackedTuple target, ref PackedFieldDescriptor targetDescriptor)
+    public override void CopyValue(PackedTuple source, in PackedFieldDescriptor sourceDescriptor,
+      PackedTuple target, in PackedFieldDescriptor targetDescriptor)
     {
       target.Objects[targetDescriptor.ObjectIndex] = source.Objects[sourceDescriptor.ObjectIndex];
     }
@@ -174,21 +172,21 @@ public override object GetUntypedValue(PackedTuple tuple, in PackedFieldDescript
       return state==TupleFieldState.Available ? (object) Load(tuple, descriptor) : null;
     }
 
-    public override void SetUntypedValue(PackedTuple tuple, ref PackedFieldDescriptor descriptor, object value)
+    public override void SetUntypedValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, object value)
     {
       if (value!=null) {
-        Store(tuple, ref descriptor, (T) value);
-        tuple.SetFieldState(ref descriptor, TupleFieldState.Available);
+        Store(tuple, descriptor, (T) value);
+        tuple.SetFieldState(descriptor, TupleFieldState.Available);
       }
       else {
-        tuple.SetFieldState(ref descriptor, TupleFieldState.Available | TupleFieldState.Null);
+        tuple.SetFieldState(descriptor, TupleFieldState.Available | TupleFieldState.Null);
       }
     }
 
-    public override void CopyValue(PackedTuple source, ref PackedFieldDescriptor sourceDescriptor,
-      PackedTuple target, ref PackedFieldDescriptor targetDescriptor)
+    public override void CopyValue(PackedTuple source, in PackedFieldDescriptor sourceDescriptor,
+      PackedTuple target, in PackedFieldDescriptor targetDescriptor)
     {
-      Store(target, ref targetDescriptor, Load(source, sourceDescriptor));
+      Store(target, targetDescriptor, Load(source, sourceDescriptor));
     }
 
     public override bool ValueEquals(PackedTuple left, in PackedFieldDescriptor leftDescriptor,
@@ -218,23 +216,23 @@ private T GetValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, out T
       return state==TupleFieldState.Available ? Load(tuple, descriptor) : NullValue;
     }
 
-    private void SetValue(PackedTuple tuple, ref PackedFieldDescriptor descriptor, T value)
+    private void SetValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, T value)
     {
-      Store(tuple, ref descriptor, value);
-      tuple.SetFieldState(ref descriptor, TupleFieldState.Available);
+      Store(tuple, descriptor, value);
+      tuple.SetFieldState(descriptor, TupleFieldState.Available);
     }
 
-    private void SetNullableValue(PackedTuple tuple, ref PackedFieldDescriptor descriptor, T? value)
+    private void SetNullableValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, T? value)
     {
       if (value!=null) {
-        Store(tuple, ref descriptor, value.Value);
-        tuple.SetFieldState(ref descriptor, TupleFieldState.Available);
+        Store(tuple, descriptor, value.Value);
+        tuple.SetFieldState(descriptor, TupleFieldState.Available);
       }
       else
-        tuple.SetFieldState(ref descriptor, TupleFieldState.Available | TupleFieldState.Null);
+        tuple.SetFieldState(descriptor, TupleFieldState.Available | TupleFieldState.Null);
     }
 
-    private void Store(PackedTuple tuple, ref PackedFieldDescriptor d, T value)
+    private void Store(PackedTuple tuple, in PackedFieldDescriptor d, T value)
     {
       var valueIndex = d.ValueIndex;
       if (Rank > 6) {
diff --git a/Orm/Xtensive.Orm/Tuples/Packed/PackedTuple.cs b/Orm/Xtensive.Orm/Tuples/Packed/PackedTuple.cs
@@ -88,7 +88,7 @@ protected internal override void SetFieldState(int fieldIndex, TupleFieldState f
         throw new ArgumentOutOfRangeException(nameof(fieldState));
       }
 
-      SetFieldState(ref PackedDescriptor.FieldDescriptors[fieldIndex], fieldState);
+      SetFieldState(PackedDescriptor.FieldDescriptors[fieldIndex], fieldState);
     }
 
     public override object GetValue(int fieldIndex, out TupleFieldState fieldState)
@@ -100,10 +100,10 @@ public override object GetValue(int fieldIndex, out TupleFieldState fieldState)
     public override void SetValue(int fieldIndex, object fieldValue)
     {
       ref var descriptor = ref PackedDescriptor.FieldDescriptors[fieldIndex];
-      descriptor.Accessor.SetUntypedValue(this, ref descriptor, fieldValue);
+      descriptor.Accessor.SetUntypedValue(this, descriptor, fieldValue);
     }
 
-    public void SetFieldState(ref PackedFieldDescriptor d, TupleFieldState fieldState)
+    public void SetFieldState(in PackedFieldDescriptor d, TupleFieldState fieldState)
     {
       var bits = (long) fieldState;
       ref var block = ref Values[d.StateIndex];
diff --git a/Orm/Xtensive.Orm/Tuples/Tuple.cs b/Orm/Xtensive.Orm/Tuples/Tuple.cs
@@ -187,14 +187,14 @@ public void SetValue<T>(int fieldIndex, T fieldValue)
 
       if (this is PackedTuple packedTuple) {
         ref var descriptor = ref packedTuple.PackedDescriptor.FieldDescriptors[fieldIndex];
-        descriptor.Accessor.SetValue(packedTuple, ref descriptor, isNullable, fieldValue);
+        descriptor.Accessor.SetValue(packedTuple, descriptor, isNullable, fieldValue);
         return;
       }
 
       var mappedContainer = GetMappedContainer(fieldIndex, true);
       if (mappedContainer.First is PackedTuple mappedTuple) {
         ref var descriptor = ref mappedTuple.PackedDescriptor.FieldDescriptors[mappedContainer.Second];
-        descriptor.Accessor.SetValue(mappedTuple, ref descriptor, isNullable, fieldValue);
+        descriptor.Accessor.SetValue(mappedTuple, descriptor, isNullable, fieldValue);
         return;
       }
 
diff --git a/Orm/Xtensive.Orm/Tuples/TupleExtensions.cs b/Orm/Xtensive.Orm/Tuples/TupleExtensions.cs
@@ -457,7 +457,7 @@ private static void CopyPackedValue(PackedTuple source, int sourceIndex, PackedT
       }
 
       target.SetFieldState(targetIndex, TupleFieldState.Available);
-      accessor.CopyValue(source, ref sourceDescriptor, target, ref targetDescriptor);
+      accessor.CopyValue(source, sourceDescriptor, target, targetDescriptor);
     }
 
     private static void PartiallyCopyTupleSlow(Tuple source, Tuple target, int sourceStartIndex, int targetStartIndex, int length)

Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ namespace Xtensive.Tuples`
`25`	`25`	`/// <param name="tuple">Tuple to use.</param>`
`26`	`26`	`/// <param name="descriptor">Field descriptor.</param>`
`27`	`27`	`/// <param name="value">A value.</param>`
`28`		`- internal delegate void SetValueDelegate<TValue>(PackedTuple tuple, ref PackedFieldDescriptor descriptor, TValue value);`
	`28`	`+ internal delegate void SetValueDelegate<TValue>(PackedTuple tuple, in PackedFieldDescriptor descriptor, TValue value);`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,14 @@ internal abstract class PackedFieldAccessor`
`38`	`38`	`protected readonly long ValueBitMask;`
`39`	`39`	`public readonly byte Index;`
`40`	`40`
`41`		`- public void SetValue<T>(PackedTuple tuple, ref PackedFieldDescriptor descriptor, bool isNullable, T value)`
	`41`	`+ public void SetValue<T>(PackedTuple tuple, in PackedFieldDescriptor descriptor, bool isNullable, T value)`
`42`	`42`	`{`
`43`		`- var setter = (isNullable ? NullableSetter : Setter) as SetValueDelegate<T>;`
`44`		`- if (setter!=null)`
`45`		`- setter.Invoke(tuple, ref descriptor, value);`
`46`		`- else`
`47`		`- SetUntypedValue(tuple, ref descriptor, value);`
	`43`	`+ if ((isNullable ? NullableSetter : Setter) is SetValueDelegate<T> setter) {`
	`44`	`+ setter.Invoke(tuple, descriptor, value);`
	`45`	`+ }`
	`46`	`+ else {`
	`47`	`+ SetUntypedValue(tuple, descriptor, value);`
	`48`	`+ }`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`public T GetValue<T>(PackedTuple tuple, in PackedFieldDescriptor descriptor, bool isNullable, out TupleFieldState fieldState)`
`@@ -64,10 +65,10 @@ public T GetValue<T>(PackedTuple tuple, in PackedFieldDescriptor descriptor, boo`
`64`	`65`
`65`	`66`	`public abstract object GetUntypedValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, out TupleFieldState fieldState);`
`66`	`67`
`67`		`- public abstract void SetUntypedValue(PackedTuple tuple, ref PackedFieldDescriptor descriptor, object value);`
	`68`	`+ public abstract void SetUntypedValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, object value);`
`68`	`69`
`69`		`- public abstract void CopyValue(PackedTuple source, ref PackedFieldDescriptor sourceDescriptor,`
`70`		`- PackedTuple target, ref PackedFieldDescriptor targetDescriptor);`
	`70`	`+ public abstract void CopyValue(PackedTuple source, in PackedFieldDescriptor sourceDescriptor,`
	`71`	`+ PackedTuple target, in PackedFieldDescriptor targetDescriptor);`
`71`	`72`
`72`	`73`	`public abstract bool ValueEquals(PackedTuple left, in PackedFieldDescriptor leftDescriptor,`
`73`	`74`	`PackedTuple right, in PackedFieldDescriptor rightDescriptor);`
`@@ -108,17 +109,14 @@ public override object GetUntypedValue(PackedTuple tuple, in PackedFieldDescript`
`108`	`109`	`return state==TupleFieldState.Available ? tuple.Objects[descriptor.ObjectIndex] : null;`
`109`	`110`	`}`
`110`	`111`
`111`		`- public override void SetUntypedValue(PackedTuple tuple, ref PackedFieldDescriptor descriptor, object value)`
	`112`	`+ public override void SetUntypedValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, object value)`
`112`	`113`	`{`
`113`	`114`	`tuple.Objects[descriptor.ObjectIndex] = value;`
`114`		`- if (value!=null)`
`115`		`- tuple.SetFieldState(ref descriptor, TupleFieldState.Available);`
`116`		`- else`
`117`		`- tuple.SetFieldState(ref descriptor, TupleFieldState.Available \| TupleFieldState.Null);`
	`115`	`+ tuple.SetFieldState(descriptor, value != null ? TupleFieldState.Available : (TupleFieldState.Available \| TupleFieldState.Null));`
`118`	`116`	`}`
`119`	`117`
`120`		`- public override void CopyValue(PackedTuple source, ref PackedFieldDescriptor sourceDescriptor,`
`121`		`- PackedTuple target, ref PackedFieldDescriptor targetDescriptor)`
	`118`	`+ public override void CopyValue(PackedTuple source, in PackedFieldDescriptor sourceDescriptor,`
	`119`	`+ PackedTuple target, in PackedFieldDescriptor targetDescriptor)`
`122`	`120`	`{`
`123`	`121`	`target.Objects[targetDescriptor.ObjectIndex] = source.Objects[sourceDescriptor.ObjectIndex];`
`124`	`122`	`}`
`@@ -174,21 +172,21 @@ public override object GetUntypedValue(PackedTuple tuple, in PackedFieldDescript`
`174`	`172`	`return state==TupleFieldState.Available ? (object) Load(tuple, descriptor) : null;`
`175`	`173`	`}`
`176`	`174`
`177`		`- public override void SetUntypedValue(PackedTuple tuple, ref PackedFieldDescriptor descriptor, object value)`
	`175`	`+ public override void SetUntypedValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, object value)`
`178`	`176`	`{`
`179`	`177`	`if (value!=null) {`
`180`		`- Store(tuple, ref descriptor, (T) value);`
`181`		`- tuple.SetFieldState(ref descriptor, TupleFieldState.Available);`
	`178`	`+ Store(tuple, descriptor, (T) value);`
	`179`	`+ tuple.SetFieldState(descriptor, TupleFieldState.Available);`
`182`	`180`	`}`
`183`	`181`	`else {`
`184`		`- tuple.SetFieldState(ref descriptor, TupleFieldState.Available \| TupleFieldState.Null);`
	`182`	`+ tuple.SetFieldState(descriptor, TupleFieldState.Available \| TupleFieldState.Null);`
`185`	`183`	`}`
`186`	`184`	`}`
`187`	`185`
`188`		`- public override void CopyValue(PackedTuple source, ref PackedFieldDescriptor sourceDescriptor,`
`189`		`- PackedTuple target, ref PackedFieldDescriptor targetDescriptor)`
	`186`	`+ public override void CopyValue(PackedTuple source, in PackedFieldDescriptor sourceDescriptor,`
	`187`	`+ PackedTuple target, in PackedFieldDescriptor targetDescriptor)`
`190`	`188`	`{`
`191`		`- Store(target, ref targetDescriptor, Load(source, sourceDescriptor));`
	`189`	`+ Store(target, targetDescriptor, Load(source, sourceDescriptor));`
`192`	`190`	`}`
`193`	`191`
`194`	`192`	`public override bool ValueEquals(PackedTuple left, in PackedFieldDescriptor leftDescriptor,`
`@@ -218,23 +216,23 @@ private T GetValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, out T`
`218`	`216`	`return state==TupleFieldState.Available ? Load(tuple, descriptor) : NullValue;`
`219`	`217`	`}`
`220`	`218`
`221`		`- private void SetValue(PackedTuple tuple, ref PackedFieldDescriptor descriptor, T value)`
	`219`	`+ private void SetValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, T value)`
`222`	`220`	`{`
`223`		`- Store(tuple, ref descriptor, value);`
`224`		`- tuple.SetFieldState(ref descriptor, TupleFieldState.Available);`
	`221`	`+ Store(tuple, descriptor, value);`
	`222`	`+ tuple.SetFieldState(descriptor, TupleFieldState.Available);`
`225`	`223`	`}`
`226`	`224`
`227`		`- private void SetNullableValue(PackedTuple tuple, ref PackedFieldDescriptor descriptor, T? value)`
	`225`	`+ private void SetNullableValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, T? value)`
`228`	`226`	`{`
`229`	`227`	`if (value!=null) {`
`230`		`- Store(tuple, ref descriptor, value.Value);`
`231`		`- tuple.SetFieldState(ref descriptor, TupleFieldState.Available);`
	`228`	`+ Store(tuple, descriptor, value.Value);`
	`229`	`+ tuple.SetFieldState(descriptor, TupleFieldState.Available);`
`232`	`230`	`}`
`233`	`231`	`else`
`234`		`- tuple.SetFieldState(ref descriptor, TupleFieldState.Available \| TupleFieldState.Null);`
	`232`	`+ tuple.SetFieldState(descriptor, TupleFieldState.Available \| TupleFieldState.Null);`
`235`	`233`	`}`
`236`	`234`
`237`		`- private void Store(PackedTuple tuple, ref PackedFieldDescriptor d, T value)`
	`235`	`+ private void Store(PackedTuple tuple, in PackedFieldDescriptor d, T value)`
`238`	`236`	`{`
`239`	`237`	`var valueIndex = d.ValueIndex;`
`240`	`238`	`if (Rank > 6) {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ protected internal override void SetFieldState(int fieldIndex, TupleFieldState f`
`88`	`88`	`throw new ArgumentOutOfRangeException(nameof(fieldState));`
`89`	`89`	`}`
`90`	`90`
`91`		`- SetFieldState(ref PackedDescriptor.FieldDescriptors[fieldIndex], fieldState);`
	`91`	`+ SetFieldState(PackedDescriptor.FieldDescriptors[fieldIndex], fieldState);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public override object GetValue(int fieldIndex, out TupleFieldState fieldState)`
`@@ -100,10 +100,10 @@ public override object GetValue(int fieldIndex, out TupleFieldState fieldState)`
`100`	`100`	`public override void SetValue(int fieldIndex, object fieldValue)`
`101`	`101`	`{`
`102`	`102`	`ref var descriptor = ref PackedDescriptor.FieldDescriptors[fieldIndex];`
`103`		`- descriptor.Accessor.SetUntypedValue(this, ref descriptor, fieldValue);`
	`103`	`+ descriptor.Accessor.SetUntypedValue(this, descriptor, fieldValue);`
`104`	`104`	`}`
`105`	`105`
`106`		`- public void SetFieldState(ref PackedFieldDescriptor d, TupleFieldState fieldState)`
	`106`	`+ public void SetFieldState(in PackedFieldDescriptor d, TupleFieldState fieldState)`
`107`	`107`	`{`
`108`	`108`	`var bits = (long) fieldState;`
`109`	`109`	`ref var block = ref Values[d.StateIndex];`
Original file line number	Diff line number	Diff line change
`@@ -187,14 +187,14 @@ public void SetValue<T>(int fieldIndex, T fieldValue)`
`187`	`187`
`188`	`188`	`if (this is PackedTuple packedTuple) {`
`189`	`189`	`ref var descriptor = ref packedTuple.PackedDescriptor.FieldDescriptors[fieldIndex];`
`190`		`- descriptor.Accessor.SetValue(packedTuple, ref descriptor, isNullable, fieldValue);`
	`190`	`+ descriptor.Accessor.SetValue(packedTuple, descriptor, isNullable, fieldValue);`
`191`	`191`	`return;`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`var mappedContainer = GetMappedContainer(fieldIndex, true);`
`195`	`195`	`if (mappedContainer.First is PackedTuple mappedTuple) {`
`196`	`196`	`ref var descriptor = ref mappedTuple.PackedDescriptor.FieldDescriptors[mappedContainer.Second];`
`197`		`- descriptor.Accessor.SetValue(mappedTuple, ref descriptor, isNullable, fieldValue);`
	`197`	`+ descriptor.Accessor.SetValue(mappedTuple, descriptor, isNullable, fieldValue);`
`198`	`198`	`return;`
`199`	`199`	`}`
`200`	`200`
Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ private static void CopyPackedValue(PackedTuple source, int sourceIndex, PackedT`
`457`	`457`	`}`
`458`	`458`
`459`	`459`	`target.SetFieldState(targetIndex, TupleFieldState.Available);`
`460`		`- accessor.CopyValue(source, ref sourceDescriptor, target, ref targetDescriptor);`
	`460`	`+ accessor.CopyValue(source, sourceDescriptor, target, targetDescriptor);`
`461`	`461`	`}`
`462`	`462`
`463`	`463`	`private static void PartiallyCopyTupleSlow(Tuple source, Tuple target, int sourceStartIndex, int targetStartIndex, int length)`