Changeset 3554 for trunk/sources/HeuristicLab.Persistence/3.3/Default

Timestamp:

04/28/10 14:19:57 (15 years ago)

Author:

epitzer

Message:

circumvent code generation for hooks on 64bit systems, this is a bug in the CLR (#548)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableReflection.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableReflection.cs

@@ -51 +51 @@
     }
 
+    private static object[] emptyArgs = new object[0];
+
     public static IEnumerable<Hook> CollectHooks(HookType hookType, Type type) {
       if (type.BaseType != null)
@@ -60 +62 @@
             MethodInfo methodInfo = memberInfo as MethodInfo;
             if (memberInfo.MemberType != MemberTypes.Method || memberInfo == null)
-              throw new ArgumentException("Storable hooks must be methods");        
-            DynamicMethod dm = new DynamicMethod("", null, new[] { typeof(object) }, type);
-            ILGenerator ilgen = dm.GetILGenerator();
-            ilgen.Emit(OpCodes.Ldarg_1);
-            ilgen.Emit(OpCodes.Call, methodInfo);
-            ilgen.Emit(OpCodes.Ret);
-            yield return (Hook)dm.CreateDelegate(typeof(Hook));
+              throw new ArgumentException("Storable hooks must be methods");
+            if (System.IntPtr.Size == 4) {
+              DynamicMethod dm = new DynamicMethod("", null, new[] { typeof(object) }, type);
+              ILGenerator ilgen = dm.GetILGenerator();
+              ilgen.Emit(OpCodes.Ldarg_1);
+              ilgen.Emit(OpCodes.Call, methodInfo);
+              ilgen.Emit(OpCodes.Ret);
+              yield return (Hook)dm.CreateDelegate(typeof(Hook));
+            } else {
+              yield return new Hook(o => methodInfo.Invoke(o, emptyArgs));
+            }
           }
         }