[jit] Avoid clearing MONO_INST_FAULT flags when using explicit null checks, LLVM...
authorZoltan Varga <vargaz@gmail.com>
Sun, 17 Nov 2013 06:49:04 +0000 (07:49 +0100)
committerZoltan Varga <vargaz@gmail.com>
Mon, 18 Nov 2013 04:19:34 +0000 (05:19 +0100)
mono/mini/ir-emit.h

index 07ca6378b89b6c15442b2be60c35efcbc39691e4..1af3871966bfd1d69adbfcc03015de6d24247810 100644 (file)
@@ -862,8 +862,6 @@ static int ccount = 0;
                int __ins_flags = ins_flags; \
                if (__ins_flags & MONO_INST_FAULT) {                                                            \
                        MONO_EMIT_NULL_CHECK ((cfg), (base));                                           \
-                       if (cfg->explicit_null_checks)                                                          \
-                               __ins_flags &= ~MONO_INST_FAULT;                                                        \
                }                                                                                                                               \
                NEW_LOAD_MEMBASE ((cfg), (dest), (op), (dr), (base), (offset)); \
                (dest)->flags = (__ins_flags);                                                                  \
@@ -874,8 +872,6 @@ static int ccount = 0;
                int __ins_flags = ins_flags; \
            if (__ins_flags & MONO_INST_FAULT) {                                                                        \
                        MONO_EMIT_NULL_CHECK ((cfg), (base));                                           \
-                       if (cfg->explicit_null_checks)                                                          \
-                               __ins_flags &= ~MONO_INST_FAULT;                                                        \
                }                                                                                                                               \
                NEW_LOAD_MEMBASE ((cfg), (inst), (op), (dr), (base), (offset)); \
                inst->flags = (__ins_flags); \