Index: runtime/vm/debugger.cc |
=================================================================== |
--- runtime/vm/debugger.cc (revision 3821) |
+++ runtime/vm/debugger.cc (working copy) |
@@ -23,7 +23,6 @@ |
static const bool verbose = false; |
- |
Breakpoint::Breakpoint(const Function& func, intptr_t pc_desc_index) |
: function_(func.raw()), |
pc_desc_index_(pc_desc_index), |
@@ -348,18 +347,14 @@ |
// TODO(hausner): Distinguish between newly created breakpoints and |
// returning a breakpoint that already exists? |
Breakpoint* Debugger::SetBreakpoint(const Function& target_function, |
- intptr_t token_index, |
- Error* error) { |
+ intptr_t token_index) { |
if ((token_index < target_function.token_index()) || |
(target_function.end_token_index() <= token_index)) { |
// The given token position is not within the target function. |
return NULL; |
} |
if (!target_function.HasCode()) { |
- *error = Compiler::CompileFunction(target_function); |
- if (!error->IsNull()) { |
- return NULL; |
- } |
+ Compiler::CompileFunction(target_function); |
} |
Code& code = Code::Handle(target_function.code()); |
ASSERT(!code.IsNull()); |
@@ -429,16 +424,14 @@ |
} |
-Breakpoint* Debugger::SetBreakpointAtEntry(const Function& target_function, |
- Error* error) { |
+Breakpoint* Debugger::SetBreakpointAtEntry(const Function& target_function) { |
ASSERT(!target_function.IsNull()); |
- return SetBreakpoint(target_function, target_function.token_index(), error); |
+ return SetBreakpoint(target_function, target_function.token_index()); |
} |
Breakpoint* Debugger::SetBreakpointAtLine(const String& script_url, |
- intptr_t line_number, |
- Error* error) { |
+ intptr_t line_number) { |
Library& lib = Library::Handle(); |
Script& script = Script::Handle(); |
lib = isolate_->object_store()->registered_libraries(); |
@@ -462,7 +455,7 @@ |
if (func.IsNull()) { |
return NULL; |
} |
- return SetBreakpoint(func, token_index_at_line, error); |
+ return SetBreakpoint(func, token_index_at_line); |
} |