Index: test/cctest/test-types.cc |
diff --git a/test/cctest/test-types.cc b/test/cctest/test-types.cc |
index 86a8d4ee40dbf8bea93ffbcae139299d37205043..e9122b1c650e6e50b01552af32fbd9750655d7f9 100644 |
--- a/test/cctest/test-types.cc |
+++ b/test/cctest/test-types.cc |
@@ -97,12 +97,7 @@ class Types { |
: region_(region), rng_(isolate->random_number_generator()) { |
#define DECLARE_TYPE(name, value) \ |
name = Type::name(region); \ |
- if (SmiValuesAre31Bits() || \ |
- (!Type::name(region)->Equals(Type::OtherSigned32()) && \ |
- !Type::name(region)->Equals(Type::OtherUnsigned31()))) { \ |
- /* Hack: Avoid generating those empty bitset types. */ \ |
- types.push_back(name); \ |
- } |
+ types.push_back(name); |
PROPER_BITSET_TYPE_LIST(DECLARE_TYPE) |
#undef DECLARE_TYPE |
@@ -289,17 +284,11 @@ class Types { |
int j = rng_->NextInt(n); |
#define PICK_BITSET_TYPE(type, value) \ |
if (j-- == 0) { \ |
- if (!SmiValuesAre31Bits() && \ |
- (Type::type(region_)->Equals(Type::OtherSigned32()) || \ |
- Type::type(region_)->Equals(Type::OtherUnsigned31()))) { \ |
- /* Hack: Avoid generating those empty bitset types. */ \ |
- continue; \ |
- } \ |
TypeHandle tmp = Type::Intersect( \ |
result, Type::type(region_), region_); \ |
if (tmp->Is(Type::None()) && i != 0) { \ |
break; \ |
- } else { \ |
+ } { \ |
result = tmp; \ |
continue; \ |
} \ |
@@ -2190,13 +2179,6 @@ TEST(NowOf) { |
} |
-TEST(MinMax) { |
- CcTest::InitializeVM(); |
- ZoneTests().MinMax(); |
- HeapTests().MinMax(); |
-} |
- |
- |
TEST(BitsetGlb) { |
CcTest::InitializeVM(); |
ZoneTests().BitsetGlb(); |