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