Author: zoltan
Date: 2005-05-12 08:25:34 -0400 (Thu, 12 May 2005)
New Revision: 44434
Modified:
trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog
trunk/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
trunk/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
Log:
2005-05-12 Zoltan Varga <[EMAIL PROTECTED]>
* ConstructorBuilder.cs MethodBuilder.cs (fixup): Fix this.
Modified: trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog 2005-05-12
12:21:42 UTC (rev 44433)
+++ trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog 2005-05-12
12:25:34 UTC (rev 44434)
@@ -1,5 +1,7 @@
2005-05-12 Zoltan Varga <[EMAIL PROTECTED]>
+ * ConstructorBuilder.cs MethodBuilder.cs (fixup): Fix this.
+
* ConstructorBuilder.cs MethodBuilder.cs (fixup): Throw an exception if
a
method body is empty. Fixes #74906.
Modified: trunk/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
2005-05-12 12:21:42 UTC (rev 44433)
+++ trunk/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
2005-05-12 12:25:34 UTC (rev 44434)
@@ -263,7 +263,7 @@
}
internal void fixup () {
- if (((attrs & (MethodAttributes.Abstract |
MethodAttributes.PinvokeImpl)) == 0) && (iattrs & (MethodImplAttributes.Runtime
| MethodImplAttributes.InternalCall) == 0)) {
+ if (((attrs & (MethodAttributes.Abstract |
MethodAttributes.PinvokeImpl)) == 0) && ((iattrs &
(MethodImplAttributes.Runtime | MethodImplAttributes.InternalCall)) == 0)) {
if ((ilgen == null) ||
(ILGenerator.Mono_GetCurrentOffset (ilgen) == 0))
throw new InvalidOperationException ("Method '"
+ Name + "' does not have a method body.");
}
Modified: trunk/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
2005-05-12 12:21:42 UTC (rev 44433)
+++ trunk/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
2005-05-12 12:25:34 UTC (rev 44434)
@@ -250,7 +250,7 @@
}
internal void fixup () {
- if (((attrs & (MethodAttributes.Abstract |
MethodAttributes.PinvokeImpl)) == 0) && (iattrs & (MethodImplAttributes.Runtime
| MethodImplAttributes.InternalCall) == 0)) {
+ if (((attrs & (MethodAttributes.Abstract |
MethodAttributes.PinvokeImpl)) == 0) && ((iattrs &
(MethodImplAttributes.Runtime | MethodImplAttributes.InternalCall)) == 0)) {
if ((ilgen == null) ||
(ILGenerator.Mono_GetCurrentOffset (ilgen) == 0))
throw new InvalidOperationException
("Method '" + Name + "' does not have a method body.");
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
