[vm] Cleanup Instruction::Effects(), prepare to cleanup Dependencies()

runtime/vm/intermediate_language.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/bootstrap.h"
 #include "vm/compiler.h"
 #include "vm/constant_propagator.h"
@@ skipping 410 matching lines @@
 
 bool BinaryIntegerOpInstr::AttributesEqual(Instruction* other) const {
   ASSERT(other->tag() == tag());
   BinaryIntegerOpInstr* other_op = other->AsBinaryIntegerOp();
   return (op_kind() == other_op->op_kind()) &&
          (can_overflow() == other_op->can_overflow()) &&
          (is_truncating() == other_op->is_truncating());
 }
 
 EffectSet LoadFieldInstr::Dependencies() const {
-  return immutable_ ? EffectSet::None() : EffectSet::All();
+  if (immutable_) {
+    return EffectSet::None();
+  } else {
+    UNREACHABLE();  // TODO(dartbug.com/30474): cleanup
+    return EffectSet::All();
+  }
 }
 
 bool LoadFieldInstr::AttributesEqual(Instruction* other) const {
   LoadFieldInstr* other_load = other->AsLoadField();
   ASSERT(other_load != NULL);
   if (field() != NULL) {
     return (other_load->field() != NULL) &&
            (field()->raw() == other_load->field()->raw());
   }
   return (other_load->field() == NULL) &&
          (offset_in_bytes() == other_load->offset_in_bytes());
 }
 
 Instruction* InitStaticFieldInstr::Canonicalize(FlowGraph* flow_graph) {
   const bool is_initialized =
       (field_.StaticValue() != Object::sentinel().raw()) &&
       (field_.StaticValue() != Object::transition_sentinel().raw());
   // When precompiling, the fact that a field is currently initialized does not
   // make it safe to omit code that checks if the field needs initialization
   // because the field will be reset so it starts uninitialized in the process
   // running the precompiled code. We must be prepared to reinitialize fields.
   return is_initialized && !FLAG_fields_may_be_reset ? NULL : this;
 }
 
 EffectSet LoadStaticFieldInstr::Dependencies() const {
-  return (StaticField().is_final() && !FLAG_fields_may_be_reset)
-             ? EffectSet::None()
-             : EffectSet::All();
+  if (StaticField().is_final() && !FLAG_fields_may_be_reset) {
+    return EffectSet::None();
+  } else {
+    UNREACHABLE();  // TODO(dartbug.com/30474): cleanup
+    return EffectSet::All();
+  }
 }
 
 bool LoadStaticFieldInstr::AttributesEqual(Instruction* other) const {
   LoadStaticFieldInstr* other_load = other->AsLoadStaticField();
   ASSERT(other_load != NULL);
   // Assert that the field is initialized.
   ASSERT(StaticField().StaticValue() != Object::sentinel().raw());
   ASSERT(StaticField().StaticValue() != Object::transition_sentinel().raw());
   return StaticField().raw() == other_load->StaticField().raw();
 }
@@ skipping 3560 matching lines @@
                      "native function '%s' (%" Pd " arguments) cannot be found",
                      native_name().ToCString(), function().NumParameters());
   }
   set_is_auto_scope(auto_setup_scope);
   set_native_c_function(native_function);
 }
 
 #undef __
 
 }  // namespace dart