Tue Nov 9 17:28:48 CET 2004 Paolo Molaro <lupus@ximian.com>

	* interp.c: update to exception clause structure changes.

svn path=/trunk/mono/; revision=35892

diff --git a/mono/interpreter/ChangeLog b/mono/interpreter/ChangeLog
index 672374a2f7c9bb91968dea6ef3eb05166d4aecb1..0aa1ceeee1436b8011457e15ce11b5be8dd760f2 100644 (file)
--- a/mono/interpreter/ChangeLog
+++ b/mono/interpreter/ChangeLog
@@ -1,3 +1,8 @@
+
+Tue Nov 9 17:28:48 CET 2004 Paolo Molaro <lupus@ximian.com>
+
+       * interp.c: update to exception clause structure changes.
+
 2004-11-08  Ben Maurer  <bmaurer@ximian.com>
 
        * interp.c: warning free

diff --git a/mono/interpreter/interp.c b/mono/interpreter/interp.c
index 22295a46095383fb6a41a170feff13d4efc766fc..7063ba41024add45df4316b0e052262fb3304240 100644 (file)
--- a/mono/interpreter/interp.c
+++ b/mono/interpreter/interp.c
@@ -3892,7 +3892,7 @@ array_constructed:
                                clause = &inv->runtime_method->clauses [i];
                                if (clause->flags <= 1 && MONO_OFFSET_IN_CLAUSE (clause, ip_offset)) {
                                        if (!clause->flags) {
-                                               if (mono_object_isinst ((MonoObject*)frame->ex, mono_class_get (method->klass->image, clause->token_or_filter))) {
+                                               if (mono_object_isinst ((MonoObject*)frame->ex, clause->data.catch_class)) {
                                                        /* 
                                                         * OK, we found an handler, now we need to execute the finally
                                                         * and fault blocks before branching to the handler code.