| Index: src/debug.cc
|
| diff --git a/src/debug.cc b/src/debug.cc
|
| index b19b47e4fa26df3cab0f2ab6901b42f3d7c0f654..8eec14ae06adf988f59f8b3e8b8de37c6783ce8c 100644
|
| --- a/src/debug.cc
|
| +++ b/src/debug.cc
|
| @@ -1226,7 +1226,7 @@ void Debug::FloodBoundFunctionWithOneShot(Handle<JSFunction> function) {
|
| isolate_);
|
|
|
| if (!bindee.is_null() && bindee->IsJSFunction() &&
|
| - !JSFunction::cast(*bindee)->IsNative()) {
|
| + !JSFunction::cast(*bindee)->IsFromNativeScript()) {
|
| Handle<JSFunction> bindee_function(JSFunction::cast(*bindee));
|
| Debug::FloodWithOneShot(bindee_function);
|
| }
|
| @@ -1447,7 +1447,8 @@ void Debug::PrepareStep(StepAction step_action,
|
| frames_it.Advance();
|
| }
|
| // Skip builtin functions on the stack.
|
| - while (!frames_it.done() && frames_it.frame()->function()->IsNative()) {
|
| + while (!frames_it.done() &&
|
| + frames_it.frame()->function()->IsFromNativeScript()) {
|
| frames_it.Advance();
|
| }
|
| // Step out: If there is a JavaScript caller frame, we need to
|
| @@ -1534,7 +1535,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->IsNative()) {
|
| + } else if (!js_function->IsFromNativeScript()) {
|
| // Don't step into builtins.
|
| // It will also compile target function if it's not compiled yet.
|
| FloodWithOneShot(js_function);
|
| @@ -1676,7 +1677,7 @@ void Debug::HandleStepIn(Handle<JSFunction> function,
|
| if (function->shared()->bound()) {
|
| // Handle Function.prototype.bind
|
| Debug::FloodBoundFunctionWithOneShot(function);
|
| - } else if (!function->IsNative()) {
|
| + } else if (!function->IsFromNativeScript()) {
|
| // Don't allow step into functions in the native context.
|
| if (function->shared()->code() ==
|
| isolate->builtins()->builtin(Builtins::kFunctionApply) ||
|
| @@ -1688,7 +1689,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->IsNative()) {
|
| + if (!js_function->IsFromNativeScript()) {
|
| Debug::FloodWithOneShot(js_function);
|
| } else if (js_function->shared()->bound()) {
|
| // Handle Function.prototype.bind
|
| @@ -2030,7 +2031,7 @@ void Debug::PrepareForBreakPoints() {
|
|
|
| if (!shared->allows_lazy_compilation()) continue;
|
| if (!shared->script()->IsScript()) continue;
|
| - if (function->IsNative()) continue;
|
| + if (function->IsFromNativeScript()) continue;
|
| if (shared->code()->gc_metadata() == active_code_marker) continue;
|
|
|
| if (shared->is_generator()) {
|
|
|