Changeset 15018 for branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Core/TypeInfo.cs

Timestamp:

06/01/17 11:29:49 (7 years ago)

Author:

gkronber

Message:

#2520 introduced StorableConstructorFlag type for StorableConstructors

File:

• branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Core/TypeInfo.cs (modified) (1 diff)

branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Core/TypeInfo.cs

@@ -120 +120 @@
       var ctor = Type.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
                      .Where(x => StorableConstructorAttribute.IsStorableConstructor(x))
-                     .Where(x => (x.GetParameters().Length == 1) && (x.GetParameters()[0].ParameterType == typeof(bool)))
+                     .Where(x => (x.GetParameters().Length == 1) && (x.GetParameters()[0].ParameterType == typeof(StorableConstructorFlag)))
                      .FirstOrDefault();
       if (ctor != null) {
         DynamicMethod dm = new DynamicMethod("", typeof(object), null, Type, true);
         ILGenerator ilgen = dm.GetILGenerator();
-        ilgen.Emit(OpCodes.Ldc_I4_1); // load true
+        var local = ilgen.DeclareLocal(typeof(StorableConstructorFlag));
+        ilgen.Emit(OpCodes.Ldloca_S, local);
+        ilgen.Emit(OpCodes.Initobj, typeof(StorableConstructorFlag)); // load default value for StorableConstructorFlag
+        ilgen.Emit(OpCodes.Ldloc_0);
         ilgen.Emit(OpCodes.Newobj, ctor);
         ilgen.Emit(OpCodes.Ret);