projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[runtime] Propagate error from class loading when JIT-ing
[mono.git]
/
mono
/
mini
/
seq-points.c
diff --git
a/mono/mini/seq-points.c
b/mono/mini/seq-points.c
index 357a30d42ceb14b249f7a7c0ee1e2509cef178b7..434a11f43702db5e180d652eac020f06740566db 100644
(file)
--- a/
mono/mini/seq-points.c
+++ b/
mono/mini/seq-points.c
@@
-58,7
+58,7
@@
mono_save_seq_point_info (MonoCompile *cfg)
for (i = 0; i < cfg->seq_points->len; ++i) {
SeqPoint *sp = &seq_points [i];
for (i = 0; i < cfg->seq_points->len; ++i) {
SeqPoint *sp = &seq_points [i];
- MonoInst *ins = g_ptr_array_index (cfg->seq_points, i);
+ MonoInst *ins =
(MonoInst *)
g_ptr_array_index (cfg->seq_points, i);
sp->il_offset = ins->inst_imm;
sp->native_offset = ins->inst_offset;
sp->il_offset = ins->inst_imm;
sp->native_offset = ins->inst_offset;
@@
-79,7
+79,7
@@
mono_save_seq_point_info (MonoCompile *cfg)
bb_seq_points = g_slist_reverse (bb->seq_points);
last = NULL;
for (l = bb_seq_points; l; l = l->next) {
bb_seq_points = g_slist_reverse (bb->seq_points);
last = NULL;
for (l = bb_seq_points; l; l = l->next) {
- MonoInst *ins = l->data;
+ MonoInst *ins =
(MonoInst *)
l->data;
if (ins->inst_imm == METHOD_ENTRY_IL_OFFSET || ins->inst_imm == METHOD_EXIT_IL_OFFSET)
/* Used to implement method entry/exit events */
if (ins->inst_imm == METHOD_ENTRY_IL_OFFSET || ins->inst_imm == METHOD_EXIT_IL_OFFSET)
/* Used to implement method entry/exit events */
@@
-108,13
+108,13
@@
mono_save_seq_point_info (MonoCompile *cfg)
*/
l = g_slist_last (bb->seq_points);
if (l) {
*/
l = g_slist_last (bb->seq_points);
if (l) {
- endfinally_seq_point = l->data;
+ endfinally_seq_point =
(MonoInst *)
l->data;
for (bb2 = cfg->bb_entry; bb2; bb2 = bb2->next_bb) {
GSList *l = g_slist_last (bb2->seq_points);
if (l) {
for (bb2 = cfg->bb_entry; bb2; bb2 = bb2->next_bb) {
GSList *l = g_slist_last (bb2->seq_points);
if (l) {
- MonoInst *ins = l->data;
+ MonoInst *ins =
(MonoInst *)
l->data;
if (!(ins->inst_imm == METHOD_ENTRY_IL_OFFSET || ins->inst_imm == METHOD_EXIT_IL_OFFSET) && ins != endfinally_seq_point)
next [endfinally_seq_point->backend.size] = g_slist_append (next [endfinally_seq_point->backend.size], GUINT_TO_POINTER (ins->backend.size));
if (!(ins->inst_imm == METHOD_ENTRY_IL_OFFSET || ins->inst_imm == METHOD_EXIT_IL_OFFSET) && ins != endfinally_seq_point)
next [endfinally_seq_point->backend.size] = g_slist_append (next [endfinally_seq_point->backend.size], GUINT_TO_POINTER (ins->backend.size));
@@
-197,15
+197,15
@@
mono_get_seq_points (MonoDomain *domain, MonoMethod *method)
shared_method = mini_get_shared_method (method);
}
shared_method = mini_get_shared_method (method);
}
- mono_
domain_lock (domain
);
- seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, method);
+ mono_
loader_lock (
);
+ seq_points =
(MonoSeqPointInfo *)
g_hash_table_lookup (domain_jit_info (domain)->seq_points, method);
if (!seq_points && method->is_inflated) {
/* generic sharing + aot */
if (!seq_points && method->is_inflated) {
/* generic sharing + aot */
- seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, declaring_generic_method);
+ seq_points =
(MonoSeqPointInfo *)
g_hash_table_lookup (domain_jit_info (domain)->seq_points, declaring_generic_method);
if (!seq_points)
if (!seq_points)
- seq_points = g_hash_table_lookup (domain_jit_info (domain)->seq_points, shared_method);
+ seq_points =
(MonoSeqPointInfo *)
g_hash_table_lookup (domain_jit_info (domain)->seq_points, shared_method);
}
}
- mono_
domain_unlock (domain
);
+ mono_
loader_unlock (
);
return seq_points;
}
return seq_points;
}
@@
-294,11
+294,3
@@
mono_bb_deduplicate_op_il_seq_points (MonoCompile *cfg, MonoBasicBlock *bb)
MONO_REMOVE_INS (bb, prev);
};
}
MONO_REMOVE_INS (bb, prev);
};
}
-
-void
-mono_image_get_aot_seq_point_path (MonoImage *image, char **str)
-{
- int size = strlen (image->name) + strlen (SEQ_POINT_AOT_EXT) + 1;
- *str = g_malloc (size);
- g_sprintf (*str, "%s%s", image->name, SEQ_POINT_AOT_EXT);
-}