Make Value not a subclass of Computation.

runtime/vm/intermediate_language.cc

 // Copyright (c) 2012, 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/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 26 matching lines @@
 
 bool Computation::Equals(Computation* other) const {
   if (computation_kind() != other->computation_kind()) return false;
   for (intptr_t i = 0; i < InputCount(); ++i) {
     if (!InputAt(i)->Equals(other->InputAt(i))) return false;
   }
   return AttributesEqual(other);
 }
 
 
-bool UseVal::AttributesEqual(Computation* other) const {
+bool UseVal::Equals(Value* other) const {
   return other->IsUse()
       && definition() == other->AsUse()->definition();
 }
 
 
-bool ConstantVal::AttributesEqual(Computation* other) const {
+bool ConstantVal::Equals(Value* other) const {
   return other->IsConstant()
       && value().raw() == other->AsConstant()->value().raw();
 }
 
 
 bool CheckClassComp::AttributesEqual(Computation* other) const {
   CheckClassComp* other_check = other->AsCheckClass();
   if (other_check == NULL) return false;
   if (ic_data()->NumberOfChecks() != other->ic_data()->NumberOfChecks()) {
     return false;
@@ skipping 22 matching lines @@
   AddToUseList();
 }
 
 
 // Returns true if the value represents a constant.
 bool UseVal::BindsToConstant() const {
   BindInstr* bind = definition()->AsBind();
   if (bind == NULL) {
     return false;
   }
-  return bind->computation()->AsConstant() != NULL;
+  return bind->computation()->AsMaterialize() != NULL;
 }
 
 
 // Returns true if the value represents constant null.
 bool UseVal::BindsToConstantNull() const {
   BindInstr* bind = definition()->AsBind();
   if (bind == NULL) {
     return false;
   }
-  ConstantVal* constant = bind->computation()->AsConstant();
+  MaterializeComp* constant = bind->computation()->AsMaterialize();
   if (constant != NULL) {
-    return constant->value().IsNull();
+    return constant->constant_val()->value().IsNull();
   }
   return false;
 }
 
 
 const Object& UseVal::BoundConstant() const {
   ASSERT(BindsToConstant());
   BindInstr* bind = definition()->AsBind();
   ASSERT(bind != NULL);
-  ConstantVal* constant = bind->computation()->AsConstant();
+  MaterializeComp* constant = bind->computation()->AsMaterialize();
   ASSERT(constant != NULL);
-  return constant->value();
+  return constant->constant_val()->value();
 }
 
 
 void UseVal::RemoveFromUseList() {
   ASSERT(definition_ != NULL);
   if (next_use_ != NULL) {
     next_use_->previous_use_ = previous_use_;
   }
   if (previous_use_ != NULL) {
     previous_use_->next_use_ = next_use_;
@@ skipping 583 matching lines @@
   definition()->SetPropagatedType(type);
   return type.raw();
 }
 
 
 intptr_t UseVal::ResultCid() const {
   return definition()->GetPropagatedCid();
 }
 
 
+
+RawAbstractType* MaterializeComp::CompileType() const {
+  return constant_val()->CompileType();
+}
+
+
+intptr_t MaterializeComp::ResultCid() const {
+  return constant_val()->ResultCid();
+}
+
+
 RawAbstractType* AssertAssignableComp::CompileType() const {
   const AbstractType& value_compile_type =
       AbstractType::Handle(value()->CompileType());
   if (!value_compile_type.IsNull() &&
       value_compile_type.IsMoreSpecificThan(dst_type(), NULL)) {
     return value_compile_type.raw();
   }
   return dst_type().raw();
 }
 
@@ skipping 612 matching lines @@
                                token_pos(),
                                try_index(),
                                function(),
                                ArgumentCount(),
                                argument_names(),
                                locs()->stack_bitmap());
   __ Bind(&done);
 }
 
 
-LocationSummary* UseVal::MakeLocationSummary() const {
-  return NULL;
-}
-
-
-void UseVal::EmitNativeCode(FlowGraphCompiler* compiler) {
-  UNIMPLEMENTED();
-}
-
-
 void AssertAssignableComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (!is_eliminated()) {
     compiler->GenerateAssertAssignable(deopt_id(),
                                        token_pos(),
                                        try_index(),
                                        dst_type(),
                                        dst_name(),
                                        locs()->stack_bitmap());
   }
   ASSERT(locs()->in(0).reg() == locs()->out().reg());
@@ skipping 129 matching lines @@
   // TODO(fschneider): Avoid special-casing for SSA mode here.
   if (compiler->is_ssa()) {
     ASSERT(locs()->in(0).IsRegister());
     __ PushRegister(locs()->in(0).reg());
   }
 }
 
 
 // Helper to either use the constant value of a definition or the definition.
 static Value* UseDefinition(Definition* defn) {
-  if (defn->IsBind() && defn->AsBind()->computation()->IsConstant()) {
-    return defn->AsBind()->computation()->AsConstant();
+  if (defn->IsBind() && defn->AsBind()->computation()->IsMaterialize()) {
+    return defn->AsBind()->computation()->AsMaterialize()->constant_val();
   } else {
     return new UseVal(defn);
   }
 }
 
 
 Environment::Environment(const GrowableArray<Definition*>& definitions,
                          intptr_t fixed_parameter_count)
     : values_(definitions.length()),
       locations_(NULL),
       fixed_parameter_count_(fixed_parameter_count) {
   for (intptr_t i = 0; i < definitions.length(); ++i) {
     values_.Add(UseDefinition(definitions[i]));
   }
 }
 
 
 #undef __
 
 }  // namespace dart