| Index: runtime/vm/debugger_arm.cc
 | 
| diff --git a/runtime/vm/debugger_arm.cc b/runtime/vm/debugger_arm.cc
 | 
| index 1322b8d43863c73c10e54d8a2511501fc4f2c907..e0a366da26112238cc451dd18541bc9ecc266e0c 100644
 | 
| --- a/runtime/vm/debugger_arm.cc
 | 
| +++ b/runtime/vm/debugger_arm.cc
 | 
| @@ -13,21 +13,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();
 | 
| @@ -46,7 +46,7 @@ void CodeBreakpoint::RestoreCode() {
 | 
|      case RawPcDescriptors::kIcCall:
 | 
|      case RawPcDescriptors::kUnoptStaticCall:
 | 
|      case RawPcDescriptors::kRuntimeCall: {
 | 
| -      CodePatcher::PatchStaticCallAt(pc_, code, Code::Handle(saved_value_));
 | 
| +      CodePatcher::PatchStaticCallAt(pc_, code, saved_value_);
 | 
|        break;
 | 
|      }
 | 
|      default:
 | 
| 
 |