@@ -930,7 +930,7 @@ private static void BuildDeserialize(Type type, ObjectSerializationInfo info, IL
930
930
return new DeserializeInfo
931
931
{
932
932
MemberInfo = member ,
933
- LocalField = canOverwrite ? default : il . DeclareLocal ( member . Type ) ,
933
+ LocalVariable = canOverwrite ? default : il . DeclareLocal ( member . Type ) ,
934
934
SwitchLabel = il . DefineLabel ( ) ,
935
935
} ;
936
936
}
@@ -945,7 +945,7 @@ private static void BuildDeserialize(Type type, ObjectSerializationInfo info, IL
945
945
return new DeserializeInfo
946
946
{
947
947
MemberInfo = null ,
948
- LocalField = null ,
948
+ LocalVariable = null ,
949
949
SwitchLabel = gotoDefault . Value ,
950
950
} ;
951
951
}
@@ -958,8 +958,8 @@ private static void BuildDeserialize(Type type, ObjectSerializationInfo info, IL
958
958
. Select ( item => new DeserializeInfo
959
959
{
960
960
MemberInfo = item ,
961
- LocalField = canOverwrite ? default : il . DeclareLocal ( item . Type ) ,
962
- LocalIsInitializedField = canOverwrite ? default : il . DeclareLocal ( typeof ( bool ) ) ,
961
+ LocalVariable = canOverwrite ? default : il . DeclareLocal ( item . Type ) ,
962
+ IsInitializedLocalVariable = canOverwrite ? default : il . DeclareLocal ( typeof ( bool ) ) ,
963
963
//// SwitchLabel = il.DefineLabel()
964
964
} )
965
965
. ToArray ( ) ;
@@ -1142,10 +1142,10 @@ private static void EmitDeserializeValue(ILGenerator il, DeserializeInfo info, i
1142
1142
il . EmitLdloca ( localResult ) ;
1143
1143
}
1144
1144
}
1145
- else if ( info . LocalIsInitializedField != null )
1145
+ else if ( info . IsInitializedLocalVariable != null )
1146
1146
{
1147
1147
il . EmitLdc_I4 ( 1 ) ;
1148
- il . EmitStloc ( info . LocalIsInitializedField ) ;
1148
+ il . EmitStloc ( info . IsInitializedLocalVariable ) ;
1149
1149
}
1150
1150
1151
1151
if ( emitter != null )
@@ -1208,7 +1208,7 @@ private static void EmitDeserializeValue(ILGenerator il, DeserializeInfo info, i
1208
1208
}
1209
1209
else
1210
1210
{
1211
- il . EmitStloc ( info . LocalField ) ;
1211
+ il . EmitStloc ( info . LocalVariable ) ;
1212
1212
}
1213
1213
}
1214
1214
@@ -1224,7 +1224,7 @@ private static void EmitNewObject(ILGenerator il, Type type, ObjectSerialization
1224
1224
foreach ( var item in members . Where ( x => x . MemberInfo != null && x . MemberInfo . IsWritable ) )
1225
1225
{
1226
1226
var skipLabel = il . DefineLabel ( ) ;
1227
- il . EmitLdloc ( item . LocalIsInitializedField ) ;
1227
+ il . EmitLdloc ( item . IsInitializedLocalVariable ) ;
1228
1228
il . Emit ( OpCodes . Brfalse_S , skipLabel ) ;
1229
1229
1230
1230
if ( info . IsClass )
@@ -1236,7 +1236,7 @@ private static void EmitNewObject(ILGenerator il, Type type, ObjectSerialization
1236
1236
il . EmitLdloca ( localResult ) ;
1237
1237
}
1238
1238
1239
- il . EmitLdloc ( item . LocalField ) ;
1239
+ il . EmitLdloc ( item . LocalVariable ) ;
1240
1240
item . MemberInfo . EmitStoreValue ( il ) ;
1241
1241
1242
1242
il . MarkLabel ( skipLabel ) ;
@@ -1276,7 +1276,7 @@ private static void EmitNewObject(ILGenerator il, Type type, ObjectSerialization
1276
1276
il . EmitLdloca ( localResult ) ;
1277
1277
}
1278
1278
1279
- il . EmitLdloc ( item . LocalField ) ;
1279
+ il . EmitLdloc ( item . LocalVariable ) ;
1280
1280
item . MemberInfo . EmitStoreValue ( il ) ;
1281
1281
}
1282
1282
@@ -1288,7 +1288,7 @@ private static void EmitNewObjectConstructorArguments(ILGenerator il, ObjectSeri
1288
1288
foreach ( ObjectSerializationInfo . EmittableMemberAndConstructorParameter item in info . ConstructorParameters )
1289
1289
{
1290
1290
DeserializeInfo local = members . First ( x => x . MemberInfo == item . MemberInfo ) ;
1291
- il . EmitLdloc ( local . LocalField ) ;
1291
+ il . EmitLdloc ( local . LocalVariable ) ;
1292
1292
1293
1293
if ( ! item . ConstructorParameter . ParameterType . IsValueType && local . MemberInfo . IsValueType )
1294
1294
{
@@ -1392,9 +1392,9 @@ private class DeserializeInfo
1392
1392
{
1393
1393
public ObjectSerializationInfo . EmittableMember MemberInfo { get ; set ; }
1394
1394
1395
- public LocalBuilder LocalField { get ; set ; }
1395
+ public LocalBuilder LocalVariable { get ; set ; }
1396
1396
1397
- public LocalBuilder LocalIsInitializedField { get ; set ; }
1397
+ public LocalBuilder IsInitializedLocalVariable { get ; set ; }
1398
1398
1399
1399
public Label SwitchLabel { get ; set ; }
1400
1400
}
0 commit comments