projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[threads] Replace use of W32Handle by MonoOSEvent for MonoThreadInfo exited event...
[mono.git]
/
mono
/
mini
/
exceptions-ia64.c
diff --git
a/mono/mini/exceptions-ia64.c
b/mono/mini/exceptions-ia64.c
index b9299cbe4fd3181883a5bf90efa29e896e4f6328..adae20f2b5f2fb83a57d67b3b08b30a77f007483 100644
(file)
--- a/
mono/mini/exceptions-ia64.c
+++ b/
mono/mini/exceptions-ia64.c
@@
-29,7
+29,7
@@
#include <mono/metadata/threads.h>
#include <mono/metadata/debug-helpers.h>
#include <mono/metadata/exception.h>
#include <mono/metadata/threads.h>
#include <mono/metadata/debug-helpers.h>
#include <mono/metadata/exception.h>
-#include <mono/metadata/gc-internal.h>
+#include <mono/metadata/gc-internal
s
.h>
#include <mono/metadata/mono-debug.h>
#include "mini.h"
#include <mono/metadata/mono-debug.h>
#include "mini.h"
@@
-236,18
+236,20
@@
static void
throw_exception (MonoObject *exc, guint64 rethrow)
{
unw_context_t unw_ctx;
throw_exception (MonoObject *exc, guint64 rethrow)
{
unw_context_t unw_ctx;
+ MonoError error;
MonoContext ctx;
MonoJitInfo *ji;
unw_word_t ip, sp;
int res;
MonoContext ctx;
MonoJitInfo *ji;
unw_word_t ip, sp;
int res;
- if (mono_object_isinst
(exc, mono_defaults.exception_class
)) {
+ if (mono_object_isinst
_checked (exc, mono_defaults.exception_class, &error
)) {
MonoException *mono_ex = (MonoException*)exc;
if (!rethrow) {
mono_ex->stack_trace = NULL;
mono_ex->trace_ips = NULL;
}
}
MonoException *mono_ex = (MonoException*)exc;
if (!rethrow) {
mono_ex->stack_trace = NULL;
mono_ex->trace_ips = NULL;
}
}
+ mono_error_assert_ok (&error);
res = unw_getcontext (&unw_ctx);
g_assert (res == 0);
res = unw_getcontext (&unw_ctx);
g_assert (res == 0);