Merge pull request #25 from ntherning/bump-corert

Bump to latest upstream

1 files changed, 2 insertions, 2 deletions

diff --git a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/StructMarshallingStubMapNode.cs b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/StructMarshallingStubMapNode.cs
index 604e25076..d4d5664fd 100644
--- a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/StructMarshallingStubMapNode.cs
+++ b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/StructMarshallingStubMapNode.cs
@@ -71,7 +71,7 @@ namespace ILCompiler.DependencyAnalysis
                     writer.GetUnsignedConstant(_externalReferences.GetIndex(factory.MethodEntrypoint(structEntry.UnmarshallingThunk))),
                     writer.GetUnsignedConstant(_externalReferences.GetIndex(factory.MethodEntrypoint(structEntry.CleanupThunk))));
 
-                uint size = (uint)nativeType.InstanceByteCount.AsInt;
+                uint size = (uint)nativeType.InstanceFieldSize.AsInt;
                 uint mask = (uint)(nativeType.Fields.Length << 1)  | (uint)(nativeType.HasInvalidLayout ? 1 : 0);
 
                 Vertex data = writer.GetTuple(
@@ -106,6 +106,6 @@ namespace ILCompiler.DependencyAnalysis
         }
 
         protected internal override int Phase => (int)ObjectNodePhase.Ordered;
-        protected internal override int ClassCode => (int)ObjectNodeOrder.StructMarshallingStubMapNode;
+        public override int ClassCode => (int)ObjectNodeOrder.StructMarshallingStubMapNode;
     }
 }