Index: src/debug/debug.cc |
diff --git a/src/debug/debug.cc b/src/debug/debug.cc |
index 36e508321725166ba95c94c47daa2c45ca3251c3..1a54cd234633f79f92377321f395d1cc74e7447e 100644 |
--- a/src/debug/debug.cc |
+++ b/src/debug/debug.cc |
@@ -183,7 +183,6 @@ int CodeBreakIterator::GetModeMask() { |
mask |= RelocInfo::ModeMask(RelocInfo::DEBUG_BREAK_SLOT_AT_CALL); |
mask |= RelocInfo::ModeMask(RelocInfo::DEBUG_BREAK_SLOT_AT_TAIL_CALL); |
mask |= RelocInfo::ModeMask(RelocInfo::DEBUG_BREAK_SLOT_AT_POSITION); |
- mask |= RelocInfo::ModeMask(RelocInfo::DEBUGGER_STATEMENT); |
return mask; |
} |
@@ -208,8 +207,7 @@ void CodeBreakIterator::Next() { |
source_position_iterator_.Advance(); |
} |
- DCHECK(RelocInfo::IsDebugBreakSlot(rmode()) || |
- RelocInfo::IsDebuggerStatement(rmode())); |
+ DCHECK(RelocInfo::IsDebugBreakSlot(rmode())); |
break_index_++; |
} |
@@ -222,8 +220,6 @@ DebugBreakType CodeBreakIterator::GetDebugBreakType() { |
return isolate()->is_tail_call_elimination_enabled() |
? DEBUG_BREAK_SLOT_AT_TAIL_CALL |
: DEBUG_BREAK_SLOT_AT_CALL; |
- } else if (RelocInfo::IsDebuggerStatement(rmode())) { |
- return DEBUGGER_STATEMENT; |
} else if (RelocInfo::IsDebugBreakSlot(rmode())) { |
return DEBUG_BREAK_SLOT; |
} else { |
@@ -239,7 +235,6 @@ void CodeBreakIterator::SkipToPosition(int position, |
void CodeBreakIterator::SetDebugBreak() { |
DebugBreakType debug_break_type = GetDebugBreakType(); |
- if (debug_break_type == DEBUGGER_STATEMENT) return; |
DCHECK(debug_break_type >= DEBUG_BREAK_SLOT); |
Builtins* builtins = isolate()->builtins(); |
Handle<Code> target = debug_break_type == DEBUG_BREAK_SLOT_AT_RETURN |
@@ -249,16 +244,12 @@ void CodeBreakIterator::SetDebugBreak() { |
} |
void CodeBreakIterator::ClearDebugBreak() { |
- DebugBreakType debug_break_type = GetDebugBreakType(); |
- if (debug_break_type == DEBUGGER_STATEMENT) return; |
- DCHECK(debug_break_type >= DEBUG_BREAK_SLOT); |
+ DCHECK(GetDebugBreakType() >= DEBUG_BREAK_SLOT); |
DebugCodegen::ClearDebugBreakSlot(isolate(), rinfo()->pc()); |
} |
bool CodeBreakIterator::IsDebugBreak() { |
- DebugBreakType debug_break_type = GetDebugBreakType(); |
- if (debug_break_type == DEBUGGER_STATEMENT) return false; |
- DCHECK(debug_break_type >= DEBUG_BREAK_SLOT); |
+ DCHECK(GetDebugBreakType() >= DEBUG_BREAK_SLOT); |
return DebugCodegen::DebugBreakSlotIsPatched(rinfo()->pc()); |
} |