// static
bool ZoneTypeConfig::is_bitset(Type* type) {
- return reinterpret_cast<uintptr_t>(type) & 1;
+ return reinterpret_cast<intptr_t>(type) & 1;
}
// static
-ZoneTypeConfig::Type::bitset ZoneTypeConfig::as_bitset(Type* type) {
+int ZoneTypeConfig::as_bitset(Type* type) {
DCHECK(is_bitset(type));
- return reinterpret_cast<Type::bitset>(type) ^ 1u;
+ return static_cast<int>(reinterpret_cast<intptr_t>(type) >> 1);
}
// static
-ZoneTypeConfig::Type* ZoneTypeConfig::from_bitset(Type::bitset bitset) {
- return reinterpret_cast<Type*>(bitset | 1u);
+ZoneTypeConfig::Type* ZoneTypeConfig::from_bitset(int bitset) {
+ return reinterpret_cast<Type*>((bitset << 1) | 1);
}
// static
-ZoneTypeConfig::Type* ZoneTypeConfig::from_bitset(
- Type::bitset bitset, Zone* Zone) {
+ZoneTypeConfig::Type* ZoneTypeConfig::from_bitset(int bitset, Zone* Zone) {
return from_bitset(bitset);
}
// static
-HeapTypeConfig::Type::bitset HeapTypeConfig::as_bitset(Type* type) {
- // TODO(rossberg): Breaks the Smi abstraction. Fix once there is a better way.
- return reinterpret_cast<Type::bitset>(type);
+int HeapTypeConfig::as_bitset(Type* type) {
+ return i::Smi::cast(type)->value();
}
// static
-HeapTypeConfig::Type* HeapTypeConfig::from_bitset(Type::bitset bitset) {
- // TODO(rossberg): Breaks the Smi abstraction. Fix once there is a better way.
- return reinterpret_cast<Type*>(bitset);
+HeapTypeConfig::Type* HeapTypeConfig::from_bitset(int bitset) {
+ return Type::cast(i::Smi::FromInt(bitset));
}
// static
i::Handle<HeapTypeConfig::Type> HeapTypeConfig::from_bitset(
- Type::bitset bitset, Isolate* isolate) {
+ int bitset, Isolate* isolate) {
return i::handle(from_bitset(bitset), isolate);
}
// The largest bitset subsumed by this type.
template<class Config>
-typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::Glb(TypeImpl* type) {
+int TypeImpl<Config>::BitsetType::Glb(TypeImpl* type) {
DisallowHeapAllocation no_allocation;
if (type->IsBitset()) {
return type->AsBitset();
// The smallest bitset subsuming this type.
template<class Config>
-typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::Lub(TypeImpl* type) {
+int TypeImpl<Config>::BitsetType::Lub(TypeImpl* type) {
DisallowHeapAllocation no_allocation;
if (type->IsBitset()) {
return type->AsBitset();
} else if (type->IsUnion()) {
UnionHandle unioned = handle(type->AsUnion());
- bitset result = kNone;
+ int bitset = kNone;
for (int i = 0; i < unioned->Length(); ++i) {
- result |= unioned->Get(i)->BitsetLub();
+ bitset |= unioned->Get(i)->BitsetLub();
}
- return result;
+ return bitset;
} else if (type->IsClass()) {
// Little hack to avoid the need for a region for handlification here...
return Config::is_class(type) ? Lub(*Config::as_class(type)) :
// The smallest bitset subsuming this type, ignoring explicit bounds.
template<class Config>
-typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::InherentLub(TypeImpl* type) {
+int TypeImpl<Config>::BitsetType::InherentLub(TypeImpl* type) {
DisallowHeapAllocation no_allocation;
if (type->IsBitset()) {
return type->AsBitset();
} else if (type->IsUnion()) {
UnionHandle unioned = handle(type->AsUnion());
- bitset result = kNone;
+ int bitset = kNone;
for (int i = 0; i < unioned->Length(); ++i) {
- result |= unioned->Get(i)->InherentBitsetLub();
+ bitset |= unioned->Get(i)->InherentBitsetLub();
}
- return result;
+ return bitset;
} else if (type->IsClass()) {
return Lub(*type->AsClass()->Map());
} else if (type->IsConstant()) {
template<class Config>
-typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::Lub(i::Object* value) {
+int TypeImpl<Config>::BitsetType::Lub(i::Object* value) {
DisallowHeapAllocation no_allocation;
if (value->IsNumber()) {
return Lub(value->Number()) & (value->IsSmi() ? kTaggedInt : kTaggedPtr);
template<class Config>
-typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::Lub(double value) {
+int TypeImpl<Config>::BitsetType::Lub(double value) {
DisallowHeapAllocation no_allocation;
if (i::IsMinusZero(value)) return kMinusZero;
if (std::isnan(value)) return kNaN;
template<class Config>
-typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::Lub(double min, double max) {
+int TypeImpl<Config>::BitsetType::Lub(double min, double max) {
DisallowHeapAllocation no_allocation;
DCHECK(dle(min, max));
if (deq(min, max)) return BitsetType::Lub(min); // Singleton range.
- bitset result = BitsetType::kNumber ^ SEMANTIC(BitsetType::kNaN);
- if (dle(0, min) || max < 0) result ^= SEMANTIC(BitsetType::kMinusZero);
- return result;
+ int bitset = BitsetType::kNumber ^ SEMANTIC(BitsetType::kNaN);
+ if (dle(0, min) || max < 0) bitset ^= SEMANTIC(BitsetType::kMinusZero);
+ return bitset;
// TODO(neis): Could refine this further by doing more checks on min/max.
}
template<class Config>
-typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::Lub(int32_t value) {
+int TypeImpl<Config>::BitsetType::Lub(int32_t value) {
if (value >= 0x40000000) {
return i::SmiValuesAre31Bits() ? kOtherUnsigned31 : kUnsignedSmall;
}
template<class Config>
-typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::Lub(uint32_t value) {
+int TypeImpl<Config>::BitsetType::Lub(uint32_t value) {
DisallowHeapAllocation no_allocation;
if (value >= 0x80000000u) return kOtherUnsigned32;
if (value >= 0x40000000u) {
template<class Config>
-typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::Lub(i::Map* map) {
+int TypeImpl<Config>::BitsetType::Lub(i::Map* map) {
DisallowHeapAllocation no_allocation;
switch (map->instance_type()) {
case STRING_TYPE:
template<class Config>
typename TypeImpl<Config>::TypeHandle TypeImpl<Config>::Rebound(
- bitset bitset_bound, Region* region) {
- TypeHandle bound = BitsetType::New(bitset_bound, region);
+ int bitset, Region* region) {
+ TypeHandle bound = BitsetType::New(bitset, region);
if (this->IsClass()) {
return ClassType::New(this->AsClass()->Map(), bound, region);
} else if (this->IsConstant()) {
template<class Config>
-typename TypeImpl<Config>::bitset TypeImpl<Config>::BoundBy(TypeImpl* that) {
+int TypeImpl<Config>::BoundBy(TypeImpl* that) {
DCHECK(!this->IsUnion());
if (that->IsUnion()) {
UnionType* unioned = that->AsUnion();
int length = unioned->Length();
- bitset result = BitsetType::kNone;
+ int bitset = BitsetType::kNone;
for (int i = 0; i < length; ++i) {
- result |= BoundBy(unioned->Get(i)->unhandle());
+ bitset |= BoundBy(unioned->Get(i)->unhandle());
}
- return result;
+ return bitset;
} else if (that->IsClass() && this->IsClass() &&
*this->AsClass()->Map() == *that->AsClass()->Map()) {
return that->BitsetLub();
template<class Config>
int TypeImpl<Config>::IndexInUnion(
- bitset bound, UnionHandle unioned, int current_size) {
+ int bound, UnionHandle unioned, int current_size) {
DCHECK(!this->IsUnion());
for (int i = 0; i < current_size; ++i) {
TypeHandle that = unioned->Get(i);
UnionHandle result, int size, TypeHandle type,
TypeHandle other, bool is_intersect, Region* region) {
if (type->IsUnion()) {
- UnionHandle unioned = Config::template cast<UnionType>(type);
+ UnionHandle unioned = handle(type->AsUnion());
for (int i = 0; i < unioned->Length(); ++i) {
TypeHandle type_i = unioned->Get(i);
DCHECK(i == 0 || !(type_i->IsBitset() || type_i->Is(unioned->Get(0))));
} else if (!type->IsBitset()) {
DCHECK(type->IsClass() || type->IsConstant() || type->IsRange() ||
type->IsContext() || type->IsArray() || type->IsFunction());
- bitset inherent_bound = type->InherentBitsetLub();
- bitset old_bound = type->BitsetLub();
- bitset other_bound = type->BoundBy(other->unhandle()) & inherent_bound;
- bitset new_bound =
+ int inherent_bound = type->InherentBitsetLub();
+ int old_bound = type->BitsetLub();
+ int other_bound = type->BoundBy(other->unhandle()) & inherent_bound;
+ int new_bound =
is_intersect ? (old_bound & other_bound) : (old_bound | other_bound);
if (new_bound != BitsetType::kNone) {
int i = type->IndexInUnion(new_bound, result, size);
} else if (result->Get(i)->IsBitset()) {
return size; // Already fully subsumed.
} else {
- bitset type_i_bound = result->Get(i)->BitsetLub();
+ int type_i_bound = result->Get(i)->BitsetLub();
new_bound |= type_i_bound;
if (new_bound == type_i_bound) return size;
}
if (!type2->IsBitset()) {
size += (type2->IsUnion() ? type2->AsUnion()->Length() : 1);
}
- bitset bits = type1->BitsetGlb() | type2->BitsetGlb();
- if (bits != BitsetType::kNone) ++size;
+ int bitset = type1->BitsetGlb() | type2->BitsetGlb();
+ if (bitset != BitsetType::kNone) ++size;
DCHECK(size >= 1);
UnionHandle unioned = UnionType::New(size, region);
size = 0;
- if (bits != BitsetType::kNone) {
- unioned->Set(size++, BitsetType::New(bits, region));
+ if (bitset != BitsetType::kNone) {
+ unioned->Set(size++, BitsetType::New(bitset, region));
}
size = ExtendUnion(unioned, size, type1, type2, false, region);
size = ExtendUnion(unioned, size, type2, type1, false, region);
if (!type2->IsBitset()) {
size += (type2->IsUnion() ? type2->AsUnion()->Length() : 1);
}
- bitset bits = type1->BitsetGlb() & type2->BitsetGlb();
- if (bits != BitsetType::kNone) ++size;
+ int bitset = type1->BitsetGlb() & type2->BitsetGlb();
+ if (bitset != BitsetType::kNone) ++size;
DCHECK(size >= 1);
UnionHandle unioned = UnionType::New(size, region);
size = 0;
- if (bits != BitsetType::kNone) {
- unioned->Set(size++, BitsetType::New(bits, region));
+ if (bitset != BitsetType::kNone) {
+ unioned->Set(size++, BitsetType::New(bitset, region));
}
size = ExtendUnion(unioned, size, type1, type2, true, region);
size = ExtendUnion(unioned, size, type2, type1, true, region);
DisallowHeapAllocation no_allocation;
++index_;
if (type_->IsUnion()) {
- UnionHandle unioned = Config::template cast<UnionType>(type_);
+ UnionHandle unioned = handle(type_->AsUnion());
for (; index_ < unioned->Length(); ++index_) {
if (matches(unioned->Get(index_))) return;
}
// Printing.
template<class Config>
-const char* TypeImpl<Config>::BitsetType::Name(bitset bits) {
- switch (bits) {
+const char* TypeImpl<Config>::BitsetType::Name(int bitset) {
+ switch (bitset) {
case REPRESENTATION(kAny): return "Any";
#define RETURN_NAMED_REPRESENTATION_TYPE(type, value) \
case REPRESENTATION(k##type): return #type;
template <class Config>
void TypeImpl<Config>::BitsetType::Print(OStream& os, // NOLINT
- bitset bits) {
+ int bitset) {
DisallowHeapAllocation no_allocation;
- const char* name = Name(bits);
+ const char* name = Name(bitset);
if (name != NULL) {
os << name;
return;
}
- static const bitset named_bitsets[] = {
+ static const int named_bitsets[] = {
#define BITSET_CONSTANT(type, value) REPRESENTATION(k##type),
REPRESENTATION_BITSET_TYPE_LIST(BITSET_CONSTANT)
#undef BITSET_CONSTANT
bool is_first = true;
os << "(";
- for (int i(arraysize(named_bitsets) - 1); bits != 0 && i >= 0; --i) {
- bitset subset = named_bitsets[i];
- if ((bits & subset) == subset) {
+ for (int i(arraysize(named_bitsets) - 1); bitset != 0 && i >= 0; --i) {
+ int subset = named_bitsets[i];
+ if ((bitset & subset) == subset) {
if (!is_first) os << " | ";
is_first = false;
os << Name(subset);
- bits -= subset;
+ bitset -= subset;
}
}
- DCHECK(bits == 0);
+ DCHECK(bitset == 0);
os << ")";
}
// IMPLEMENTATION
//
// Internally, all 'primitive' types, and their unions, are represented as
-// bitsets. Bit 0 is reserved for tagging. Class is a heap pointer to the
-// respective map. Only structured types require allocation.
+// bitsets. Class is a heap pointer to the respective map. Only Constant's, or
+// unions containing Class'es or Constant's, currently require allocation.
// Note that the bitset representation is closed under both Union and Intersect.
//
// There are two type representations, using different allocation:
// Values for bitset types
#define MASK_BITSET_TYPE_LIST(V) \
- V(Representation, 0xff800000u) \
- V(Semantic, 0x007ffffeu)
+ V(Representation, static_cast<int>(0xffc00000)) \
+ V(Semantic, static_cast<int>(0x003fffff))
#define REPRESENTATION(k) ((k) & BitsetType::kRepresentation)
#define SEMANTIC(k) ((k) & BitsetType::kSemantic)
#define REPRESENTATION_BITSET_TYPE_LIST(V) \
V(None, 0) \
- V(UntaggedInt1, 1 << 23 | kSemantic) \
- V(UntaggedInt8, 1 << 24 | kSemantic) \
- V(UntaggedInt16, 1 << 25 | kSemantic) \
- V(UntaggedInt32, 1 << 26 | kSemantic) \
- V(UntaggedFloat32, 1 << 27 | kSemantic) \
- V(UntaggedFloat64, 1 << 28 | kSemantic) \
- V(UntaggedPtr, 1 << 29 | kSemantic) \
- V(TaggedInt, 1 << 30 | kSemantic) \
- V(TaggedPtr, 1 << 31 | kSemantic) \
+ V(UntaggedInt1, 1 << 22 | kSemantic) \
+ V(UntaggedInt8, 1 << 23 | kSemantic) \
+ V(UntaggedInt16, 1 << 24 | kSemantic) \
+ V(UntaggedInt32, 1 << 25 | kSemantic) \
+ V(UntaggedFloat32, 1 << 26 | kSemantic) \
+ V(UntaggedFloat64, 1 << 27 | kSemantic) \
+ V(UntaggedPtr, 1 << 28 | kSemantic) \
+ V(TaggedInt, 1 << 29 | kSemantic) \
+ /* MSB has to be sign-extended */ \
+ V(TaggedPtr, static_cast<int>(~0u << 30) | kSemantic) \
\
V(UntaggedInt, kUntaggedInt1 | kUntaggedInt8 | \
kUntaggedInt16 | kUntaggedInt32) \
V(Tagged, kTaggedInt | kTaggedPtr)
#define SEMANTIC_BITSET_TYPE_LIST(V) \
- V(Null, 1 << 1 | REPRESENTATION(kTaggedPtr)) \
- V(Undefined, 1 << 2 | REPRESENTATION(kTaggedPtr)) \
- V(Boolean, 1 << 3 | REPRESENTATION(kTaggedPtr)) \
- V(UnsignedSmall, 1 << 4 | REPRESENTATION(kTagged | kUntaggedNumber)) \
- V(OtherSignedSmall, 1 << 5 | REPRESENTATION(kTagged | kUntaggedNumber)) \
- V(OtherUnsigned31, 1 << 6 | REPRESENTATION(kTagged | kUntaggedNumber)) \
- V(OtherUnsigned32, 1 << 7 | REPRESENTATION(kTagged | kUntaggedNumber)) \
- V(OtherSigned32, 1 << 8 | REPRESENTATION(kTagged | kUntaggedNumber)) \
- V(MinusZero, 1 << 9 | REPRESENTATION(kTagged | kUntaggedNumber)) \
- V(NaN, 1 << 10 | REPRESENTATION(kTagged | kUntaggedNumber)) \
- V(OtherNumber, 1 << 11 | REPRESENTATION(kTagged | kUntaggedNumber)) \
- V(Symbol, 1 << 12 | REPRESENTATION(kTaggedPtr)) \
- V(InternalizedString, 1 << 13 | REPRESENTATION(kTaggedPtr)) \
- V(OtherString, 1 << 14 | REPRESENTATION(kTaggedPtr)) \
- V(Undetectable, 1 << 15 | REPRESENTATION(kTaggedPtr)) \
- V(Array, 1 << 16 | REPRESENTATION(kTaggedPtr)) \
- V(Buffer, 1 << 17 | REPRESENTATION(kTaggedPtr)) \
- V(Function, 1 << 18 | REPRESENTATION(kTaggedPtr)) \
- V(RegExp, 1 << 19 | REPRESENTATION(kTaggedPtr)) \
- V(OtherObject, 1 << 20 | REPRESENTATION(kTaggedPtr)) \
- V(Proxy, 1 << 21 | REPRESENTATION(kTaggedPtr)) \
- V(Internal, 1 << 22 | REPRESENTATION(kTagged | kUntagged)) \
+ V(Null, 1 << 0 | REPRESENTATION(kTaggedPtr)) \
+ V(Undefined, 1 << 1 | REPRESENTATION(kTaggedPtr)) \
+ V(Boolean, 1 << 2 | REPRESENTATION(kTaggedPtr)) \
+ V(UnsignedSmall, 1 << 3 | REPRESENTATION(kTagged | kUntaggedNumber)) \
+ V(OtherSignedSmall, 1 << 4 | REPRESENTATION(kTagged | kUntaggedNumber)) \
+ V(OtherUnsigned31, 1 << 5 | REPRESENTATION(kTagged | kUntaggedNumber)) \
+ V(OtherUnsigned32, 1 << 6 | REPRESENTATION(kTagged | kUntaggedNumber)) \
+ V(OtherSigned32, 1 << 7 | REPRESENTATION(kTagged | kUntaggedNumber)) \
+ V(MinusZero, 1 << 8 | REPRESENTATION(kTagged | kUntaggedNumber)) \
+ V(NaN, 1 << 9 | REPRESENTATION(kTagged | kUntaggedNumber)) \
+ V(OtherNumber, 1 << 10 | REPRESENTATION(kTagged | kUntaggedNumber)) \
+ V(Symbol, 1 << 11 | REPRESENTATION(kTaggedPtr)) \
+ V(InternalizedString, 1 << 12 | REPRESENTATION(kTaggedPtr)) \
+ V(OtherString, 1 << 13 | REPRESENTATION(kTaggedPtr)) \
+ V(Undetectable, 1 << 14 | REPRESENTATION(kTaggedPtr)) \
+ V(Array, 1 << 15 | REPRESENTATION(kTaggedPtr)) \
+ V(Buffer, 1 << 16 | REPRESENTATION(kTaggedPtr)) \
+ V(Function, 1 << 17 | REPRESENTATION(kTaggedPtr)) \
+ V(RegExp, 1 << 18 | REPRESENTATION(kTaggedPtr)) \
+ V(OtherObject, 1 << 19 | REPRESENTATION(kTaggedPtr)) \
+ V(Proxy, 1 << 20 | REPRESENTATION(kTaggedPtr)) \
+ V(Internal, 1 << 21 | REPRESENTATION(kTagged | kUntagged)) \
\
V(SignedSmall, kUnsignedSmall | kOtherSignedSmall) \
V(Signed32, kSignedSmall | kOtherUnsigned31 | kOtherSigned32) \
V(Receiver, kObject | kProxy) \
V(NonNumber, kBoolean | kName | kNull | kReceiver | \
kUndefined | kInternal) \
- V(Any, 0xfffffffeu)
+ V(Any, -1)
#define BITSET_TYPE_LIST(V) \
MASK_BITSET_TYPE_LIST(V) \
// static bool is_bitset(Type*);
// static bool is_class(Type*);
// static bool is_struct(Type*, int tag);
-// static bitset as_bitset(Type*);
+// static int as_bitset(Type*);
// static i::Handle<i::Map> as_class(Type*);
// static Handle<Struct>::type as_struct(Type*);
-// static Type* from_bitset(bitset);
-// static Handle<Type>::type from_bitset(bitset, Region*);
+// static Type* from_bitset(int bitset);
+// static Handle<Type>::type from_bitset(int bitset, Region*);
// static Handle<Type>::type from_class(i::Handle<Map>, Region*);
// static Handle<Type>::type from_struct(Handle<Struct>::type, int tag);
// static Handle<Struct>::type struct_create(int tag, int length, Region*);
public:
// Auxiliary types.
- typedef uintptr_t bitset; // Internal
- class BitsetType; // Internal
- class StructuralType; // Internal
- class UnionType; // Internal
+ class BitsetType; // Internal
+ class StructuralType; // Internal
+ class UnionType; // Internal
class ClassType;
class ConstantType;
bool IsBitset() { return Config::is_bitset(this); }
bool IsUnion() { return Config::is_struct(this, StructuralType::kUnionTag); }
- bitset AsBitset() {
+ int AsBitset() {
DCHECK(this->IsBitset());
return static_cast<BitsetType*>(this)->Bitset();
}
// Auxiliary functions.
- bitset BitsetGlb() { return BitsetType::Glb(this); }
- bitset BitsetLub() { return BitsetType::Lub(this); }
- bitset InherentBitsetLub() { return BitsetType::InherentLub(this); }
+ int BitsetGlb() { return BitsetType::Glb(this); }
+ int BitsetLub() { return BitsetType::Lub(this); }
+ int InherentBitsetLub() { return BitsetType::InherentLub(this); }
bool SlowIs(TypeImpl* that);
- TypeHandle Rebound(bitset bound, Region* region);
- bitset BoundBy(TypeImpl* that);
- int IndexInUnion(bitset bound, UnionHandle unioned, int current_size);
+ TypeHandle Rebound(int bitset, Region* region);
+ int BoundBy(TypeImpl* that);
+ int IndexInUnion(int bound, UnionHandle unioned, int current_size);
static int ExtendUnion(
UnionHandle unioned, int current_size, TypeHandle t,
TypeHandle other, bool is_intersect, Region* region);
kUnusedEOL = 0
};
- bitset Bitset() { return Config::as_bitset(this); }
+ int Bitset() { return Config::as_bitset(this); }
- static TypeImpl* New(bitset bits) {
- return static_cast<BitsetType*>(Config::from_bitset(bits));
+ static TypeImpl* New(int bitset) {
+ return static_cast<BitsetType*>(Config::from_bitset(bitset));
}
- static TypeHandle New(bitset bits, Region* region) {
- return Config::from_bitset(bits, region);
+ static TypeHandle New(int bitset, Region* region) {
+ return Config::from_bitset(bitset, region);
}
- static bool IsInhabited(bitset bits) {
- return (bits & kRepresentation) && (bits & kSemantic);
+ static bool IsInhabited(int bitset) {
+ return (bitset & kRepresentation) && (bitset & kSemantic);
}
- static bool Is(bitset bits1, bitset bits2) {
- return (bits1 | bits2) == bits2;
+ static bool Is(int bitset1, int bitset2) {
+ return (bitset1 | bitset2) == bitset2;
}
- static bitset Glb(TypeImpl* type); // greatest lower bound that's a bitset
- static bitset Lub(TypeImpl* type); // least upper bound that's a bitset
- static bitset Lub(i::Object* value);
- static bitset Lub(double value);
- static bitset Lub(int32_t value);
- static bitset Lub(uint32_t value);
- static bitset Lub(i::Map* map);
- static bitset Lub(double min, double max);
- static bitset InherentLub(TypeImpl* type);
+ static int Glb(TypeImpl* type); // greatest lower bound that's a bitset
+ static int Lub(TypeImpl* type); // least upper bound that's a bitset
+ static int Lub(i::Object* value);
+ static int Lub(double value);
+ static int Lub(int32_t value);
+ static int Lub(uint32_t value);
+ static int Lub(i::Map* map);
+ static int Lub(double min, double max);
+ static int InherentLub(TypeImpl* type);
- static const char* Name(bitset);
- static void Print(OStream& os, bitset); // NOLINT
+ static const char* Name(int bitset);
+ static void Print(OStream& os, int bitset); // NOLINT
using TypeImpl::PrintTo;
};
static inline bool is_class(Type* type);
static inline bool is_struct(Type* type, int tag);
- static inline Type::bitset as_bitset(Type* type);
+ static inline int as_bitset(Type* type);
static inline i::Handle<i::Map> as_class(Type* type);
static inline Struct* as_struct(Type* type);
- static inline Type* from_bitset(Type::bitset);
- static inline Type* from_bitset(Type::bitset, Zone* zone);
+ static inline Type* from_bitset(int bitset);
+ static inline Type* from_bitset(int bitset, Zone* zone);
static inline Type* from_class(i::Handle<i::Map> map, Zone* zone);
static inline Type* from_struct(Struct* structured);
static inline bool is_class(Type* type);
static inline bool is_struct(Type* type, int tag);
- static inline Type::bitset as_bitset(Type* type);
+ static inline int as_bitset(Type* type);
static inline i::Handle<i::Map> as_class(Type* type);
static inline i::Handle<Struct> as_struct(Type* type);
- static inline Type* from_bitset(Type::bitset);
- static inline i::Handle<Type> from_bitset(Type::bitset, Isolate* isolate);
+ static inline Type* from_bitset(int bitset);
+ static inline i::Handle<Type> from_bitset(int bitset, Isolate* isolate);
static inline i::Handle<Type> from_class(
i::Handle<i::Map> map, Isolate* isolate);
static inline i::Handle<Type> from_struct(i::Handle<Struct> structure);
using namespace v8::internal;
// Testing auxiliaries (breaking the Type abstraction).
-typedef uintptr_t bitset;
-
struct ZoneRep {
typedef void* Struct;
static bool IsStruct(Type* t, int tag) {
return !IsBitset(t) && reinterpret_cast<intptr_t>(AsStruct(t)[0]) == tag;
}
- static bool IsBitset(Type* t) { return reinterpret_cast<bitset>(t) & 1; }
+ static bool IsBitset(Type* t) { return reinterpret_cast<intptr_t>(t) & 1; }
static bool IsUnion(Type* t) { return IsStruct(t, 6); }
static Struct* AsStruct(Type* t) {
return reinterpret_cast<Struct*>(t);
}
- static bitset AsBitset(Type* t) {
- return reinterpret_cast<bitset>(t) ^ 1u;
+ static int AsBitset(Type* t) {
+ return static_cast<int>(reinterpret_cast<intptr_t>(t) >> 1);
}
static Struct* AsUnion(Type* t) {
return AsStruct(t);
static bool IsUnion(Handle<HeapType> t) { return IsStruct(t, 6); }
static Struct* AsStruct(Handle<HeapType> t) { return FixedArray::cast(*t); }
- static bitset AsBitset(Handle<HeapType> t) {
- return reinterpret_cast<bitset>(*t);
- }
+ static int AsBitset(Handle<HeapType> t) { return Smi::cast(*t)->value(); }
static Struct* AsUnion(Handle<HeapType> t) { return AsStruct(t); }
static int Length(Struct* structured) { return structured->length() - 1; }
using HeapType::BitsetType::Glb;
using HeapType::BitsetType::Lub;
using HeapType::BitsetType::InherentLub;
- static bitset Glb(Handle<HeapType> type) { return Glb(*type); }
- static bitset Lub(Handle<HeapType> type) { return Lub(*type); }
- static bitset InherentLub(Handle<HeapType> type) {
- return InherentLub(*type);
- }
+ static int Glb(Handle<HeapType> type) { return Glb(*type); }
+ static int Lub(Handle<HeapType> type) { return Lub(*type); }
+ static int InherentLub(Handle<HeapType> type) { return InherentLub(*type); }
};
};
CHECK(type1->Is(type2));
CHECK(!type2->Is(type1));
if (Rep::IsBitset(type1) && Rep::IsBitset(type2)) {
- CHECK(Rep::AsBitset(type1) != Rep::AsBitset(type2));
+ CHECK_NE(Rep::AsBitset(type1), Rep::AsBitset(type2));
}
}
CHECK(!type1->Is(type2));
CHECK(!type2->Is(type1));
if (Rep::IsBitset(type1) && Rep::IsBitset(type2)) {
- CHECK(Rep::AsBitset(type1) != Rep::AsBitset(type2));
+ CHECK_NE(Rep::AsBitset(type1), Rep::AsBitset(type2));
}
}
CHECK(type1->Maybe(type2));
CHECK(type2->Maybe(type1));
if (Rep::IsBitset(type1) && Rep::IsBitset(type2)) {
- CHECK(0 !=
- (Rep::AsBitset(type1) & Rep::AsBitset(type2) & Rep::AsBitset(mask)));
+ CHECK_NE(0,
+ Rep::AsBitset(type1) & Rep::AsBitset(type2) & Rep::AsBitset(mask));
}
}
CHECK(!type1->Maybe(type2));
CHECK(!type2->Maybe(type1));
if (Rep::IsBitset(type1) && Rep::IsBitset(type2)) {
- CHECK(0 ==
- (Rep::AsBitset(type1) & Rep::AsBitset(type2) & Rep::AsBitset(mask)));
+ CHECK_EQ(0,
+ Rep::AsBitset(type1) & Rep::AsBitset(type2) & Rep::AsBitset(mask));
}
}
CHECK(this->IsBitset(T.None));
CHECK(this->IsBitset(T.Any));
- CHECK(0 == this->AsBitset(T.None));
- CHECK(0xfffffffeu == this->AsBitset(T.Any));
+ CHECK_EQ(0, this->AsBitset(T.None));
+ CHECK_EQ(-1, this->AsBitset(T.Any));
// Union(T1, T2) is bitset for bitsets T1,T2
for (TypeIterator it1 = T.types.begin(); it1 != T.types.end(); ++it1) {
TypeHandle type2 = *it2;
TypeHandle union12 = T.Union(type1, type2);
if (this->IsBitset(type1) && this->IsBitset(type2)) {
- CHECK(
- (this->AsBitset(type1) | this->AsBitset(type2)) ==
+ CHECK_EQ(
+ this->AsBitset(type1) | this->AsBitset(type2),
this->AsBitset(union12));
}
}
TypeHandle type2 = *it2;
TypeHandle intersect12 = T.Intersect(type1, type2);
if (this->IsBitset(type1) && this->IsBitset(type2)) {
- CHECK(
- (this->AsBitset(type1) & this->AsBitset(type2)) ==
+ CHECK_EQ(
+ this->AsBitset(type1) & this->AsBitset(type2),
this->AsBitset(intersect12));
}
}
projects / platform / upstream / v8.git / commitdiff