| Index: runtime/vm/debugger.cc
 | 
| diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc
 | 
| index ca49376e9b6c08a463fa377e83fa17817d6aea17..e0dd4a9b3993aace4e9f87df2164157db449a7db 100644
 | 
| --- a/runtime/vm/debugger.cc
 | 
| +++ b/runtime/vm/debugger.cc
 | 
| @@ -220,7 +220,6 @@ void Breakpoint::PrintJSON(JSONStream* stream) {
 | 
|  
 | 
|  void CodeBreakpoint::VisitObjectPointers(ObjectPointerVisitor* visitor) {
 | 
|    visitor->VisitPointer(reinterpret_cast<RawObject**>(&code_));
 | 
| -  visitor->VisitPointer(reinterpret_cast<RawObject**>(&saved_value_));
 | 
|  }
 | 
|  
 | 
|  
 | 
| @@ -1114,7 +1113,7 @@ CodeBreakpoint::CodeBreakpoint(const Code& code,
 | 
|        bpt_location_(NULL),
 | 
|        next_(NULL),
 | 
|        breakpoint_kind_(kind),
 | 
| -      saved_value_(Code::null()) {
 | 
| +      saved_value_(0) {
 | 
|    ASSERT(!code.IsNull());
 | 
|    ASSERT(token_pos_ > 0);
 | 
|    ASSERT(pc_ != 0);
 | 
| @@ -1398,9 +1397,7 @@ RawArray* Debugger::DeoptimizeToArray(Isolate* isolate,
 | 
|    DeoptContext* deopt_context =
 | 
|        new DeoptContext(frame, code,
 | 
|                         DeoptContext::kDestIsAllocated,
 | 
| -                       NULL,
 | 
| -                       NULL,
 | 
| -                       true);
 | 
| +                       NULL, NULL);
 | 
|    isolate->set_deopt_context(deopt_context);
 | 
|  
 | 
|    deopt_context->FillDestFrame();
 | 
| @@ -3009,13 +3006,13 @@ CodeBreakpoint* Debugger::GetCodeBreakpoint(uword breakpoint_address) {
 | 
|  }
 | 
|  
 | 
|  
 | 
| -RawCode* Debugger::GetPatchedStubAddress(uword breakpoint_address) {
 | 
| +uword Debugger::GetPatchedStubAddress(uword breakpoint_address) {
 | 
|    CodeBreakpoint* bpt = GetCodeBreakpoint(breakpoint_address);
 | 
|    if (bpt != NULL) {
 | 
|      return bpt->OrigStubAddress();
 | 
|    }
 | 
|    UNREACHABLE();
 | 
| -  return Code::null();
 | 
| +  return 0L;
 | 
|  }
 | 
|  
 | 
|  
 | 
| 
 |