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

Unified Diff: runtime/vm/debugger.cc

Issue 248173002: Disable an assertion until bug 18384 is fixed. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 8 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 | « no previous file | no next file » | 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 a62b78ec45c8a42c71df68844e49d570ce5112e3..537a65610b648cf1b9d6db1fff8b257678f825b4 100644
--- a/runtime/vm/debugger.cc
+++ b/runtime/vm/debugger.cc
@@ -1184,11 +1184,22 @@ void Debugger::SignalBpResolved(SourceBreakpoint* bpt) {
ActivationFrame* Debugger::CollectDartFrame(Isolate* isolate,
uword pc,
StackFrame* frame,
- const Code& code,
+ const Code& code_param,
const Array& deopt_frame,
intptr_t deopt_frame_offset,
ActivationFrame* callee_activation,
const Context& entry_ctx) {
+ // TODO(turnidge): Remove the workaround below once...
+ // https://code.google.com/p/dart/issues/detail?id=18384
+ // ...is fixed.
+ Code& code = Code::Handle(isolate);
+ code = code_param.raw();
+ if (!code.ContainsInstructionAt(pc)) {
+ code = Code::LookupCode(pc);
+ ASSERT(!code.IsNull());
+ ASSERT(code.ContainsInstructionAt(pc));
+ }
+
// We provide either a callee activation or an entry context. Not both.
ASSERT(((callee_activation != NULL) && entry_ctx.IsNull()) ||
((callee_activation == NULL) && !entry_ctx.IsNull()));
@@ -1203,7 +1214,7 @@ ActivationFrame* Debugger::CollectDartFrame(Isolate* isolate,
bool is_closure_call = false;
const PcDescriptors& pc_desc =
PcDescriptors::Handle(code.pc_descriptors());
- ASSERT(code.ContainsInstructionAt(pc));
+
for (int i = 0; i < pc_desc.Length(); i++) {
if (pc_desc.PC(i) == pc &&
pc_desc.DescriptorKind(i) == PcDescriptors::kClosureCall) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698