Merge branch 'master' of http://github.com/mono/mono

[mono.git] / mono / mini / regalloc2.c

diff --git a/mono/mini/regalloc2.c b/mono/mini/regalloc2.c
index af51ee957ac1f343d57f4e90e8b4455535a1dc0f..9c5d4033f1636bad1ec087e073ec5f1ed74d3439 100644 (file)
--- a/mono/mini/regalloc2.c
+++ b/mono/mini/regalloc2.c
@@ -135,12 +135,7 @@ typedef struct MonoRegallocContext {
  * MACROS
  */
 
-#if SIZEOF_VOID_P == 8
-#define BITS_PER_CHUNK 64
-#else
-#define BITS_PER_CHUNK 32
-#endif
-
+#define BITS_PER_CHUNK MONO_BITSET_BITS_PER_CHUNK
 #define MONO_FIRST_VREG (MONO_MAX_IREGS+MONO_MAX_FREGS)
 
 /* 
@@ -1202,7 +1197,7 @@ linear_scan (MonoCompile *cfg, MonoRegallocContext *ctx)
 
        LSCAN_DEBUG (printf ("\nLINEAR SCAN 2 for %s:\n", mono_method_full_name (cfg->method, TRUE)));
 
-       header = mono_method_get_header (cfg->method);
+       header = cfg->header;
 
        sig = mono_method_signature (cfg->method);