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

Side by Side Diff: runtime/vm/debugger.cc

Issue 2176413003: DBC: Fix reading locals out of a deopt frame. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: . Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « runtime/vm/constants_dbc.h ('k') | runtime/vm/stack_frame.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/debugger.h" 5 #include "vm/debugger.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 8
9 #include "vm/code_generator.h" 9 #include "vm/code_generator.h"
10 #include "vm/code_patcher.h" 10 #include "vm/code_patcher.h"
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 RawObject* ActivationFrame::GetClosure() { 820 RawObject* ActivationFrame::GetClosure() {
821 ASSERT(function().IsClosureFunction()); 821 ASSERT(function().IsClosureFunction());
822 return GetParameter(0); 822 return GetParameter(0);
823 } 823 }
824 824
825 825
826 RawObject* ActivationFrame::GetStackVar(intptr_t slot_index) { 826 RawObject* ActivationFrame::GetStackVar(intptr_t slot_index) {
827 if (deopt_frame_.IsNull()) { 827 if (deopt_frame_.IsNull()) {
828 return GetVariableValue(LocalVarAddress(fp(), slot_index)); 828 return GetVariableValue(LocalVarAddress(fp(), slot_index));
829 } else { 829 } else {
830 return deopt_frame_.At(deopt_frame_offset_ + slot_index); 830 return deopt_frame_.At(LocalVarIndex(deopt_frame_offset_, slot_index));
831 } 831 }
832 } 832 }
833 833
834 834
835 void ActivationFrame::PrintContextMismatchError( 835 void ActivationFrame::PrintContextMismatchError(
836 intptr_t ctx_slot, 836 intptr_t ctx_slot,
837 intptr_t frame_ctx_level, 837 intptr_t frame_ctx_level,
838 intptr_t var_ctx_level) { 838 intptr_t var_ctx_level) {
839 OS::PrintErr("-------------------------\n" 839 OS::PrintErr("-------------------------\n"
840 "Encountered context mismatch\n" 840 "Encountered context mismatch\n"
(...skipping 2475 matching lines...) Expand 10 before | Expand all | Expand 10 after
3316 3316
3317 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) { 3317 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
3318 ASSERT(bpt->next() == NULL); 3318 ASSERT(bpt->next() == NULL);
3319 bpt->set_next(code_breakpoints_); 3319 bpt->set_next(code_breakpoints_);
3320 code_breakpoints_ = bpt; 3320 code_breakpoints_ = bpt;
3321 } 3321 }
3322 3322
3323 #endif // !PRODUCT 3323 #endif // !PRODUCT
3324 3324
3325 } // namespace dart 3325 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/constants_dbc.h ('k') | runtime/vm/stack_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698