Author: miguel
Date: 2006-06-15 00:44:47 -0400 (Thu, 15 Jun 2006)
New Revision: 61739
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/icall.c
Log:
2006-06-15 Miguel de Icaza <[EMAIL PROTECTED]>
* icall.c (mono_class_get_throw): Revert over-zealous error
throwing, the caller for mono_class_get_throw will cope with
errors when classes are not properly initialized already.
The code still copes with loader exceptions though.
Fixes the regression in reftype1 and reftype3 from the CAS tests.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2006-06-15 03:01:27 UTC (rev 61738)
+++ trunk/mono/mono/metadata/ChangeLog 2006-06-15 04:44:47 UTC (rev 61739)
@@ -1,5 +1,18 @@
+2006-06-15 Miguel de Icaza <[EMAIL PROTECTED]>
+
+ * icall.c (mono_class_get_throw): Revert over-zealous error
+ throwing, the caller for mono_class_get_throw will cope with
+ errors when classes are not properly initialized already.
+
+ The code still copes with loader exceptions though.
+
+ Fixes the regression in reftype1 and reftype3 from the CAS tests.
+
2006-06-14 Miguel de Icaza <[EMAIL PROTECTED]>
+ Fixes the `make run1' version of RuntimeAbort (to be commited,
+ source is in Bugzilla).
+
* metadata.c (mono_metadata_interfaces_from_typedef_full): Return
FALSE on class loading failure instead of returning true.
Modified: trunk/mono/mono/metadata/icall.c
===================================================================
--- trunk/mono/mono/metadata/icall.c 2006-06-15 03:01:27 UTC (rev 61738)
+++ trunk/mono/mono/metadata/icall.c 2006-06-15 04:44:47 UTC (rev 61739)
@@ -99,14 +99,9 @@
MonoLoaderError *error;
MonoException *ex;
- if (class != NULL){
- if (class->exception_type) {
- MonoException *exc =
mono_class_get_exception_for_failure (class);
- g_assert (exc);
- mono_raise_exception (exc);
- }
+ if (class != NULL)
return class;
- }
+
error = mono_loader_get_last_error ();
g_assert (error != NULL);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
