| Index: src/debug.cc
|
| ===================================================================
|
| --- src/debug.cc (revision 8778)
|
| +++ src/debug.cc (working copy)
|
| @@ -169,7 +169,8 @@
|
| if ((code->is_inline_cache_stub() &&
|
| !code->is_binary_op_stub() &&
|
| !code->is_unary_op_stub() &&
|
| - !code->is_compare_ic_stub()) ||
|
| + !code->is_compare_ic_stub() &&
|
| + !code->is_to_boolean_ic_stub()) ||
|
| RelocInfo::IsConstructCall(rmode())) {
|
| break_point_++;
|
| return;
|
| @@ -773,10 +774,10 @@
|
| bool caught_exception = false;
|
| Handle<JSFunction> function =
|
| factory->NewFunctionFromSharedFunctionInfo(function_info, context);
|
| - Handle<Object> result =
|
| - Execution::TryCall(function, Handle<Object>(context->global()),
|
| - 0, NULL, &caught_exception);
|
|
|
| + Execution::TryCall(function, Handle<Object>(context->global()),
|
| + 0, NULL, &caught_exception);
|
| +
|
| // Check for caught exceptions.
|
| if (caught_exception) {
|
| Handle<Object> message = MessageHandler::MakeMessageObject(
|
| @@ -1887,8 +1888,7 @@
|
| *function_name));
|
| ASSERT(fun->IsJSFunction());
|
| bool caught_exception;
|
| - Handle<Object> js_object = Execution::TryCall(
|
| - Handle<JSFunction>::cast(fun),
|
| + Execution::TryCall(Handle<JSFunction>::cast(fun),
|
| Handle<JSObject>(Debug::debug_context()->global()),
|
| 0, NULL, &caught_exception);
|
| }
|
| @@ -2256,8 +2256,7 @@
|
| bool caught_exception = false;
|
| const int argc = 1;
|
| Object** argv[argc] = { reinterpret_cast<Object**>(wrapper.location()) };
|
| - Handle<Object> result = Execution::TryCall(
|
| - Handle<JSFunction>::cast(update_script_break_points),
|
| + Execution::TryCall(Handle<JSFunction>::cast(update_script_break_points),
|
| Isolate::Current()->js_builtins_object(), argc, argv,
|
| &caught_exception);
|
| if (caught_exception) {
|
| @@ -2934,7 +2933,7 @@
|
| v8::Handle<v8::Context> context = GetDebugEventContext(isolate);
|
| // Isolate::context() may be NULL when "script collected" event occures.
|
| ASSERT(!context.IsEmpty() || event_ == v8::ScriptCollected);
|
| - return GetDebugEventContext(isolate);
|
| + return context;
|
| }
|
|
|
|
|
|
|