Merge pull request #3416 from ludovic-henry/iolayer-extract-wait

[mono.git] / mono / mini / mini.h

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index 21e8e62ad3793b8cd67db09a88a89d20f81c403a..2f0259cdcb2aff3a82f190daa8fbac1999892e64 100644 (file)
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -125,7 +125,7 @@
 #endif
 
 /* Version number of the AOT file format */
-#define MONO_AOT_FILE_VERSION 136
+#define MONO_AOT_FILE_VERSION 137
 
 //TODO: This is x86/amd64 specific.
 #define mono_simd_shuffle_mask(a,b,c,d) ((a) | ((b) << 2) | ((c) << 4) | ((d) << 6))
@@ -728,7 +728,13 @@ struct MonoBasicBlock {
        guint real_offset;
 
        GSList *seq_points;
+
+       // The MonoInst of the last sequence point for the current basic block.
        MonoInst *last_seq_point;
+       
+       // This will hold a list of last sequence points of incoming basic blocks
+       MonoInst **pred_seq_points;
+       guint num_pred_seq_points;
 
        GSList *spill_slot_defs;
 
@@ -1911,6 +1917,7 @@ typedef struct {
        gint32 alias_removed;
        gint32 loads_eliminated;
        gint32 stores_eliminated;
+       gint32 optimized_divisions;
        int methods_with_llvm;
        int methods_without_llvm;
        char *max_ratio_method;
@@ -2866,14 +2873,6 @@ MonoBoolean ves_icall_get_frame_info            (gint32 skip, MonoBoolean need_f
                                                 MonoString **file, gint32 *line, gint32 *column);
 void mono_set_cast_details                      (MonoClass *from, MonoClass *to);
 
-/* Installs a function which is called when the runtime encounters an unhandled exception.
- * This hook isn't expected to return.
- * If no hook has been installed, the runtime will print a message before aborting.
- */
-typedef void  (*MonoUnhandledExceptionFunc)         (MonoObject *exc, gpointer user_data);
-MONO_API void mono_install_unhandled_exception_hook (MonoUnhandledExceptionFunc func, gpointer user_data);
-void          mono_invoke_unhandled_exception_hook  (MonoObject *exc);
-
 void mono_decompose_typechecks (MonoCompile *cfg);
 /* Dominator/SSA methods */
 void        mono_compile_dominator_info         (MonoCompile *cfg, int dom_flags);