Index: src/debug.cc |
diff --git a/src/debug.cc b/src/debug.cc |
index 543ce9f24df5f096106902b918f927f9a7e3dc8e..ed70c6a8d995f78a70af4da917e1b6ffae677363 100644 |
--- a/src/debug.cc |
+++ b/src/debug.cc |
@@ -892,16 +892,6 @@ void Debug::Iterate(ObjectVisitor* v) { |
} |
-void Debug::PutValuesOnStackAndDie(int start, |
- Address c_entry_fp, |
- Address last_fp, |
- Address larger_fp, |
- int count, |
- int end) { |
- OS::Abort(); |
-} |
- |
- |
Object* Debug::Break(Arguments args) { |
Heap* heap = isolate_->heap(); |
HandleScope scope(isolate_); |
@@ -999,41 +989,17 @@ Object* Debug::Break(Arguments args) { |
it.Advance(); |
} |
- // Catch the cases that would lead to crashes and capture |
- // - C entry FP at which to start stack crawl. |
- // - FP of the frame at which we plan to stop stepping out (last FP). |
- // - current FP that's larger than last FP. |
- // - Counter for the number of steps to step out. |
- if (it.done()) { |
- // We crawled the entire stack, never reaching last_fp_. |
- PutValuesOnStackAndDie(0xBEEEEEEE, |
- frame->fp(), |
- thread_local_.last_fp_, |
- NULL, |
- count, |
- 0xFEEEEEEE); |
- } else if (it.frame()->fp() != thread_local_.last_fp_) { |
- // We crawled over last_fp_, without getting a match. |
- PutValuesOnStackAndDie(0xBEEEEEEE, |
- frame->fp(), |
- thread_local_.last_fp_, |
- it.frame()->fp(), |
- count, |
- 0xFEEEEEEE); |
+ // Check that we indeed found the frame we are looking for. |
+ CHECK(!it.done() && (it.frame()->fp() == thread_local_.last_fp_)); |
+ if (step_count > 1) { |
+ // Save old count and action to continue stepping after |
+ // StepOut |
+ thread_local_.queued_step_count_ = step_count - 1; |
} |
- // If we found original frame |
- if (it.frame()->fp() == thread_local_.last_fp_) { |
- if (step_count > 1) { |
- // Save old count and action to continue stepping after |
- // StepOut |
- thread_local_.queued_step_count_ = step_count - 1; |
- } |
- |
- // Set up for StepOut to reach target frame |
- step_action = StepOut; |
- step_count = count; |
- } |
+ // Set up for StepOut to reach target frame |
+ step_action = StepOut; |
+ step_count = count; |
} |
// Clear all current stepping setup. |