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

Side by Side Diff: src/runtime/runtime-debug.cc

Issue 1648263002: [debugger] correctly find function context. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: addressed comments Created 4 years, 10 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 | « src/debug/debug-scopes.cc ('k') | test/mjsunit/mjsunit.status » ('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 2014 the V8 project authors. All rights reserved. 1 // Copyright 2014 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/runtime/runtime-utils.h" 5 #include "src/runtime/runtime-utils.h"
6 6
7 #include "src/arguments.h" 7 #include "src/arguments.h"
8 #include "src/debug/debug.h" 8 #include "src/debug/debug.h"
9 #include "src/debug/debug-evaluate.h" 9 #include "src/debug/debug-evaluate.h"
10 #include "src/debug/debug-frames.h" 10 #include "src/debug/debug-frames.h"
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 for (; i < scope_info->StackLocalCount(); ++i) { 547 for (; i < scope_info->StackLocalCount(); ++i) {
548 // Use the value from the stack. 548 // Use the value from the stack.
549 if (scope_info->LocalIsSynthetic(i)) continue; 549 if (scope_info->LocalIsSynthetic(i)) continue;
550 locals->set(local * 2, scope_info->LocalName(i)); 550 locals->set(local * 2, scope_info->LocalName(i));
551 locals->set(local * 2 + 1, frame_inspector.GetExpression(i)); 551 locals->set(local * 2 + 1, frame_inspector.GetExpression(i));
552 local++; 552 local++;
553 } 553 }
554 if (local < local_count) { 554 if (local < local_count) {
555 // Get the context containing declarations. 555 // Get the context containing declarations.
556 Handle<Context> context( 556 Handle<Context> context(
557 Context::cast(frame_inspector.GetContext())->declaration_context()); 557 Context::cast(frame_inspector.GetContext())->closure_context());
558 for (; i < scope_info->LocalCount(); ++i) { 558 for (; i < scope_info->LocalCount(); ++i) {
559 if (scope_info->LocalIsSynthetic(i)) continue; 559 if (scope_info->LocalIsSynthetic(i)) continue;
560 Handle<String> name(scope_info->LocalName(i)); 560 Handle<String> name(scope_info->LocalName(i));
561 VariableMode mode; 561 VariableMode mode;
562 InitializationFlag init_flag; 562 InitializationFlag init_flag;
563 MaybeAssignedFlag maybe_assigned_flag; 563 MaybeAssignedFlag maybe_assigned_flag;
564 locals->set(local * 2, *name); 564 locals->set(local * 2, *name);
565 int context_slot_index = ScopeInfo::ContextSlotIndex( 565 int context_slot_index = ScopeInfo::ContextSlotIndex(
566 scope_info, name, &mode, &init_flag, &maybe_assigned_flag); 566 scope_info, name, &mode, &init_flag, &maybe_assigned_flag);
567 Object* value = context->get(context_slot_index); 567 Object* value = context->get(context_slot_index);
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1669 return Smi::FromInt(isolate->debug()->is_active()); 1669 return Smi::FromInt(isolate->debug()->is_active());
1670 } 1670 }
1671 1671
1672 1672
1673 RUNTIME_FUNCTION(Runtime_DebugBreakInOptimizedCode) { 1673 RUNTIME_FUNCTION(Runtime_DebugBreakInOptimizedCode) {
1674 UNIMPLEMENTED(); 1674 UNIMPLEMENTED();
1675 return NULL; 1675 return NULL;
1676 } 1676 }
1677 } // namespace internal 1677 } // namespace internal
1678 } // namespace v8 1678 } // namespace v8
OLDNEW
« no previous file with comments | « src/debug/debug-scopes.cc ('k') | test/mjsunit/mjsunit.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698