diff options
author | jfrijters <jfrijters> | 2011-12-11 12:16:25 +0400 |
---|---|---|
committer | jfrijters <jfrijters> | 2011-12-11 12:16:25 +0400 |
commit | b7530d8109190ced33ca21c04b8222c26fccdb9f (patch) | |
tree | 1317deff0f8845273eff0189d005dbc14e1645e8 | |
parent | 45b79a45260db79dc7e644ac48825a8df5165b3e (diff) |
Removed RegisterPostFinishProc from FinishContext.
-rw-r--r-- | runtime/DynamicTypeWrapper.cs | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/runtime/DynamicTypeWrapper.cs b/runtime/DynamicTypeWrapper.cs index 3506b770..8de23c86 100644 --- a/runtime/DynamicTypeWrapper.cs +++ b/runtime/DynamicTypeWrapper.cs @@ -1514,22 +1514,19 @@ namespace IKVM.Internal #endif //STATIC_COMPILER } FinishContext context = new FinishContext(classFile, wrapper, typeBuilder); + Type type = context.FinishImpl(); #if STATIC_COMPILER if (annotationBuilder != null) { CustomAttributeBuilder cab = new CustomAttributeBuilder(JVM.LoadType(typeof(AnnotationAttributeAttribute)).GetConstructor(new Type[] { Types.String }), new object[] { annotationBuilder.AttributeTypeName }); typeBuilder.SetCustomAttribute(cab); - context.RegisterPostFinishProc(delegate - { - annotationBuilder.Finish(this); - }); + annotationBuilder.Finish(this); } if (enumBuilder != null) { - context.RegisterNestedTypeBuilder(enumBuilder); + enumBuilder.CreateType(); } #endif - Type type = context.FinishImpl(); MethodInfo finishedClinitMethod = clinitMethod; #if !STATIC_COMPILER if (finishedClinitMethod != null) @@ -3539,7 +3536,6 @@ namespace IKVM.Internal private readonly TypeBuilder typeBuilder; private List<TypeBuilder> nestedTypeBuilders; private MethodInfo callerIDMethod; - private List<System.Threading.ThreadStart> postFinishProcs; private List<Item> items; private Dictionary<FieldWrapper, ConstructorBuilder> arfuMap; @@ -3605,16 +3601,7 @@ namespace IKVM.Internal ilgen.DoEmit(); } - internal void RegisterPostFinishProc(System.Threading.ThreadStart proc) - { - if (postFinishProcs == null) - { - postFinishProcs = new List<System.Threading.ThreadStart>(); - } - postFinishProcs.Add(proc); - } - - internal void RegisterNestedTypeBuilder(TypeBuilder tb) + private void RegisterNestedTypeBuilder(TypeBuilder tb) { if (nestedTypeBuilders == null) { @@ -4188,13 +4175,6 @@ namespace IKVM.Internal tb.CreateType(); } } - if (postFinishProcs != null) - { - foreach (System.Threading.ThreadStart proc in postFinishProcs) - { - proc(); - } - } #if STATIC_COMPILER if (tbFields != null) { |