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

Unified Diff: runtime/vm/deopt_instructions.cc

Issue 48833004: Modifies assertion for possibly null code pointer. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 2 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/code_generator.cc ('k') | runtime/vm/object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/deopt_instructions.cc
===================================================================
--- runtime/vm/deopt_instructions.cc (revision 29395)
+++ runtime/vm/deopt_instructions.cc (working copy)
@@ -1168,7 +1168,11 @@
// TODO(vegorov): verify after deoptimization targets as well.
#ifdef DEBUG
const Code& code = Code::Handle(function.unoptimized_code());
- ASSERT(Isolate::IsDeoptAfter(deopt_id) ||
+ // The inlined function's code pointer may be null if there is a GC during
+ // compilation.
+ // TODO(zra): See if we can avoid this check by ensuring that code is not
+ // removed during inlining.
+ ASSERT(code.IsNull() || Isolate::IsDeoptAfter(deopt_id) ||
(code.GetPcForDeoptId(deopt_id, PcDescriptors::kDeopt) != 0));
#endif
const intptr_t object_table_index = FindOrAddObjectInTable(function);
« no previous file with comments | « runtime/vm/code_generator.cc ('k') | runtime/vm/object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698