Fix some warnings.
authorZoltan Varga <vargaz@gmail.com>
Wed, 2 Nov 2016 21:14:07 +0000 (17:14 -0400)
committerZoltan Varga <vargaz@gmail.com>
Wed, 2 Nov 2016 21:14:14 +0000 (17:14 -0400)
mono/mini/mini-generic-sharing.c
mono/mini/mini-trampolines.c
mono/mini/trace.c

index da5b3afc6c259ae2bfe8eda0229cc37c75f91b01..fe2340adb32729e32818ae7b0ce225fef8f5dbeb 100644 (file)
@@ -1183,7 +1183,7 @@ mini_get_gsharedvt_in_sig_wrapper (MonoMethodSignature *sig)
        MonoMethod *res, *cached;
        WrapperInfo *info;
        MonoMethodSignature *csig, *gsharedvt_sig;
-       int i, pindex, retval_var;
+       int i, pindex, retval_var = 0;
        static GHashTable *cache;
 
        // FIXME: Memory management
index 122334e6ea6519613d4bd8e741fac583c13bafc7..10316da1b90149a6e96fde2d17c34e69379f5c8b 100644 (file)
@@ -850,7 +850,7 @@ mono_vcall_trampoline (mgreg_t *regs, guint8 *code, int slot, guint8 *tramp)
        gpointer *vtable_slot;
        MonoMethod *m;
        MonoError error;
-       gpointer addr, res;
+       gpointer addr, res = NULL;
 
        trampoline_calls ++;
 
index 95c860902337d51aa113de03ce00649e255d807b..90f0af81b5a2c2e606f9e4b2d7be094f7be8d357 100644 (file)
@@ -132,11 +132,12 @@ mono_trace_eval (MonoMethod *method)
                case MONO_TRACEOP_EXCEPTION:
                        break;
                }
-               if (op->exclude){
+               if (op->exclude) {
                        if (inc)
                                include = 0;
-               } else if (inc)
+               } else if (inc) {
                        include = 1;
+               }
        }
        return include;
 }