Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1023)

Unified Diff: runtime/vm/debugger.cc

Issue 1192103004: VM: New calling convention for generated code. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: fixed comments Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/debugger.h ('k') | runtime/vm/debugger_arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/debugger.cc
diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc
index e0dd4a9b3993aace4e9f87df2164157db449a7db..ca49376e9b6c08a463fa377e83fa17817d6aea17 100644
--- a/runtime/vm/debugger.cc
+++ b/runtime/vm/debugger.cc
@@ -220,6 +220,7 @@ void Breakpoint::PrintJSON(JSONStream* stream) {
void CodeBreakpoint::VisitObjectPointers(ObjectPointerVisitor* visitor) {
visitor->VisitPointer(reinterpret_cast<RawObject**>(&code_));
+ visitor->VisitPointer(reinterpret_cast<RawObject**>(&saved_value_));
}
@@ -1113,7 +1114,7 @@ CodeBreakpoint::CodeBreakpoint(const Code& code,
bpt_location_(NULL),
next_(NULL),
breakpoint_kind_(kind),
- saved_value_(0) {
+ saved_value_(Code::null()) {
ASSERT(!code.IsNull());
ASSERT(token_pos_ > 0);
ASSERT(pc_ != 0);
@@ -1397,7 +1398,9 @@ RawArray* Debugger::DeoptimizeToArray(Isolate* isolate,
DeoptContext* deopt_context =
new DeoptContext(frame, code,
DeoptContext::kDestIsAllocated,
- NULL, NULL);
+ NULL,
+ NULL,
+ true);
isolate->set_deopt_context(deopt_context);
deopt_context->FillDestFrame();
@@ -3006,13 +3009,13 @@ CodeBreakpoint* Debugger::GetCodeBreakpoint(uword breakpoint_address) {
}
-uword Debugger::GetPatchedStubAddress(uword breakpoint_address) {
+RawCode* Debugger::GetPatchedStubAddress(uword breakpoint_address) {
CodeBreakpoint* bpt = GetCodeBreakpoint(breakpoint_address);
if (bpt != NULL) {
return bpt->OrigStubAddress();
}
UNREACHABLE();
- return 0L;
+ return Code::null();
}
« no previous file with comments | « runtime/vm/debugger.h ('k') | runtime/vm/debugger_arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698