projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1668 from alexanderkyte/bug1856
[mono.git]
/
mono
/
mini
/
exceptions-arm.c
diff --git
a/mono/mini/exceptions-arm.c
b/mono/mini/exceptions-arm.c
index 1ca59fcba4433bce6b7308eab66acbc72851e24d..7f57eea44ecc7b2d2e469e996297d4aa32e9f87f 100644
(file)
--- a/
mono/mini/exceptions-arm.c
+++ b/
mono/mini/exceptions-arm.c
@@
-154,8
+154,10
@@
mono_arm_throw_exception (MonoObject *exc, mgreg_t pc, mgreg_t sp, mgreg_t *int_
if (mono_object_isinst (exc, mono_defaults.exception_class)) {
MonoException *mono_ex = (MonoException*)exc;
if (mono_object_isinst (exc, mono_defaults.exception_class)) {
MonoException *mono_ex = (MonoException*)exc;
- if (!rethrow)
+ if (!rethrow)
{
mono_ex->stack_trace = NULL;
mono_ex->stack_trace = NULL;
+ mono_ex->trace_ips = NULL;
+ }
}
mono_handle_exception (&ctx, exc);
mono_restore_context (&ctx);
}
mono_handle_exception (&ctx, exc);
mono_restore_context (&ctx);