Merge pull request #5714 from alexischr/update_bockbuild

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

diff --git a/mono/mini/cfgdump.c b/mono/mini/cfgdump.c
index 868161bfee7fe4e3a04ed01a62ed991bf7de5bc4..36c9ffac877b0a822328e5f09df25603dfddc2a4 100644 (file)
--- a/mono/mini/cfgdump.c
+++ b/mono/mini/cfgdump.c
@@ -1,4 +1,5 @@
-/*
+/**
+ * \file
  * Copyright (C) 2016 Xamarin Inc
  * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
@@ -7,6 +8,8 @@
 
 #include "mini.h"
 
+#if !defined(DISABLE_LOGGING) && !defined(DISABLE_JIT) && !defined(HOST_WIN32)
+
 #include <glib.h>
 #include <mono/metadata/class-internals.h>
 
@@ -19,7 +22,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <arpa/inet.h>
-#include <errno.h>
 
 #if 0
 #define CFG_DEBUG
@@ -44,7 +46,6 @@
 
 #endif
 
-#if !defined(DISABLE_LOGGING) && !defined(DISABLE_JIT)
 static ConstantPoolEntry*
 create_cp_entry (MonoCompile *cfg, void *data, pool_type pt)
 {
@@ -400,9 +401,9 @@ instruction_hash (MonoInst *insn)
        res ^= insn->sreg1  << 0x10;
        res ^= insn->sreg2  << 0x14;
        res ^= insn->sreg3  << 0x18;
-       res ^= (guint) insn->next;
-       res ^= (guint) insn->prev;
-       res ^= (guint) insn;
+       res ^= (gsize) insn->next;
+       res ^= (gsize) insn->prev;
+       res ^= (gsize) insn;
        return res;
 }
 
@@ -437,16 +438,18 @@ constant_pool_hash (ConstantPoolEntry *entry)
                        return instruction_hash ((MonoInst *) entry->data);
                case PT_SIGNATURE: {
                        MonoMethodSignature *sig = (MonoMethodSignature *) entry->data;
-                       guint ret = (guint) sig->ret;
+                       guint ret = GPOINTER_TO_UINT (sig->ret);
                        for (int i = 0; i < sig->param_count; i++) {
-                               ret ^= (guint) sig->params [i] << (i + 1);
+                               ret ^= GPOINTER_TO_UINT (sig->params [i]) << (i + 1);
                        }
                        return ret;
                }
                case PT_INPUTTYPE: // TODO: singleton.
                case PT_ENUMKLASS:
-                       return (guint) entry->data;
+                       return GPOINTER_TO_UINT (entry->data);
        }
+       g_assert (FALSE);
+       return FALSE;
 }
 
 static gboolean
@@ -470,6 +473,8 @@ constant_pool_equal (gconstpointer v1, gconstpointer v2)
                case PT_ENUMKLASS:
                        return TRUE;
        }
+       g_assert (FALSE);
+       return FALSE;
 }
 
 
@@ -528,7 +533,7 @@ mono_cfg_dump_ir (MonoCompile *cfg, const char *phase_name)
        write_instructions (cfg, instruction_count);
        write_blocks (cfg);
 }
-#else /* !defined(DISABLE_LOGGING) && !defined(DISABLE_JIT) */
+#else /* !defined(DISABLE_LOGGING) && !defined(DISABLE_JIT) && !defined(HOST_WIN32) */
 void
 mono_cfg_dump_create_context (MonoCompile *cfg)
 {
@@ -548,4 +553,4 @@ void
 mono_cfg_dump_ir (MonoCompile *cfg, const char *phase_name)
 {
 }
-#endif /* !defined(DISABLE_LOGGING) && !defined(DISABLE_JIT) */
+#endif /* !defined(DISABLE_LOGGING) && !defined(DISABLE_JIT) && !defined(HOST_WIN32) */