Index: runtime/vm/intermediate_language_x64.cc |
=================================================================== |
--- runtime/vm/intermediate_language_x64.cc (revision 31471) |
+++ runtime/vm/intermediate_language_x64.cc (working copy) |
@@ -1210,8 +1210,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 |
@@ -1409,12 +1407,10 @@ |
} |
} |
} |
- if (!ok_is_fall_through) { |
- __ jmp(&ok); |
- } |
if (deopt == NULL) { |
ASSERT(!compiler->is_optimizing()); |
+ __ jmp(&ok); |
__ Bind(fail); |
__ CompareImmediate(FieldAddress(field_reg, Field::guarded_cid_offset()), |
@@ -1429,7 +1425,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()), PP); |