[turbofan] Unify number operation typing rules.

src/compiler/operation-typer.h

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_COMPILER_OPERATION_TYPER_H_
 #define V8_COMPILER_OPERATION_TYPER_H_
 
 #include "src/base/flags.h"
 #include "src/compiler/opcodes.h"
 
@@ skipping 14 matching lines @@
 
   // Typing Phi.
   Type* Merge(Type* left, Type* right);
 
   Type* ToPrimitive(Type* type);
 
   // Helpers for number operation typing.
   Type* ToNumber(Type* type);
   Type* WeakenRange(Type* current_range, Type* previous_range);
 
-  Type* NumberAdd(Type* lhs, Type* rhs);
-  Type* NumberSubtract(Type* lhs, Type* rhs);
-  Type* NumberMultiply(Type* lhs, Type* rhs);
-  Type* NumberDivide(Type* lhs, Type* rhs);
-  Type* NumberModulus(Type* lhs, Type* rhs);
+// Number unary operators.
+#define DECLARE_METHOD(Name) Type* Name(Type* type);
+  SIMPLIFIED_NUMBER_UNOP_LIST(DECLARE_METHOD)
+#undef DECLARE_METHOD
 
-  Type* NumberAbs(Type* type);
+// Number binary operators.
+#define DECLARE_METHOD(Name) Type* Name(Type* lhs, Type* rhs);
+  SIMPLIFIED_NUMBER_BINOP_LIST(DECLARE_METHOD)
+  SIMPLIFIED_SPECULATIVE_NUMBER_BINOP_LIST(DECLARE_METHOD)
+#undef DECLARE_METHOD
 
   enum ComparisonOutcomeFlags {
     kComparisonTrue = 1,
     kComparisonFalse = 2,
     kComparisonUndefined = 4
   };
 
-// Javascript binop typers.
-#define DECLARE_CASE(x) Type* Type##x(Type* lhs, Type* rhs);
-  JS_SIMPLE_BINOP_LIST(DECLARE_CASE)
-#undef DECLARE_CASE
-
-  Type* singleton_false() { return singleton_false_; }
-  Type* singleton_true() { return singleton_true_; }
-  Type* singleton_the_hole() { return singleton_the_hole_; }
+  Type* singleton_false() const { return singleton_false_; }
+  Type* singleton_true() const { return singleton_true_; }
+  Type* singleton_the_hole() const { return singleton_the_hole_; }
 
  private:
   typedef base::Flags<ComparisonOutcomeFlags> ComparisonOutcome;
 
   ComparisonOutcome Invert(ComparisonOutcome);
   Type* Invert(Type*);
   Type* FalsifyUndefined(ComparisonOutcome);
 
   Type* Rangify(Type*);
   Type* AddRanger(double lhs_min, double lhs_max, double rhs_min,
                   double rhs_max);
   Type* SubtractRanger(RangeType* lhs, RangeType* rhs);
   Type* MultiplyRanger(Type* lhs, Type* rhs);
 
-  Zone* zone() { return zone_; }
+  Zone* zone() const { return zone_; }
 
-  Zone* zone_;
+  Zone* const zone_;
   TypeCache const& cache_;
 
   Type* singleton_false_;
   Type* singleton_true_;
   Type* singleton_the_hole_;
+  Type* signed32ish_;
+  Type* unsigned32ish_;
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_OPERATION_TYPER_H_