[AssemblyProcessor] Fix a case where ImportReference was not called f…

…or GetTypeFromHandle().
communityus-llc · May 24, 2019 · e2c44d3 · e2c44d3
1 parent f554045
commit e2c44d3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.exe b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.exe
diff --git a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.pdb b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.pdb
diff --git a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.exe b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.exe
diff --git a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.pdb b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.pdb
diff --git a/sources/core/Xenko.Core.AssemblyProcessor/SerializationProcessor.cs b/sources/core/Xenko.Core.AssemblyProcessor/SerializationProcessor.cs
@@ -465,7 +465,7 @@ private static void GenerateSerializerCode(ComplexSerializerRegistry registry)
                     {
                         // Generating: System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(typeof(<#=type.Value.SerializerType.ConvertCSharp()#>).TypeHandle);
                         initializeMethodIL.Append(Instruction.Create(OpCodes.Ldtoken, type.Value.SerializerType));
-                        initializeMethodIL.Append(Instruction.Create(OpCodes.Call, getTypeFromHandleMethod));
+                        initializeMethodIL.Append(Instruction.Create(OpCodes.Call, assembly.MainModule.ImportReference(getTypeFromHandleMethod)));
                         initializeMethodIL.Append(Instruction.Create(OpCodes.Callvirt, getTypeHandleMethodRef));
                         initializeMethodIL.Append(Instruction.Create(OpCodes.Call, runClassConstructorMethod));
                     }