[Turbofan] Introduce OtherNumberConstant.

src/compiler/types.cc

 // Copyright 2014 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.
 
 #include <iomanip>
 
 #include "src/compiler/types.h"
 
 #include "src/handles-inl.h"
 #include "src/ostreams.h"
@@ skipping 44 matching lines @@
   DisallowHeapAllocation no_allocation;
   return lhs->Min() <= rhs->Min() && rhs->Max() <= lhs->Max();
 }
 
 bool Type::Contains(RangeType* lhs, ConstantType* rhs) {
   DisallowHeapAllocation no_allocation;
   return IsInteger(*rhs->Value()) && lhs->Min() <= rhs->Value()->Number() &&
          rhs->Value()->Number() <= lhs->Max();
 }
 
+bool Type::Contains(RangeType* lhs, NumberConstantType* rhs) {
+  DisallowHeapAllocation no_allocation;
+  return IsInteger(rhs->Value()) && lhs->Min() <= rhs->Value() &&

[mvstanton, 2016/09/28 14:47:44]

Actually don't do this - a numberconstant is NEVER part of a Range!

[mvstanton, 2016/10/04 11:55:55]

Done.

+         rhs->Value() <= lhs->Max();
+}
+
 bool Type::Contains(RangeType* range, i::Object* val) {
   DisallowHeapAllocation no_allocation;
   return IsInteger(val) && range->Min() <= val->Number() &&
          val->Number() <= range->Max();
 }
 
 // -----------------------------------------------------------------------------
 // Min and Max computation.
 
 double Type::Min() {
   DCHECK(this->Is(Number()));
   if (this->IsBitset()) return BitsetType::Min(this->AsBitset());
   if (this->IsUnion()) {
     double min = +V8_INFINITY;
     for (int i = 0, n = this->AsUnion()->Length(); i < n; ++i) {
       min = std::min(min, this->AsUnion()->Get(i)->Min());
     }
     return min;
   }
   if (this->IsRange()) return this->AsRange()->Min();
   if (this->IsConstant()) return this->AsConstant()->Value()->Number();
+  if (this->IsNumberConstant()) return this->AsNumberConstant()->Value();
   UNREACHABLE();
   return 0;
 }
 
 double Type::Max() {
   DCHECK(this->Is(Number()));
   if (this->IsBitset()) return BitsetType::Max(this->AsBitset());
   if (this->IsUnion()) {
     double max = -V8_INFINITY;
     for (int i = 0, n = this->AsUnion()->Length(); i < n; ++i) {
       max = std::max(max, this->AsUnion()->Get(i)->Max());
     }
     return max;
   }
   if (this->IsRange()) return this->AsRange()->Max();
   if (this->IsConstant()) return this->AsConstant()->Value()->Number();
+  if (this->IsNumberConstant()) return this->AsNumberConstant()->Value();
   UNREACHABLE();
   return 0;
 }
 
 // -----------------------------------------------------------------------------
 // Glb and lub computation.
 
 // The largest bitset subsumed by this type.
 Type::bitset BitsetType::Glb(Type* type) {
   DisallowHeapAllocation no_allocation;
@@ skipping 21 matching lines @@
     // Take the representation from the first element, which is always
     // a bitset.
     int bitset = type->AsUnion()->Get(0)->BitsetLub();
     for (int i = 0, n = type->AsUnion()->Length(); i < n; ++i) {
       // Other elements only contribute their semantic part.
       bitset |= type->AsUnion()->Get(i)->BitsetLub();
     }
     return bitset;
   }
   if (type->IsConstant()) return type->AsConstant()->Lub();
+  if (type->IsNumberConstant()) return type->AsNumberConstant()->Lub();
   if (type->IsRange()) return type->AsRange()->Lub();
   if (type->IsTuple()) return kOtherInternal;
   UNREACHABLE();
   return kNone;
 }
 
 Type::bitset BitsetType::Lub(i::Map* map) {
   DisallowHeapAllocation no_allocation;
   switch (map->instance_type()) {
     case STRING_TYPE:
@@ skipping 239 matching lines @@
 
 // -----------------------------------------------------------------------------
 // Predicates.
 
 bool Type::SimplyEquals(Type* that) {
   DisallowHeapAllocation no_allocation;
   if (this->IsConstant()) {
     return that->IsConstant() &&
            *this->AsConstant()->Value() == *that->AsConstant()->Value();
   }
+  if (this->IsNumberConstant()) {
+    return that->IsNumberConstant() &&
+           this->AsNumberConstant()->Value() ==
+               that->AsNumberConstant()->Value();
+  }
   if (this->IsTuple()) {
     if (!that->IsTuple()) return false;
     TupleType* this_tuple = this->AsTuple();
     TupleType* that_tuple = that->AsTuple();
     if (this_tuple->Arity() != that_tuple->Arity()) {
       return false;
     }
     for (int i = 0, n = this_tuple->Arity(); i < n; ++i) {
       if (!this_tuple->Element(i)->Equals(that_tuple->Element(i))) return false;
     }
@@ skipping 65 matching lines @@
     }
     return false;
   }
 
   if (this->IsBitset() && that->IsBitset()) return true;
 
   if (this->IsRange()) {
     if (that->IsConstant()) {
       return Contains(this->AsRange(), that->AsConstant());
     }
+    if (that->IsNumberConstant()) {
+      return Contains(this->AsRange(), that->AsNumberConstant());
+    }
     if (that->IsRange()) {
       return Overlap(this->AsRange(), that->AsRange());
     }
     if (that->IsBitset()) {
       bitset number_bits = BitsetType::NumberBits(that->AsBitset());
       if (number_bits == BitsetType::kNone) {
         return false;
       }
       double min = std::max(BitsetType::Min(number_bits), this->Min());
       double max = std::min(BitsetType::Max(number_bits), this->Max());
@@ skipping 172 matching lines @@
       RangeType::Limits lim = IntersectRangeAndBitset(lhs, rhs, zone);
 
       if (!lim.IsEmpty()) {
         *lims = RangeType::Limits::Union(lim, *lims);
       }
       return size;
     }
     if (rhs->IsConstant() && Contains(lhs->AsRange(), rhs->AsConstant())) {
       return AddToUnion(rhs, result, size, zone);
     }
+    if (rhs->IsNumberConstant() &&
+        Contains(lhs->AsRange(), rhs->AsNumberConstant())) {
+      return AddToUnion(rhs, result, size, zone);

[mvstanton, 2016/09/28 14:47:44]

leave this out, because a range cannot contain a numberconstant, intersection is
empty.

[mvstanton, 2016/10/04 11:55:55]

Done.

+    }
     if (rhs->IsRange()) {
       RangeType::Limits lim = RangeType::Limits::Intersect(
           RangeType::Limits(lhs->AsRange()), RangeType::Limits(rhs->AsRange()));
       if (!lim.IsEmpty()) {
         *lims = RangeType::Limits::Union(lim, *lims);
       }
     }
     return size;
   }
   if (rhs->IsRange()) {
@@ skipping 47 matching lines @@
 
   if (bitset_min < range_min) {
     range_min = bitset_min;
   }
   if (bitset_max > range_max) {
     range_max = bitset_max;
   }
   return RangeType::New(range_min, range_max, zone);
 }
 
+Type* Type::NewConstant(i::Handle<i::Object> value, Zone* zone) {
+  if (IsInteger(*value)) {
+    double v = value->IsSmi() ? Smi::cast(*value)->value()
+                              : HeapNumber::cast(*value)->value();
+    return Range(v, v, zone);
+  } else if (value->IsHeapNumber()) {
+    double v = HeapNumber::cast(*value)->value();
+    if (NumberConstantType::IsNumberConstant(v)) {
+      return NumberConstant(v, zone);
+    }
+  }
+  return Constant(value, zone);

[mvstanton, 2016/09/28 14:47:44]

drive by comment - shouldn't we canonicalize NaN and -0 constants? And the
bitsets for those should be correct.

[mvstanton, 2016/10/04 11:55:55]

Done.

+}

[mvstanton, 2016/09/28 14:47:44]

Also, a separate CL to land after would make sure you never try to create a
Constant(-0) or Constant(NaN), instead, there should be a bitset for those
created.

BTW, this factory method can take care of that for us.

+
 Type* Type::Union(Type* type1, Type* type2, Zone* zone) {
   // Fast case: bit sets.
   if (type1->IsBitset() && type2->IsBitset()) {
     return BitsetType::New(type1->AsBitset() | type2->AsBitset());
   }
 
   // Fast case: top or bottom types.
   if (type1->IsAny() || type2->IsNone()) return type1;
   if (type2->IsAny() || type1->IsNone()) return type2;
 
@@ skipping 70 matching lines @@
     if (unioned->Get(1)->IsRange()) {
       return RangeType::New(unioned->Get(1)->AsRange()->Min(),
                             unioned->Get(1)->AsRange()->Max(), zone);
     }
   }
   unioned->Shrink(size);
   SLOW_DCHECK(unioned->Wellformed());
   return union_type;
 }
 
-// -----------------------------------------------------------------------------
-// Iteration.
-
 int Type::NumConstants() {
   DisallowHeapAllocation no_allocation;
-  if (this->IsConstant()) {
+  if (this->IsConstant() || this->IsNumberConstant()) {
     return 1;
   } else if (this->IsUnion()) {
     int result = 0;
     for (int i = 0, n = this->AsUnion()->Length(); i < n; ++i) {
       if (this->AsUnion()->Get(i)->IsConstant()) ++result;
     }
     return result;
   } else {
     return 0;
   }
@@ skipping 48 matching lines @@
   DCHECK(bits == 0);
   os << ")";
 }
 
 void Type::PrintTo(std::ostream& os) {
   DisallowHeapAllocation no_allocation;
   if (this->IsBitset()) {
     BitsetType::Print(os, this->AsBitset());
   } else if (this->IsConstant()) {
     os << "Constant(" << Brief(*this->AsConstant()->Value()) << ")";
+  } else if (this->IsNumberConstant()) {
+    os << "NumberConstant(" << this->AsNumberConstant()->Value() << ")";
   } else if (this->IsRange()) {
     std::ostream::fmtflags saved_flags = os.setf(std::ios::fixed);
     std::streamsize saved_precision = os.precision(0);
     os << "Range(" << this->AsRange()->Min() << ", " << this->AsRange()->Max()
        << ")";
     os.flags(saved_flags);
     os.precision(saved_precision);
   } else if (this->IsUnion()) {
     os << "(";
     for (int i = 0, n = this->AsUnion()->Length(); i < n; ++i) {
@@ skipping 32 matching lines @@
   return i::SmiValuesAre31Bits() ? kSigned31 : kSigned32;
 }
 
 BitsetType::bitset BitsetType::UnsignedSmall() {
   return i::SmiValuesAre31Bits() ? kUnsigned30 : kUnsigned31;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8