Version 1.1.0-dev.5.7

runtime/vm/intermediate_language_arm.cc

Index: runtime/vm/intermediate_language_arm.cc
===================================================================
--- runtime/vm/intermediate_language_arm.cc	(revision 31662)
+++ runtime/vm/intermediate_language_arm.cc	(working copy)
@@ -1319,8 +1319,6 @@
 
   Label* fail = (deopt != NULL) ? deopt : &fail_label;
 
-  const bool ok_is_fall_through = (deopt != NULL);
-
   if (!compiler->is_optimizing() || (field_cid == kIllegalCid)) {
     if (!compiler->is_optimizing() && (field_reg == kNoRegister)) {
       // Currently we can't have different location summaries for optimized
@@ -1505,12 +1503,10 @@
         }
       }
     }
-    if (!ok_is_fall_through) {
-      __ b(&ok);
-    }
 
     if (deopt == NULL) {
       ASSERT(!compiler->is_optimizing());
+      __ b(&ok);
       __ Bind(fail);
 
       __ ldr(IP, FieldAddress(field_reg, Field::guarded_cid_offset()));
@@ -1525,7 +1521,6 @@
   } else {
     ASSERT(compiler->is_optimizing());
     ASSERT(deopt != NULL);
-    ASSERT(ok_is_fall_through);
     // Field guard class has been initialized and is known.
     if (field_reg != kNoRegister) {
       __ LoadObject(field_reg, Field::ZoneHandle(field().raw()));