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

Unified Diff: runtime/vm/flow_graph_compiler_ia32.cc

Issue 836593002: Deletion barrier: Distinguish+verify field initialization in ia32 generated code. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 11 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/flow_graph_builder.cc ('k') | runtime/vm/flow_graph_optimizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler_ia32.cc
===================================================================
--- runtime/vm/flow_graph_compiler_ia32.cc (revision 42713)
+++ runtime/vm/flow_graph_compiler_ia32.cc (working copy)
@@ -1235,15 +1235,29 @@
intptr_t increment_start = assembler_->CodeSize();
#endif // DEBUG
__ IncrementSmiField(FieldAddress(EAX, Array::element_offset(0)), 1);
+#if defined(DEBUG)
// If the assertion below fails, update EdgeCounterIncrementSizeInBytes.
- DEBUG_ASSERT((assembler_->CodeSize() - increment_start) ==
- EdgeCounterIncrementSizeInBytes());
+ intptr_t expected = EdgeCounterIncrementSizeInBytes();
+ intptr_t actual = assembler_->CodeSize() - increment_start;
+ if (actual != expected) {
+ FATAL2("Edge counter increment length: %" Pd ", expected %" Pd "\n",
+ actual,
+ expected);
+ }
+#endif // DEBUG
}
int32_t FlowGraphCompiler::EdgeCounterIncrementSizeInBytes() {
// Used by CodePatcher; so must be constant across all code in an isolate.
- return VerifiedMemory::enabled() ? 50 : 4;
+ int32_t size = 4;
+#if defined(DEBUG)
+ size += 19; // VerifySmi
+#endif // DEBUG
+ if (VerifiedMemory::enabled()) {
+ size += 50;
+ }
+ return size;
}
« no previous file with comments | « runtime/vm/flow_graph_builder.cc ('k') | runtime/vm/flow_graph_optimizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698