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

Unified Diff: runtime/vm/intermediate_language_arm64.cc

Issue 1125803002: Revert parts of r45502 and always generate guard field instructions. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 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 | « runtime/vm/intermediate_language_arm.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_arm64.cc
===================================================================
--- runtime/vm/intermediate_language_arm64.cc (revision 45502)
+++ runtime/vm/intermediate_language_arm64.cc (working copy)
@@ -1443,7 +1443,10 @@
const intptr_t field_cid = field().guarded_cid();
const intptr_t nullability = field().is_nullable() ? kNullCid : kIllegalCid;
- ASSERT(field_cid != kDynamicCid);
+ if (field_cid == kDynamicCid) {
+ ASSERT(!compiler->is_optimizing());
+ return; // Nothing to emit.
+ }
const bool emit_full_guard =
!compiler->is_optimizing() || (field_cid == kIllegalCid);
@@ -1591,7 +1594,10 @@
void GuardFieldLengthInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
- ASSERT(field().guarded_list_length() != Field::kNoFixedLength);
+ if (field().guarded_list_length() == Field::kNoFixedLength) {
+ ASSERT(!compiler->is_optimizing());
+ return; // Nothing to emit.
+ }
Label* deopt = compiler->is_optimizing() ?
compiler->AddDeoptStub(deopt_id(), ICData::kDeoptGuardField) : NULL;
« no previous file with comments | « runtime/vm/intermediate_language_arm.cc ('k') | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698