Add two unnecessary zero initializations to shut GCC up.

The conditions are too complex for GCC to realize that these variables
are actually initialized when they're used.

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index c01aaf49b0b79eddd5704b82f68ede87577dab5b..8f181bed24b07acda36072bdb04d18852b509a04 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -4441,7 +4441,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
        MonoDebugSourceLocation **locs = NULL;
        gboolean skip, direct_call, external_call;
        guint32 got_slot;
-       const char *direct_call_target;
+       const char *direct_call_target = 0;
        const char *direct_pinvoke;
 
        if (method) {

diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
index 73ca5168a3af7aa5f9bf3c453059c314669e4b58..081186e22c2fc59d4e59f16d6a1e4a0f3449d801 100644 (file)
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -5713,7 +5713,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                case OP_CARD_TABLE_WBARRIER: {
                        int ptr = ins->sreg1;
                        int value = ins->sreg2;
-                       guchar *br;
+                       guchar *br = 0;
                        int nursery_shift, card_table_shift;
                        gpointer card_table_mask;
                        size_t nursery_size;
@@ -5778,6 +5778,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
                        amd64_alu_reg_membase (code, X86_ADD, AMD64_RDX, AMD64_RIP, 0);
 
                        amd64_mov_membase_imm (code, AMD64_RDX, 0, 1, 1);
+
                        if (mono_gc_card_table_nursery_check ())
                                x86_patch (br, code);
                        break;