Fix the previous change again.
authorZoltan Varga <vargaz@gmail.com>
Thu, 15 Mar 2012 21:24:08 +0000 (22:24 +0100)
committerZoltan Varga <vargaz@gmail.com>
Thu, 15 Mar 2012 21:24:08 +0000 (22:24 +0100)
mono/mini/method-to-ir.c

index 236112e5bc757418cefe752efd34a1835a451930..430ef5ee2ca0eaf3f413892eb988d3cebb84adce 100644 (file)
@@ -10126,18 +10126,18 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                        MONO_ADD_INS (cfg->cbb, lmf_ins);
                                        MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, lmf_ins->dreg, 0);
                                        MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBNE_UN, next_bb);
-
-                                       if (cfg->compile_aot) {
-                                               /* AOT code is only used in the root domain */
-                                               EMIT_NEW_PCONST (cfg, args [0], NULL);
-                                       } else {
-                                               EMIT_NEW_PCONST (cfg, args [0], cfg->domain);
-                                       }
-                                       ins = mono_emit_jit_icall (cfg, mono_jit_thread_attach, args);
-                                       MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, cfg->orig_domain_var->dreg, ins->dreg);
                                }
 #endif
 
+                               if (cfg->compile_aot) {
+                                       /* AOT code is only used in the root domain */
+                                       EMIT_NEW_PCONST (cfg, args [0], NULL);
+                               } else {
+                                       EMIT_NEW_PCONST (cfg, args [0], cfg->domain);
+                               }
+                               ins = mono_emit_jit_icall (cfg, mono_jit_thread_attach, args);
+                               MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, cfg->orig_domain_var->dreg, ins->dreg);
+
                                if (next_bb) {
                                        MONO_START_BB (cfg, next_bb);
                                        bblock = cfg->cbb;