Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 54ae715d0a40aa8486765c2cb104f26b76866ba3..2ac6f61dbb72a1c1d92383a03bd632bf5d2cc6a3 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -4448,8 +4448,20 @@ void LCodeGen::DoStoreNamedGeneric(LStoreNamedGeneric* instr) { |
} |
+void LCodeGen::ApplyCheckIf(Condition cc, LBoundsCheck* check) { |
+ if (FLAG_debug_code && check->hydrogen()->skip_check()) { |
+ Label done; |
+ __ j(NegateCondition(cc), &done, Label::kNear); |
+ __ int3(); |
+ __ bind(&done); |
+ } else { |
+ DeoptimizeIf(cc, check->environment()); |
+ } |
+} |
+ |
+ |
void LCodeGen::DoBoundsCheck(LBoundsCheck* instr) { |
- if (instr->hydrogen()->skip_check()) return; |
+ if (instr->hydrogen()->skip_check() && !FLAG_debug_code) return; |
if (instr->index()->IsConstantOperand()) { |
int constant_index = |
@@ -4460,10 +4472,14 @@ void LCodeGen::DoBoundsCheck(LBoundsCheck* instr) { |
} else { |
__ cmp(ToOperand(instr->length()), Immediate(constant_index)); |
} |
- DeoptimizeIf(below_equal, instr->environment()); |
+ Condition condition = |
+ instr->hydrogen()->allow_equality() ? below : below_equal; |
+ ApplyCheckIf(condition, instr); |
} else { |
__ cmp(ToRegister(instr->index()), ToOperand(instr->length())); |
- DeoptimizeIf(above_equal, instr->environment()); |
+ Condition condition = |
+ instr->hydrogen()->allow_equality() ? above : above_equal; |
+ ApplyCheckIf(condition, instr); |
} |
} |