| Index: runtime/vm/debugger_x64.cc
 | 
| diff --git a/runtime/vm/debugger_x64.cc b/runtime/vm/debugger_x64.cc
 | 
| index 4fe2e6a0508da454be2285642e7d4cd9436c3d9d..531876d8c4ae11be6a8d74464240c3548962a0c9 100644
 | 
| --- a/runtime/vm/debugger_x64.cc
 | 
| +++ b/runtime/vm/debugger_x64.cc
 | 
| @@ -15,21 +15,21 @@
 | 
|  
 | 
|  namespace dart {
 | 
|  
 | 
| -RawCode* CodeBreakpoint::OrigStubAddress() const {
 | 
| +uword CodeBreakpoint::OrigStubAddress() const {
 | 
|    return saved_value_;
 | 
|  }
 | 
|  
 | 
|  
 | 
|  void CodeBreakpoint::PatchCode() {
 | 
|    ASSERT(!is_enabled_);
 | 
| -  Code& stub_target = Code::Handle();
 | 
| +  uword stub_target = 0;
 | 
|    switch (breakpoint_kind_) {
 | 
|      case RawPcDescriptors::kIcCall:
 | 
|      case RawPcDescriptors::kUnoptStaticCall:
 | 
| -      stub_target = StubCode::ICCallBreakpoint_entry()->code();
 | 
| +      stub_target = StubCode::ICCallBreakpoint_entry()->EntryPoint();
 | 
|        break;
 | 
|      case RawPcDescriptors::kRuntimeCall:
 | 
| -      stub_target = StubCode::RuntimeCallBreakpoint_entry()->code();
 | 
| +      stub_target = StubCode::RuntimeCallBreakpoint_entry()->EntryPoint();
 | 
|        break;
 | 
|      default:
 | 
|        UNREACHABLE();
 | 
| @@ -48,8 +48,7 @@ void CodeBreakpoint::RestoreCode() {
 | 
|      case RawPcDescriptors::kIcCall:
 | 
|      case RawPcDescriptors::kUnoptStaticCall:
 | 
|      case RawPcDescriptors::kRuntimeCall: {
 | 
| -      CodePatcher::PatchPoolPointerCallAt(
 | 
| -          pc_, code, Code::Handle(saved_value_));
 | 
| +      CodePatcher::PatchPoolPointerCallAt(pc_, code, saved_value_);
 | 
|        break;
 | 
|      }
 | 
|      default:
 | 
| 
 |