Add support for non-GC static fields

src/ILToNative/src/Compiler/AsmWriter.cs

@@ -32,6 +32,11 @@ void OutputCode()
 
             OutputEETypes();
 
+            Out.WriteLine();
+            Out.WriteLine(".data");
+
+            OutputStatics();
+
             Out.Dispose();
         }
 
@@ -222,6 +227,13 @@ void OutputReadyToHelpers()
                         Out.WriteLine("jmp __castclass_class");
                         break;
 
+                    case ReadyToRunHelperId.GetNonGCStaticBase:
+                        Out.Write("leaq __NonGCStaticBase_");
+                        Out.Write(GetMangledTypeName((TypeDesc)helper.Target));
+                        Out.WriteLine("(%rip), %rax");
+                        Out.WriteLine("ret");
+                        break;
+
                     default:
                         throw new NotImplementedException();
                 }
@@ -260,6 +272,33 @@ void OutputEETypes()
             }
         }
 
+        void OutputStatics()
+        {
+            foreach (var t in _registeredTypes.Values)
+            {
+                if (!t.IncludedInCompilation)
+                    continue;
+
+                var type = t.Type as MetadataType;
+                if (type == null)
+                    continue;
+
+                if (type.NonGCStaticFieldSize > 0)
+                {
+                    Out.Write(".align ");
+                    Out.WriteLine(type.NonGCStaticFieldAlignment);
+                    Out.Write("__NonGCStaticBase_");
+                    Out.Write(GetMangledTypeName(type));
+                    Out.WriteLine(":");
+                    Out.Write(".rept ");
+                    Out.WriteLine(type.NonGCStaticFieldSize);
+                    Out.WriteLine(".byte 0");
+                    Out.WriteLine(".endr");
+                    Out.WriteLine();
+                }
+            }
+        }
+
         void OutputVirtualSlots(TypeDesc implType, TypeDesc declType)
         {
             var baseType = declType.BaseType;

src/ILToNative/src/Compiler/ReadyToRunHelper.cs

@@ -17,6 +17,7 @@ public enum ReadyToRunHelperId
         VirtualCall,
         IsInstanceOf,
         CastClass,
+        GetNonGCStaticBase,
     }
 
     class ReadyToRunHelper
@@ -48,6 +49,8 @@ public string MangledName
                         return "__IsInstanceOf_" + _compilation.GetMangledTypeName((TypeDesc)this.Target);
                     case ReadyToRunHelperId.CastClass:
                         return "__CastClass_" + _compilation.GetMangledTypeName((TypeDesc)this.Target);
+                    case ReadyToRunHelperId.GetNonGCStaticBase:
+                        return "__GetNonGCStaticBase_" + _compilation.GetMangledTypeName((TypeDesc)this.Target);
                     default:
                         throw new NotImplementedException();
                 }

src/JitInterface/src/CorInfoImpl.cs

@@ -782,7 +782,10 @@ CorInfoIsAccessAllowedResult canAccessClass(IntPtr _this, ref CORINFO_RESOLVED_T
         }
 
         CORINFO_CLASS_STRUCT_* getFieldClass(IntPtr _this, CORINFO_FIELD_STRUCT_* field)
-        { throw new NotImplementedException(); }
+        {
+            var fieldDesc = HandleToObject(field);
+            return ObjectToHandle(fieldDesc.OwningType);
+        }
 
         CorInfoType getFieldType(IntPtr _this, CORINFO_FIELD_STRUCT_* field, ref CORINFO_CLASS_STRUCT_* structType, CORINFO_CLASS_STRUCT_* memberParent)
         {
@@ -825,10 +828,30 @@ void getFieldInfo(IntPtr _this, ref CORINFO_RESOLVED_TOKEN pResolvedToken, CORIN
             if (field.IsStatic)
             {
                 fieldFlags |= CORINFO_FIELD_FLAGS.CORINFO_FLG_FIELD_STATIC;
-                fieldAccessor = CORINFO_FIELD_ACCESSOR.CORINFO_FIELD_STATIC_ADDRESS;
 
-                // TODO: Shared statics/HasFieldRVA
-                throw new NotImplementedException();
+                if (field.HasRva)
+                {
+                    throw new NotSupportedException();
+                }
+
+                // Make sure to include the type in the compilation
+                _compilation.AddType(field.OwningType);
+
+                fieldAccessor = CORINFO_FIELD_ACCESSOR.CORINFO_FIELD_STATIC_SHARED_STATIC_HELPER;
+                pResult.helper = CorInfoHelpFunc.CORINFO_HELP_READYTORUN_STATIC_BASE;
+
+                ReadyToRunHelperId helperId;
+                if (field.IsThreadStatic || field.HasGCStaticBase)
+                {
+                    throw new NotImplementedException();
+                }
+                else
+                {
+                    helperId = ReadyToRunHelperId.GetNonGCStaticBase;
+                }
+
+                pResult.fieldLookup.addr = (void*)ObjectToHandle(_compilation.GetReadyToRunHelper(helperId, field.OwningType));
+                pResult.fieldLookup.accessType = InfoAccessType.IAT_VALUE;
             }
             else
             {

src/TypeSystem/src/Common/FieldDesc.cs

@@ -4,6 +4,8 @@
 using System;
 using System.Runtime.CompilerServices;
 
+using Debug = System.Diagnostics.Debug;
+
 namespace Internal.TypeSystem
 {
     public abstract partial class FieldDesc
@@ -54,6 +56,16 @@ public abstract bool IsInitOnly
             get;
         }
 
+        public abstract bool IsThreadStatic
+        {
+            get;
+        }
+
+        public abstract bool HasRva
+        {
+            get;
+        }
+
         public virtual FieldDesc GetTypicalFieldDefinition()
         {
             return this;

src/TypeSystem/src/Common/FieldForInstantiatedType.cs

@@ -64,6 +64,22 @@ public override bool IsInitOnly
             }
         }
 
+        public override bool IsThreadStatic
+        {
+            get
+            {
+                return _fieldDef.IsThreadStatic;
+            }
+        }
+
+        public override bool HasRva
+        {
+            get
+            {
+                return _fieldDef.HasRva;
+            }
+        }
+
         public override FieldDesc GetTypicalFieldDefinition()
         {
             return _fieldDef;