Split BinaryOp into BinarySmiOp and BinaryMintOp.

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 971 matching lines @@
 RawAbstractType* CatchEntryComp::CompileType() const {
   return AbstractType::null();
 }
 
 
 RawAbstractType* CheckStackOverflowComp::CompileType() const {
   return AbstractType::null();
 }
 
 
-RawAbstractType* BinaryOpComp::CompileType() const {
+RawAbstractType* BinarySmiOpComp::CompileType() const {
   ObjectStore* object_store = Isolate::Current()->object_store();
-  if (operands_type() == kMintOperands) {
-    return object_store->mint_type();
-  }
-  if (op_kind() == Token::kSHL) {
-    return Type::IntInterface();
-  }
-  ASSERT(operands_type() == kSmiOperands);
-  return object_store->smi_type();
+  return (op_kind() == Token::kSHL)

[Vyacheslav Egorov (Google), 2012/08/22 11:15:23]

I would prefer if-statement when ?: does not fit on one line.

+      ? Type::IntInterface()
+      : object_store->smi_type();
 }
 
 
-intptr_t BinaryOpComp::ResultCid() const {
-  if (operands_type() == kMintOperands) {
-    return kMintCid;
-  }
-  ASSERT(operands_type() == kSmiOperands);
+intptr_t BinarySmiOpComp::ResultCid() const {
   return (op_kind() == Token::kSHL) ? kDynamicCid : kSmiCid;
 }
 
 
-RawAbstractType* DoubleBinaryOpComp::CompileType() const {
+RawAbstractType* BinaryMintOpComp::CompileType() const {
+  ObjectStore* object_store = Isolate::Current()->object_store();
+  return object_store->mint_type();
+}
+
+
+intptr_t BinaryMintOpComp::ResultCid() const {
+  return kMintCid;
+}
+
+
+RawAbstractType* BinaryDoubleOpComp::CompileType() const {
   return Type::DoubleInterface();
 }
 
 
-intptr_t DoubleBinaryOpComp::ResultCid() const {
+intptr_t BinaryDoubleOpComp::ResultCid() const {
   return kDoubleCid;
 }
 
 
 RawAbstractType* UnarySmiOpComp::CompileType() const {
   return Type::IntInterface();
 }
 
 
 RawAbstractType* NumberNegateComp::CompileType() const {
@@ skipping 494 matching lines @@
       fixed_parameter_count_(fixed_parameter_count) {
   for (intptr_t i = 0; i < definitions.length(); ++i) {
     values_.Add(UseDefinition(definitions[i]));
   }
 }
 
 
 #undef __
 
 }  // namespace dart