X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fabcremoval.c;h=45d5394a6679a188dd8435e8311e12ae11523d4e;hb=5bde5effed9f0e7dd3279f62c56bb488ff11b4ce;hp=f412cb8bf79ce084755a44cb40e2e33de2fafb9b;hpb=92f60fbffa1187be7dedf6a9286b5c35b2082815;p=mono.git

diff --git a/mono/mini/abcremoval.c b/mono/mini/abcremoval.c
index f412cb8bf79..45d5394a667 100644
--- a/mono/mini/abcremoval.c
+++ b/mono/mini/abcremoval.c
@@ -275,6 +275,12 @@ get_relation_from_ins (MonoVariableRelationsEvaluationArea *area, MonoInst *ins,
 		value->value.variable.variable = ins->sreg1;
 		value->value.variable.delta = 0;
 		break;
+	case OP_SEXT_I4:
+		value->type = MONO_VARIABLE_SUMMARIZED_VALUE;
+		value->value.variable.variable = ins->sreg1;
+		value->value.variable.delta = 0;
+		value_kind = MONO_INTEGER_VALUE_SIZE_8;
+		break;
 	case OP_PHI:
 		value->type = MONO_PHI_SUMMARIZED_VALUE;
 		value->value.phi.number_of_alternatives = *(ins->inst_phi_args);
@@ -290,7 +296,7 @@ get_relation_from_ins (MonoVariableRelationsEvaluationArea *area, MonoInst *ins,
 	case OP_ISUB_IMM:
 		value->type = MONO_VARIABLE_SUMMARIZED_VALUE;
 		value->value.variable.variable = ins->sreg1;
-		value->value.variable.delta = ins->inst_imm;
+		value->value.variable.delta = -ins->inst_imm;
 		/* FIXME: */
 		//check_delta_safety (area, result);
 		break;
@@ -316,6 +322,13 @@ get_relation_from_ins (MonoVariableRelationsEvaluationArea *area, MonoInst *ins,
 		value->type = MONO_VARIABLE_SUMMARIZED_VALUE;
 		value->value.variable.variable = ins->sreg1;
 		value->value.variable.delta = 0;
+		area->defs [ins->dreg] = ins;
+		break;
+	case OP_LDADDR:
+		/* The result is non-null */
+		result->relation = MONO_GT_RELATION;
+		value->type = MONO_CONSTANT_SUMMARIZED_VALUE;
+		value->value.constant.value = 0;
 		break;
 
 		/* FIXME: Add more opcodes */
@@ -982,8 +995,8 @@ remove_abc_from_inst (MonoInst *ins, MonoVariableRelationsEvaluationArea *area)
 		if (REPORT_ABC_REMOVAL) {
 			printf ("ARRAY-ACCESS: removed bounds check on array %d with index %d\n",
 					array_variable, index_variable);
-			NULLIFY_INS (ins);
 		}
+		NULLIFY_INS (ins);
 	} else {
 		if (TRACE_ABC_REMOVAL) {
 			if (index_context->ranges.zero.lower >= 0) {
@@ -1128,12 +1141,9 @@ process_block (MonoCompile *cfg, MonoBasicBlock *bb, MonoVariableRelationsEvalua
 			add_non_null (area, cfg, ins->sreg1, &check_relations);
 
 		/* 
-		 * This doesn't work because LLVM can move the non-faulting loads before the faulting
-		 * ones (test_0_llvm_moving_faulting_loads ()).
-		 * FIXME: This also doesn't work because abcrem equates an array with its length,
+		 * FIXME: abcrem equates an array with its length,
 		 * so a = new int [100] implies a != null, but a = new int [0] doesn't.
 		 */
-#if 0
 		/*
 		 * Eliminate MONO_INST_FAULT flags if possible.
 		 */
@@ -1151,6 +1161,18 @@ process_block (MonoCompile *cfg, MonoBasicBlock *bb, MonoVariableRelationsEvalua
 			else
 				reg = ins->sreg1;
 
+			/*
+			 * This doesn't work because LLVM can move the non-faulting loads before the faulting
+			 * ones (test_0_llvm_moving_faulting_loads ()).
+			 * So only do it if we know the load cannot be moved before the instruction which ensures it is not
+			 * null (i.e. the def of its sreg).
+			 */
+			if (area->defs [reg] && area->defs [reg]->opcode == OP_NEWARR) {
+				if (REPORT_ABC_REMOVAL)
+					printf ("ARRAY-ACCESS: removed MONO_INST_FAULT flag.\n");
+				ins->flags &= ~MONO_INST_FAULT;
+			}
+			/*
 			if (eval_non_null (area, reg)) {
 				if (REPORT_ABC_REMOVAL)
 					printf ("ARRAY-ACCESS: removed MONO_INST_FAULT flag.\n");
@@ -1158,8 +1180,8 @@ process_block (MonoCompile *cfg, MonoBasicBlock *bb, MonoVariableRelationsEvalua
 			} else {
 				add_non_null (area, cfg, reg, &check_relations);
 			}
+			*/
 		}
-#endif
 	}	
 	
 	if (TRACE_ABC_REMOVAL) {
@@ -1253,12 +1275,14 @@ mono_perform_abc_removal (MonoCompile *cfg)
 		mono_mempool_alloc (cfg->mempool, sizeof (MonoRelationsEvaluationContext) * (cfg->next_vreg));
 	area.variable_value_kind = (MonoIntegerValueKind *)
 		mono_mempool_alloc (cfg->mempool, sizeof (MonoIntegerValueKind) * (cfg->next_vreg));
+	area.defs = mono_mempool_alloc (cfg->mempool, sizeof (MonoInst*) * cfg->next_vreg);
 	for (i = 0; i < cfg->next_vreg; i++) {
 		area.variable_value_kind [i] = MONO_UNKNOWN_INTEGER_VALUE;
 		area.relations [i].relation = MONO_EQ_RELATION;
 		area.relations [i].relation_is_static_definition = TRUE;
 		MAKE_VALUE_ANY (area.relations [i].related_value);
 		area.relations [i].next = NULL;
+		area.defs [i] = NULL;
 	}
 
 	for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {