[Mono-dev] Patch to get --enable-minimal=jit working again

[Sam777]

Index: mono/mini/branch-opts.c
===================================================================
--- mono/mini/branch-opts.c     (revision 125014)
+++ mono/mini/branch-opts.c     (working copy)
@@ -6,23 +6,10 @@
  *
  * (C) 2005 Ximian, Inc.  http://www.ximian.com
  */
- #include "mini.h"
+#include "mini.h"

-#ifndef DISABLE_JIT
-

 /*
- * Returns true if @bb is a basic block which falls through the next block.
- * TODO verify if it helps to check if the bb last ins is a branch to its
successor.
- */
-static gboolean
-mono_bb_is_fall_through (MonoCompile *cfg, MonoBasicBlock *bb)
-{
-       return  bb->next_bb && bb->next_bb->region == bb->region && /*fall
throught between regions is not really interesting or useful*/
-                       (bb->last_ins == NULL || !MONO_IS_BRANCH_OP
(bb->last_ins)); /*and the last op can't be a branch too*/
-}
-
-/*
  * Used by the arch code to replace the exception handling
  * with a direct branch. This is safe to do if the
  * exception object isn't used, no rethrow statement and
@@ -106,6 +93,22 @@
        return NULL;
 }

+
+#ifndef DISABLE_JIT
+
+
+/*
+ * Returns true if @bb is a basic block which falls through the next block.
+ * TODO verify if it helps to check if the bb last ins is a branch to its
successor.
+ */
+static gboolean
+mono_bb_is_fall_through (MonoCompile *cfg, MonoBasicBlock *bb)
+{
+       return  bb->next_bb && bb->next_bb->region == bb->region && /*fall
throught between regions is not really interesting or useful*/
+                       (bb->last_ins == NULL || !MONO_IS_BRANCH_OP
(bb->last_ins)); /*and the last op can't be a branch too*/
+}
+
+
 static const int int_cmov_opcodes [] = {
        OP_CMOV_IEQ,
        OP_CMOV_INE_UN,

-- 
View this message in context: http://www.nabble.com/Patch-to-get---enable-minimal%3Djit-working-again-tp21738613p21738613.html
Sent from the Mono - Dev mailing list archive at Nabble.com.