Reviewers: rossberg,
Description:
Remove unnecesssary auxiliary definitions.
[email protected]
BUG=
Please review this at https://codereview.chromium.org/413983005/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+7, -51 lines):
M src/types.cc
M test/cctest/test-types.cc
Index: src/types.cc
diff --git a/src/types.cc b/src/types.cc
index
327eba0679bc9cb9efa5444a839ef02b8b8082e3..b2904c8d4482935d4bb4c887a145f4a0439aa581
100644
--- a/src/types.cc
+++ b/src/types.cc
@@ -261,8 +261,7 @@ bool TypeImpl<Config>::SlowIs(TypeImpl* that) {
}
if (this->IsBitset() && SEMANTIC(this->AsBitset()) == BitsetType::kNone)
{
// Bitsets only have non-bitset supertypes along the representation
axis.
- int that_bitset = that->BitsetGlb();
- return (BitsetType::Is(this->AsBitset(), that_bitset));
+ return BitsetType::Is(this->AsBitset(), that->BitsetGlb());
}
if (that->IsClass()) {
Index: test/cctest/test-types.cc
diff --git a/test/cctest/test-types.cc b/test/cctest/test-types.cc
index
4c27addcb4d85f3246f8c25945fc343441e590db..c257bbea3f3d2005f6b659f6f0d9dcd74aa6b952
100644
--- a/test/cctest/test-types.cc
+++ b/test/cctest/test-types.cc
@@ -19,12 +19,6 @@ struct ZoneRep {
return !IsBitset(t) && reinterpret_cast<intptr_t>(AsStruct(t)[0]) ==
tag;
}
static bool IsBitset(Type* t) { return reinterpret_cast<intptr_t>(t) &
1; }
- static bool IsClass(Type* t) { return IsStruct(t, 0); }
- static bool IsConstant(Type* t) { return IsStruct(t, 1); }
- static bool IsRange(Type* t) { return IsStruct(t, 2); }
- static bool IsContext(Type* t) { return IsStruct(t, 3); }
- static bool IsArray(Type* t) { return IsStruct(t, 4); }
- static bool IsFunction(Type* t) { return IsStruct(t, 5); }
static bool IsUnion(Type* t) { return IsStruct(t, 6); }
static Struct* AsStruct(Type* t) {
@@ -33,15 +27,6 @@ struct ZoneRep {
static int AsBitset(Type* t) {
return static_cast<int>(reinterpret_cast<intptr_t>(t) >> 1);
}
- static Map* AsClass(Type* t) {
- return *static_cast<Map**>(AsStruct(t)[3]);
- }
- static Object* AsConstant(Type* t) {
- return *static_cast<Object**>(AsStruct(t)[3]);
- }
- static Type* AsContext(Type* t) {
- return *static_cast<Type**>(AsStruct(t)[2]);
- }
static Struct* AsUnion(Type* t) {
return AsStruct(t);
}
@@ -67,25 +52,10 @@ struct HeapRep {
return t->IsFixedArray() && Smi::cast(AsStruct(t)->get(0))->value() ==
tag;
}
static bool IsBitset(Handle<HeapType> t) { return t->IsSmi(); }
- static bool IsClass(Handle<HeapType> t) {
- return t->IsMap() || IsStruct(t, 0);
- }
- static bool IsConstant(Handle<HeapType> t) { return IsStruct(t, 1); }
- static bool IsRange(Handle<HeapType> t) { return IsStruct(t, 2); }
- static bool IsContext(Handle<HeapType> t) { return IsStruct(t, 3); }
- static bool IsArray(Handle<HeapType> t) { return IsStruct(t, 4); }
- static bool IsFunction(Handle<HeapType> t) { return IsStruct(t, 5); }
static bool IsUnion(Handle<HeapType> t) { return IsStruct(t, 6); }
static Struct* AsStruct(Handle<HeapType> t) { return
FixedArray::cast(*t); }
static int AsBitset(Handle<HeapType> t) { return Smi::cast(*t)->value();
}
- static Map* AsClass(Handle<HeapType> t) {
- return t->IsMap() ? Map::cast(*t) : Map::cast(AsStruct(t)->get(2));
- }
- static Object* AsConstant(Handle<HeapType> t) { return
AsStruct(t)->get(2); }
- static HeapType* AsContext(Handle<HeapType> t) {
- return HeapType::cast(AsStruct(t)->get(1));
- }
static Struct* AsUnion(Handle<HeapType> t) { return AsStruct(t); }
static int Length(Struct* structured) { return structured->length() - 1;
}
@@ -361,27 +331,14 @@ struct Tests : Rep {
bool Equal(TypeHandle type1, TypeHandle type2) {
return
- type1->Is(type2) && type2->Is(type1) &&
+ type1->Equals(type2) &&
Rep::IsBitset(type1) == Rep::IsBitset(type2) &&
- Rep::IsClass(type1) == Rep::IsClass(type2) &&
- Rep::IsConstant(type1) == Rep::IsConstant(type2) &&
- Rep::IsRange(type1) == Rep::IsRange(type2) &&
- Rep::IsContext(type1) == Rep::IsContext(type2) &&
- Rep::IsArray(type1) == Rep::IsArray(type2) &&
- Rep::IsFunction(type1) == Rep::IsFunction(type2) &&
Rep::IsUnion(type1) == Rep::IsUnion(type2) &&
type1->NumClasses() == type2->NumClasses() &&
type1->NumConstants() == type2->NumConstants() &&
(!Rep::IsBitset(type1) ||
Rep::AsBitset(type1) == Rep::AsBitset(type2)) &&
- (!Rep::IsClass(type1) ||
- Rep::AsClass(type1) == Rep::AsClass(type2)) &&
- (!Rep::IsConstant(type1) ||
- Rep::AsConstant(type1) == Rep::AsConstant(type2)) &&
- (!Rep::IsRange(type1) ||
- (type1->AsRange()->Min() == type2->AsRange()->Min() &&
- type1->AsRange()->Max() == type2->AsRange()->Max())) &&
- // TODO(rossberg): Check details of arrays, functions, bounds.
+ // TODO(rossberg): Check details of arrays, functions, bounds.
(!Rep::IsUnion(type1) ||
Rep::Length(Rep::AsUnion(type1)) ==
Rep::Length(Rep::AsUnion(type2)));
}
@@ -501,7 +458,7 @@ struct Tests : Rep {
for (MapIterator mt = T.maps.begin(); mt != T.maps.end(); ++mt) {
Handle<i::Map> map = *mt;
TypeHandle type = T.Class(map);
- CHECK(this->IsClass(type));
+ CHECK(type->IsClass());
}
// Map attribute
@@ -528,7 +485,7 @@ struct Tests : Rep {
for (ValueIterator vt = T.values.begin(); vt != T.values.end(); ++vt) {
Handle<i::Object> value = *vt;
TypeHandle type = T.Constant(value);
- CHECK(this->IsConstant(type));
+ CHECK(type->IsConstant());
}
// Value attribute
@@ -596,7 +553,7 @@ struct Tests : Rep {
double min = std::min(*i, *j);
double max = std::max(*i, *j);
TypeHandle type = T.Range(min, max);
- CHECK(this->IsRange(type));
+ CHECK(type->IsRange());
}
}
@@ -641,7 +598,7 @@ struct Tests : Rep {
for (int i = 0; i < 20; ++i) {
TypeHandle type = T.Random();
TypeHandle array = T.Array1(type);
- CHECK(this->IsArray(array));
+ CHECK(array->IsArray());
}
// Attributes
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
