Index: src/debug.cc |
diff --git a/src/debug.cc b/src/debug.cc |
index 058ec358735cf6a0152c6e8e99353d7f8851cfe0..932b58aac890fcb4679b723fb532eae66733da16 100644 |
--- a/src/debug.cc |
+++ b/src/debug.cc |
@@ -805,6 +805,7 @@ bool Debug::Load() { |
void Debug::Unload() { |
ClearAllBreakPoints(); |
+ ClearStepping(); |
// Match unmatched PromiseHandlePrologue calls. |
while (thread_local_.promise_on_stack_) PromiseHandleEpilogue(); |
@@ -1209,7 +1210,7 @@ void Debug::FloodBoundFunctionWithOneShot(Handle<JSFunction> function) { |
isolate_); |
if (!bindee.is_null() && bindee->IsJSFunction() && |
- !JSFunction::cast(*bindee)->IsBuiltin()) { |
+ !JSFunction::cast(*bindee)->IsNative()) { |
Handle<JSFunction> bindee_function(JSFunction::cast(*bindee)); |
Debug::FloodWithOneShot(bindee_function); |
} |
@@ -1430,7 +1431,7 @@ void Debug::PrepareStep(StepAction step_action, |
frames_it.Advance(); |
} |
// Skip builtin functions on the stack. |
- while (!frames_it.done() && frames_it.frame()->function()->IsBuiltin()) { |
+ while (!frames_it.done() && frames_it.frame()->function()->IsNative()) { |
frames_it.Advance(); |
} |
// Step out: If there is a JavaScript caller frame, we need to |
@@ -1517,7 +1518,7 @@ void Debug::PrepareStep(StepAction step_action, |
Handle<JSFunction> js_function(JSFunction::cast(fun)); |
if (js_function->shared()->bound()) { |
Debug::FloodBoundFunctionWithOneShot(js_function); |
- } else if (!js_function->IsBuiltin()) { |
+ } else if (!js_function->IsNative()) { |
// Don't step into builtins. |
// It will also compile target function if it's not compiled yet. |
FloodWithOneShot(js_function); |
@@ -1731,7 +1732,7 @@ void Debug::HandleStepIn(Handle<JSFunction> function, |
if (function->shared()->bound()) { |
// Handle Function.prototype.bind |
Debug::FloodBoundFunctionWithOneShot(function); |
- } else if (!function->IsBuiltin()) { |
+ } else if (!function->IsNative()) { |
// Don't allow step into functions in the native context. |
if (function->shared()->code() == |
isolate->builtins()->builtin(Builtins::kFunctionApply) || |
@@ -1743,7 +1744,7 @@ void Debug::HandleStepIn(Handle<JSFunction> function, |
// function. |
if (!holder.is_null() && holder->IsJSFunction()) { |
Handle<JSFunction> js_function = Handle<JSFunction>::cast(holder); |
- if (!js_function->IsBuiltin()) { |
+ if (!js_function->IsNative()) { |
Debug::FloodWithOneShot(js_function); |
} else if (js_function->shared()->bound()) { |
// Handle Function.prototype.bind |
@@ -2085,7 +2086,7 @@ void Debug::PrepareForBreakPoints() { |
if (!shared->allows_lazy_compilation()) continue; |
if (!shared->script()->IsScript()) continue; |
- if (function->IsBuiltin()) continue; |
+ if (function->IsNative()) continue; |
if (shared->code()->gc_metadata() == active_code_marker) continue; |
if (shared->is_generator()) { |