| Index: src/runtime/runtime-debug.cc
|
| diff --git a/src/runtime/runtime-debug.cc b/src/runtime/runtime-debug.cc
|
| index 392f943472245bccce9f72b161eaddcdff79258e..2f32a0a415446930c9321ecb62821d5e8cb90893 100644
|
| --- a/src/runtime/runtime-debug.cc
|
| +++ b/src/runtime/runtime-debug.cc
|
| @@ -54,7 +54,7 @@ RUNTIME_FUNCTION(Runtime_SetDebugEventListener) {
|
| }
|
|
|
|
|
| -RUNTIME_FUNCTION(Runtime_Break) {
|
| +RUNTIME_FUNCTION(Runtime_ScheduleBreak) {
|
| SealHandleScope shs(isolate);
|
| DCHECK(args.length() == 0);
|
| isolate->stack_guard()->RequestDebugBreak();
|
| @@ -2570,40 +2570,6 @@ RUNTIME_FUNCTION(Runtime_DebugSetScriptSource) {
|
| }
|
|
|
|
|
| -RUNTIME_FUNCTION(Runtime_DebugDisassembleFunction) {
|
| - HandleScope scope(isolate);
|
| -#ifdef DEBUG
|
| - DCHECK(args.length() == 1);
|
| - // Get the function and make sure it is compiled.
|
| - CONVERT_ARG_HANDLE_CHECKED(JSFunction, func, 0);
|
| - if (!Compiler::EnsureCompiled(func, KEEP_EXCEPTION)) {
|
| - return isolate->heap()->exception();
|
| - }
|
| - OFStream os(stdout);
|
| - func->code()->Print(os);
|
| - os << std::endl;
|
| -#endif // DEBUG
|
| - return isolate->heap()->undefined_value();
|
| -}
|
| -
|
| -
|
| -RUNTIME_FUNCTION(Runtime_DebugDisassembleConstructor) {
|
| - HandleScope scope(isolate);
|
| -#ifdef DEBUG
|
| - DCHECK(args.length() == 1);
|
| - // Get the function and make sure it is compiled.
|
| - CONVERT_ARG_HANDLE_CHECKED(JSFunction, func, 0);
|
| - if (!Compiler::EnsureCompiled(func, KEEP_EXCEPTION)) {
|
| - return isolate->heap()->exception();
|
| - }
|
| - OFStream os(stdout);
|
| - func->shared()->construct_stub()->Print(os);
|
| - os << std::endl;
|
| -#endif // DEBUG
|
| - return isolate->heap()->undefined_value();
|
| -}
|
| -
|
| -
|
| RUNTIME_FUNCTION(Runtime_FunctionGetInferredName) {
|
| SealHandleScope shs(isolate);
|
| DCHECK(args.length() == 1);
|
| @@ -2664,21 +2630,15 @@ RUNTIME_FUNCTION(Runtime_GetFunctionCodePositionFromSource) {
|
| // to have a stack with C++ frame in the middle.
|
| RUNTIME_FUNCTION(Runtime_ExecuteInDebugContext) {
|
| HandleScope scope(isolate);
|
| - DCHECK(args.length() == 2);
|
| + DCHECK(args.length() == 1);
|
| CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
|
| - CONVERT_BOOLEAN_ARG_CHECKED(without_debugger, 1);
|
|
|
| - MaybeHandle<Object> maybe_result;
|
| - if (without_debugger) {
|
| - maybe_result = Execution::Call(isolate, function,
|
| - handle(function->global_proxy()), 0, NULL);
|
| - } else {
|
| - DebugScope debug_scope(isolate->debug());
|
| - maybe_result = Execution::Call(isolate, function,
|
| - handle(function->global_proxy()), 0, NULL);
|
| - }
|
| + DebugScope debug_scope(isolate->debug());
|
| Handle<Object> result;
|
| - ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, result, maybe_result);
|
| + ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
|
| + isolate, result,
|
| + Execution::Call(isolate, function, handle(function->global_proxy()), 0,
|
| + NULL));
|
| return *result;
|
| }
|
|
|
|
|