Update to the latest IKVM.Reflection

[mono.git] / mcs / class / IKVM.Reflection / Emit / FieldBuilder.cs

diff --git a/mcs/class/IKVM.Reflection/Emit/FieldBuilder.cs b/mcs/class/IKVM.Reflection/Emit/FieldBuilder.cs
index 3a31ec0c9a1da9f5c40f27593a44117693c012c0..cbee210b390503a9f473a7e8eaf93794594cbc89 100644 (file)
--- a/mcs/class/IKVM.Reflection/Emit/FieldBuilder.cs
+++ b/mcs/class/IKVM.Reflection/Emit/FieldBuilder.cs
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2008 Jeroen Frijters
+  Copyright (C) 2008-2012 Jeroen Frijters
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -22,6 +22,7 @@
   
 */
 using System;
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using IKVM.Reflection.Metadata;
 using IKVM.Reflection.Writer;
@@ -60,7 +61,13 @@ namespace IKVM.Reflection.Emit
 
                public override object GetRawConstantValue()
                {
-                       return typeBuilder.Module.Constant.GetRawConstantValue(typeBuilder.Module, this.MetadataToken);
+                       if (!typeBuilder.IsCreated())
+                       {
+                               // the .NET FieldBuilder doesn't support this method
+                               // (since we dont' have a different FieldInfo object after baking, we will support it once we're baked)
+                               throw new NotSupportedException();
+                       }
+                       return typeBuilder.Module.Constant.GetRawConstantValue(typeBuilder.Module, GetCurrentToken());
                }
 
                public void __SetDataAndRVA(byte[] data)
@@ -94,6 +101,22 @@ namespace IKVM.Reflection.Emit
                        get { throw new NotImplementedException(); }
                }
 
+               public override bool __TryGetFieldOffset(out int offset)
+               {
+                       int pseudoTokenOrIndex = pseudoToken;
+                       if (typeBuilder.ModuleBuilder.IsSaved)
+                       {
+                               pseudoTokenOrIndex = typeBuilder.ModuleBuilder.ResolvePseudoToken(pseudoToken) & 0xFFFFFF;
+                       }
+                       foreach (int i in this.Module.FieldLayout.Filter(pseudoTokenOrIndex))
+                       {
+                               offset = this.Module.FieldLayout.records[i].Offset;
+                               return true;
+                       }
+                       offset = 0;
+                       return false;
+               }
+
                public void SetCustomAttribute(ConstructorInfo con, byte[] binaryAttribute)
                {
                        SetCustomAttribute(new CustomAttributeBuilder(con, binaryAttribute));
@@ -109,7 +132,7 @@ namespace IKVM.Reflection.Emit
                        }
                        else if (customBuilder.Constructor.DeclaringType == u.System_Runtime_InteropServices_MarshalAsAttribute)
                        {
-                               MarshalSpec.SetMarshalAsAttribute(typeBuilder.ModuleBuilder, pseudoToken, customBuilder);
+                               FieldMarshal.SetMarshalAsAttribute(typeBuilder.ModuleBuilder, pseudoToken, customBuilder);
                                attribs |= FieldAttributes.HasFieldMarshal;
                        }
                        else if (customBuilder.Constructor.DeclaringType == u.System_NonSerializedAttribute)
@@ -183,18 +206,24 @@ namespace IKVM.Reflection.Emit
 
                internal override int ImportTo(ModuleBuilder other)
                {
-                       if (typeBuilder.IsGenericTypeDefinition)
-                       {
-                               return other.ImportMember(TypeBuilder.GetField(typeBuilder, this));
-                       }
-                       else if (other == typeBuilder.ModuleBuilder)
+                       return other.ImportMethodOrField(typeBuilder, name, fieldSig);
+               }
+
+               internal override int GetCurrentToken()
+               {
+                       if (typeBuilder.ModuleBuilder.IsSaved)
                        {
-                               return pseudoToken;
+                               return typeBuilder.ModuleBuilder.ResolvePseudoToken(pseudoToken);
                        }
                        else
                        {
-                               return other.ImportMethodOrField(typeBuilder, name, fieldSig);
+                               return pseudoToken;
                        }
                }
+
+               internal override bool IsBaked
+               {
+                       get { return typeBuilder.IsBaked; }
+               }
        }
 }