diff options
author | jfrijters <jfrijters> | 2011-12-12 15:02:24 +0400 |
---|---|---|
committer | jfrijters <jfrijters> | 2011-12-12 15:02:24 +0400 |
commit | 0e5454a52eb6b7a12e4b5dfd4783d8db663c9d91 (patch) | |
tree | 006f9fa0b1e7f075ff318d7a780b6ee1aa0654b9 | |
parent | 13b3c852d7fc5d96da90882432a3c1e0859893ee (diff) |
Merge GenerateMethod() into LinkMethod().
-rw-r--r-- | runtime/DynamicTypeWrapper.cs | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/runtime/DynamicTypeWrapper.cs b/runtime/DynamicTypeWrapper.cs index 484cf222..8fd2a20e 100644 --- a/runtime/DynamicTypeWrapper.cs +++ b/runtime/DynamicTypeWrapper.cs @@ -1178,27 +1178,6 @@ namespace IKVM.Internal } } - internal override MethodBase LinkMethod(MethodWrapper mw) - { - if (mw is DelegateConstructorMethodWrapper) - { - ((DelegateConstructorMethodWrapper)mw).DoLink(typeBuilder); - return null; - } - Debug.Assert(mw != null); - int index = GetMethodIndex(mw); - if (baseMethods[index] != null) - { - foreach (MethodWrapper baseMethod in baseMethods[index]) - { - baseMethod.Link(); - CheckLoaderConstraints(mw, baseMethod); - } - } - Debug.Assert(mw.GetMethod() == null); - return GenerateMethod(index); - } - private int GetFieldIndex(FieldWrapper fw) { for (int i = 0; i < fields.Length; i++) @@ -2600,8 +2579,24 @@ namespace IKVM.Internal } } - private MethodBase GenerateMethod(int index) + internal override MethodBase LinkMethod(MethodWrapper mw) { + if (mw is DelegateConstructorMethodWrapper) + { + ((DelegateConstructorMethodWrapper)mw).DoLink(typeBuilder); + return null; + } + Debug.Assert(mw != null); + int index = GetMethodIndex(mw); + if (baseMethods[index] != null) + { + foreach (MethodWrapper baseMethod in baseMethods[index]) + { + baseMethod.Link(); + CheckLoaderConstraints(mw, baseMethod); + } + } + Debug.Assert(mw.GetMethod() == null); methods[index].AssertLinked(); Profiler.Enter("JavaTypeImpl.GenerateMethod"); try |