Index: runtime/vm/debugger_x64.cc |
diff --git a/runtime/vm/debugger_x64.cc b/runtime/vm/debugger_x64.cc |
index 39b1ac115c4d6394810ac82f55521e1b1fb18a79..3ea79ce60e1a389960643abdd07b13c0babb59d2 100644 |
--- a/runtime/vm/debugger_x64.cc |
+++ b/runtime/vm/debugger_x64.cc |
@@ -15,7 +15,7 @@ |
namespace dart { |
-uword CodeBreakpoint::OrigStubAddress() const { |
+RawCode* CodeBreakpoint::OrigStubAddress() const { |
return saved_value_; |
} |
@@ -23,14 +23,14 @@ uword CodeBreakpoint::OrigStubAddress() const { |
void CodeBreakpoint::PatchCode() { |
ASSERT(!is_enabled_); |
StubCode* stub_code = Isolate::Current()->stub_code(); |
- uword stub_target = 0; |
+ Code& stub_target = Code::Handle(); |
switch (breakpoint_kind_) { |
case RawPcDescriptors::kIcCall: |
case RawPcDescriptors::kUnoptStaticCall: |
- stub_target = stub_code->ICCallBreakpointEntryPoint(); |
+ stub_target = stub_code->ICCallBreakpointCode(); |
break; |
case RawPcDescriptors::kRuntimeCall: |
- stub_target = stub_code->RuntimeCallBreakpointEntryPoint(); |
+ stub_target = stub_code->RuntimeCallBreakpointCode(); |
break; |
default: |
UNREACHABLE(); |
@@ -49,7 +49,8 @@ void CodeBreakpoint::RestoreCode() { |
case RawPcDescriptors::kIcCall: |
case RawPcDescriptors::kUnoptStaticCall: |
case RawPcDescriptors::kRuntimeCall: { |
- CodePatcher::PatchPoolPointerCallAt(pc_, code, saved_value_); |
+ CodePatcher::PatchPoolPointerCallAt( |
+ pc_, code, Code::Handle(saved_value_)); |
break; |
} |
default: |