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

Unified Diff: runtime/vm/intermediate_language.h

Issue 10912120: Restoring assert that deopt_id() should be accessed only if the instruction can deoptimize. Print r… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 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/il_printer.cc ('k') | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language.h
===================================================================
--- runtime/vm/intermediate_language.h (revision 11927)
+++ runtime/vm/intermediate_language.h (working copy)
@@ -275,7 +275,10 @@
virtual Tag tag() const = 0;
- intptr_t deopt_id() const { return deopt_id_; }
+ intptr_t deopt_id() const {
+ ASSERT(CanDeoptimize());
+ return deopt_id_;
+ }
bool IsBlockEntry() { return (AsBlockEntry() != NULL); }
virtual BlockEntryInstr* AsBlockEntry() { return NULL; }
@@ -2866,7 +2869,9 @@
}
virtual intptr_t DeoptimizationTarget() const {
- return deopt_id();
+ // Direct access since this instuction cannot deoptimize, and the deopt-id
+ // was inherited from another instuction that could deoptimize.
+ return deopt_id_;
}
DECLARE_INSTRUCTION(UnboxedDoubleBinaryOp)
« no previous file with comments | « runtime/vm/il_printer.cc ('k') | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698