Skip to content

V
V8
Commit f55fc759 authored by danno@chromium.org's avatar danno@chromium.org
Browse files
Options

Revert 17167: "Ensure lower <= upper bound" 

Due to crashes in nosnap ia32

TBR=rossberg@chromium.org

Review URL: https://codereview.chromium.org/27046002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17170 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 4d67b70e
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 69 deletions
src/types.cc
View file @ f55fc759
...@@ -240,7 +240,6 @@ int Type::GlbBitset() { ...@@ -240,7 +240,6 @@ int Type::GlbBitset() {
// Check this <= that. // Check this <= that.
bool Type::SlowIs(Type* that) { bool Type::SlowIs(Type* that) {
// Fast path for bitsets. // Fast path for bitsets.
if (this->is_none()) return true;
if (that->is_bitset()) { if (that->is_bitset()) {
return (this->LubBitset() | that->as_bitset()) == that->as_bitset(); return (this->LubBitset() | that->as_bitset()) == that->as_bitset();
} }
...@@ -527,13 +526,9 @@ void Type::TypePrint(FILE* out) { ...@@ -527,13 +526,9 @@ void Type::TypePrint(FILE* out) {
} }
PrintF(out, "}"); PrintF(out, "}");
} else if (is_constant()) { } else if (is_constant()) {
PrintF(out, "Constant(%p : ", static_cast<void*>(*as_constant())); PrintF(out, "Constant(%p)", static_cast<void*>(*as_constant()));
from_bitset(LubBitset())->TypePrint(out);
PrintF(")");
} else if (is_class()) { } else if (is_class()) {
PrintF(out, "Class(%p < ", static_cast<void*>(*as_class())); PrintF(out, "Class(%p)", static_cast<void*>(*as_class()));
from_bitset(LubBitset())->TypePrint(out);
PrintF(")");
} else if (is_union()) { } else if (is_union()) {
PrintF(out, "{"); PrintF(out, "{");
Handle<Unioned> unioned = as_union(); Handle<Unioned> unioned = as_union();
......
src/types.h
View file @ f55fc759
...@@ -226,7 +226,6 @@ class Type : public Object { ...@@ -226,7 +226,6 @@ class Type : public Object {
kUnusedEOL = 0 kUnusedEOL = 0
}; };
bool is_none() { return this == None(); }
bool is_bitset() { return this->IsSmi(); } bool is_bitset() { return this->IsSmi(); }
bool is_class() { return this->IsMap(); } bool is_class() { return this->IsMap(); }
bool is_constant() { return this->IsBox(); } bool is_constant() { return this->IsBox(); }
...@@ -300,18 +299,10 @@ struct Bounds { ...@@ -300,18 +299,10 @@ struct Bounds {
Handle<Type> upper; Handle<Type> upper;
Bounds() {} Bounds() {}
Bounds(Handle<Type> l, Handle<Type> u) : lower(l), upper(u) { Bounds(Handle<Type> l, Handle<Type> u) : lower(l), upper(u) {}
ASSERT(lower->Is(upper)); Bounds(Type* l, Type* u, Isolate* isl) : lower(l, isl), upper(u, isl) {}
} explicit Bounds(Handle<Type> t) : lower(t), upper(t) {}
Bounds(Type* l, Type* u, Isolate* isl) : lower(l, isl), upper(u, isl) { Bounds(Type* t, Isolate* isl) : lower(t, isl), upper(t, isl) {}
ASSERT(lower->Is(upper));
}
explicit Bounds(Handle<Type> t) : lower(t), upper(t) {
ASSERT(lower->Is(upper));
}
Bounds(Type* t, Isolate* isl) : lower(t, isl), upper(t, isl) {
ASSERT(lower->Is(upper));
}
// Unrestricted bounds. // Unrestricted bounds.
static Bounds Unbounded(Isolate* isl) { static Bounds Unbounded(Isolate* isl) {
...@@ -320,11 +311,9 @@ struct Bounds { ...@@ -320,11 +311,9 @@ struct Bounds {
// Meet: both b1 and b2 are known to hold. // Meet: both b1 and b2 are known to hold.
static Bounds Both(Bounds b1, Bounds b2, Isolate* isl) { static Bounds Both(Bounds b1, Bounds b2, Isolate* isl) {
Handle<Type> lower(Type::Union(b1.lower, b2.lower), isl); return Bounds(
Handle<Type> upper(Type::Intersect(b1.upper, b2.upper), isl); handle(Type::Union(b1.lower, b2.lower), isl),
// Lower bounds are considered approximate, correct as necessary. handle(Type::Intersect(b1.upper, b2.upper), isl));
lower = handle(Type::Intersect(lower, upper), isl);
return Bounds(lower, upper);
} }
// Join: either b1 or b2 is known to hold. // Join: either b1 or b2 is known to hold.
...@@ -335,14 +324,10 @@ struct Bounds { ...@@ -335,14 +324,10 @@ struct Bounds {
} }
static Bounds NarrowLower(Bounds b, Handle<Type> t, Isolate* isl) { static Bounds NarrowLower(Bounds b, Handle<Type> t, Isolate* isl) {
// Lower bounds are considered approximate, correct as necessary.
t = handle(Type::Intersect(t, b.upper), isl);
return Bounds(handle(Type::Union(b.lower, t), isl), b.upper); return Bounds(handle(Type::Union(b.lower, t), isl), b.upper);
} }
static Bounds NarrowUpper(Bounds b, Handle<Type> t, Isolate* isl) { static Bounds NarrowUpper(Bounds b, Handle<Type> t, Isolate* isl) {
return Bounds( return Bounds(b.lower, handle(Type::Intersect(b.upper, t), isl));
handle(Type::Intersect(b.lower, t), isl),
handle(Type::Intersect(b.upper, t), isl));
} }
}; };
......
src/typing.cc
View file @ f55fc759
...@@ -247,8 +247,8 @@ void AstTyper::VisitForStatement(ForStatement* stmt) { ...@@ -247,8 +247,8 @@ void AstTyper::VisitForStatement(ForStatement* stmt) {
RECURSE(Visit(stmt->cond())); RECURSE(Visit(stmt->cond()));
} }
RECURSE(Visit(stmt->body())); RECURSE(Visit(stmt->body()));
store_.Forget(); // Control may transfer here via 'continue'.
if (stmt->next() != NULL) { if (stmt->next() != NULL) {
store_.Forget(); // Control may transfer here via 'continue'.
RECURSE(Visit(stmt->next())); RECURSE(Visit(stmt->next()));
} }
store_.Forget(); // Control may transfer here via termination or 'break'. store_.Forget(); // Control may transfer here via termination or 'break'.
...@@ -580,9 +580,7 @@ void AstTyper::VisitBinaryOperation(BinaryOperation* expr) { ...@@ -580,9 +580,7 @@ void AstTyper::VisitBinaryOperation(BinaryOperation* expr) {
Type* upper = Type::Union( Type* upper = Type::Union(
expr->left()->bounds().upper, expr->right()->bounds().upper); expr->left()->bounds().upper, expr->right()->bounds().upper);
if (!upper->Is(Type::Signed32())) upper = Type::Signed32(); if (!upper->Is(Type::Signed32())) upper = Type::Signed32();
Type* lower = Type::Intersect( NarrowType(expr, Bounds(Type::Smi(), upper, isolate_));
handle(Type::Smi(), isolate_), handle(upper, isolate_));
NarrowType(expr, Bounds(lower, upper, isolate_));
break; break;
} }
case Token::BIT_XOR: case Token::BIT_XOR:
...@@ -595,8 +593,7 @@ void AstTyper::VisitBinaryOperation(BinaryOperation* expr) { ...@@ -595,8 +593,7 @@ void AstTyper::VisitBinaryOperation(BinaryOperation* expr) {
case Token::SHR: case Token::SHR:
RECURSE(Visit(expr->left())); RECURSE(Visit(expr->left()));
RECURSE(Visit(expr->right())); RECURSE(Visit(expr->right()));
// TODO(rossberg): we could use an UnsignedSmi as lower bound here... NarrowType(expr, Bounds(Type::Smi(), Type::Unsigned32(), isolate_));
NarrowType(expr, Bounds(Type::Unsigned32(), isolate_));
break; break;
case Token::ADD: { case Token::ADD: {
RECURSE(Visit(expr->left())); RECURSE(Visit(expr->left()));
...@@ -604,17 +601,15 @@ void AstTyper::VisitBinaryOperation(BinaryOperation* expr) { ...@@ -604,17 +601,15 @@ void AstTyper::VisitBinaryOperation(BinaryOperation* expr) {
Bounds l = expr->left()->bounds(); Bounds l = expr->left()->bounds();
Bounds r = expr->right()->bounds(); Bounds r = expr->right()->bounds();
Type* lower = Type* lower =
l.lower->Is(Type::None()) || r.lower->Is(Type::None()) ?
Type::None() :
l.lower->Is(Type::String()) || r.lower->Is(Type::String()) ?
Type::String() :
l.lower->Is(Type::Number()) && r.lower->Is(Type::Number()) ? l.lower->Is(Type::Number()) && r.lower->Is(Type::Number()) ?
Type::Smi() : Type::None(); Type::Smi() :
l.lower->Is(Type::String()) || r.lower->Is(Type::String()) ?
Type::String() : Type::None();
Type* upper = Type* upper =
l.upper->Is(Type::String()) || r.upper->Is(Type::String()) ?
Type::String() :
l.upper->Is(Type::Number()) && r.upper->Is(Type::Number()) ? l.upper->Is(Type::Number()) && r.upper->Is(Type::Number()) ?
Type::Number() : Type::NumberOrString(); Type::Number() :
l.upper->Is(Type::String()) || r.upper->Is(Type::String()) ?
Type::String() : Type::NumberOrString();
NarrowType(expr, Bounds(lower, upper, isolate_)); NarrowType(expr, Bounds(lower, upper, isolate_));
break; break;
} }
......
test/cctest/test-types.cc
View file @ f55fc759
...@@ -318,11 +318,6 @@ TEST(Is) { ...@@ -318,11 +318,6 @@ TEST(Is) {
CheckUnordered(T.Array, T.Function); CheckUnordered(T.Array, T.Function);
// Structured subtyping // Structured subtyping
CheckSub(T.None, T.ObjectClass);
CheckSub(T.None, T.ObjectConstant1);
CheckSub(T.ObjectClass, T.Any);
CheckSub(T.ObjectConstant1, T.Any);
CheckSub(T.ObjectClass, T.Object); CheckSub(T.ObjectClass, T.Object);
CheckSub(T.ArrayClass, T.Object); CheckSub(T.ArrayClass, T.Object);
CheckUnordered(T.ObjectClass, T.ArrayClass); CheckUnordered(T.ObjectClass, T.ArrayClass);
...@@ -389,9 +384,6 @@ TEST(Maybe) { ...@@ -389,9 +384,6 @@ TEST(Maybe) {
CheckDisjoint(T.Object, T.Proxy); CheckDisjoint(T.Object, T.Proxy);
CheckDisjoint(T.Array, T.Function); CheckDisjoint(T.Array, T.Function);
CheckOverlap(T.ObjectClass, T.Any);
CheckOverlap(T.ObjectConstant1, T.Any);
CheckOverlap(T.ObjectClass, T.Object); CheckOverlap(T.ObjectClass, T.Object);
CheckOverlap(T.ArrayClass, T.Object); CheckOverlap(T.ArrayClass, T.Object);
CheckOverlap(T.ObjectClass, T.ObjectClass); CheckOverlap(T.ObjectClass, T.ObjectClass);
...@@ -440,8 +432,6 @@ TEST(Union) { ...@@ -440,8 +432,6 @@ TEST(Union) {
CHECK(IsUnion(Type::Union(T.ObjectClass, T.ArrayClass))); CHECK(IsUnion(Type::Union(T.ObjectClass, T.ArrayClass)));
CheckEqual(T.Union(T.ObjectClass, T.ObjectClass), T.ObjectClass); CheckEqual(T.Union(T.ObjectClass, T.ObjectClass), T.ObjectClass);
CheckSub(T.None, T.Union(T.ObjectClass, T.ArrayClass));
CheckSub(T.Union(T.ObjectClass, T.ArrayClass), T.Any);
CheckSub(T.ObjectClass, T.Union(T.ObjectClass, T.ArrayClass)); CheckSub(T.ObjectClass, T.Union(T.ObjectClass, T.ArrayClass));
CheckSub(T.ArrayClass, T.Union(T.ObjectClass, T.ArrayClass)); CheckSub(T.ArrayClass, T.Union(T.ObjectClass, T.ArrayClass));
CheckSub(T.Union(T.ObjectClass, T.ArrayClass), T.Object); CheckSub(T.Union(T.ObjectClass, T.ArrayClass), T.Object);
...@@ -457,8 +447,6 @@ TEST(Union) { ...@@ -457,8 +447,6 @@ TEST(Union) {
CheckEqual(T.Union(T.ObjectConstant1, T.ObjectConstant1), T.ObjectConstant1); CheckEqual(T.Union(T.ObjectConstant1, T.ObjectConstant1), T.ObjectConstant1);
CheckEqual(T.Union(T.ArrayConstant1, T.ArrayConstant1), T.ArrayConstant1); CheckEqual(T.Union(T.ArrayConstant1, T.ArrayConstant1), T.ArrayConstant1);
CheckEqual(T.Union(T.ArrayConstant1, T.ArrayConstant1), T.ArrayConstant2); CheckEqual(T.Union(T.ArrayConstant1, T.ArrayConstant1), T.ArrayConstant2);
CheckSub(T.None, T.Union(T.ObjectConstant1, T.ObjectConstant2));
CheckSub(T.Union(T.ObjectConstant1, T.ObjectConstant2), T.Any);
CheckSub(T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ObjectConstant2)); CheckSub(T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ObjectConstant2));
CheckSub(T.ObjectConstant2, T.Union(T.ObjectConstant1, T.ObjectConstant2)); CheckSub(T.ObjectConstant2, T.Union(T.ObjectConstant1, T.ObjectConstant2));
CheckSub(T.ArrayConstant2, T.Union(T.ArrayConstant1, T.ObjectConstant2)); CheckSub(T.ArrayConstant2, T.Union(T.ArrayConstant1, T.ObjectConstant2));
...@@ -475,7 +463,6 @@ TEST(Union) { ...@@ -475,7 +463,6 @@ TEST(Union) {
CHECK(IsUnion(Type::Union(T.ObjectClass, T.Number))); CHECK(IsUnion(Type::Union(T.ObjectClass, T.Number)));
CheckEqual(T.Union(T.ObjectClass, T.Object), T.Object); CheckEqual(T.Union(T.ObjectClass, T.Object), T.Object);
CheckSub(T.None, T.Union(T.ObjectClass, T.Number));
CheckSub(T.Union(T.ObjectClass, T.Number), T.Any); CheckSub(T.Union(T.ObjectClass, T.Number), T.Any);
CheckSub(T.Union(T.ObjectClass, T.Smi), T.Union(T.Object, T.Number)); CheckSub(T.Union(T.ObjectClass, T.Smi), T.Union(T.Object, T.Number));
CheckSub(T.Union(T.ObjectClass, T.Array), T.Object); CheckSub(T.Union(T.ObjectClass, T.Array), T.Object);
...@@ -490,7 +477,6 @@ TEST(Union) { ...@@ -490,7 +477,6 @@ TEST(Union) {
CheckEqual(T.Union(T.SmiConstant, T.Number), T.Number); CheckEqual(T.Union(T.SmiConstant, T.Number), T.Number);
CheckEqual(T.Union(T.ObjectConstant1, T.Object), T.Object); CheckEqual(T.Union(T.ObjectConstant1, T.Object), T.Object);
CheckSub(T.None, T.Union(T.ObjectConstant1, T.Number));
CheckSub(T.Union(T.ObjectConstant1, T.Number), T.Any); CheckSub(T.Union(T.ObjectConstant1, T.Number), T.Any);
CheckSub(T.Union(T.ObjectConstant1, T.Signed32), T.Union(T.Object, T.Number)); CheckSub(T.Union(T.ObjectConstant1, T.Signed32), T.Union(T.Object, T.Number));
CheckSub(T.Union(T.ObjectConstant1, T.Array), T.Object); CheckSub(T.Union(T.ObjectConstant1, T.Array), T.Object);
...@@ -503,8 +489,6 @@ TEST(Union) { ...@@ -503,8 +489,6 @@ TEST(Union) {
CHECK(IsUnion(Type::Union(T.ObjectConstant1, T.ObjectClass))); CHECK(IsUnion(Type::Union(T.ObjectConstant1, T.ObjectClass)));
CHECK(IsUnion(Type::Union(T.ArrayClass, T.ObjectConstant2))); CHECK(IsUnion(Type::Union(T.ArrayClass, T.ObjectConstant2)));
CheckSub(T.None, T.Union(T.ObjectConstant1, T.ArrayClass));
CheckSub(T.Union(T.ObjectConstant1, T.ArrayClass), T.Any);
CheckSub(T.Union(T.ObjectConstant1, T.ArrayClass), T.Object); CheckSub(T.Union(T.ObjectConstant1, T.ArrayClass), T.Object);
CheckSub(T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ArrayClass)); CheckSub(T.ObjectConstant1, T.Union(T.ObjectConstant1, T.ArrayClass));
CheckSub(T.ArrayClass, T.Union(T.ObjectConstant1, T.ArrayClass)); CheckSub(T.ArrayClass, T.Union(T.ObjectConstant1, T.ArrayClass));
...@@ -533,9 +517,6 @@ TEST(Union) { ...@@ -533,9 +517,6 @@ TEST(Union) {
CheckSub( CheckSub(
T.ObjectConstant1, T.ObjectConstant1,
T.Union(T.Union(T.ArrayClass, T.ObjectConstant1), T.Double)); T.Union(T.Union(T.ArrayClass, T.ObjectConstant1), T.Double));
CheckSub(
T.None,
T.Union(T.Union(T.ArrayClass, T.ObjectConstant1), T.Double));
CheckSub( CheckSub(
T.Union(T.Union(T.ArrayClass, T.ObjectConstant1), T.Double), T.Union(T.Union(T.ArrayClass, T.ObjectConstant1), T.Double),
T.Any); T.Any);
...@@ -552,12 +533,6 @@ TEST(Union) { ...@@ -552,12 +533,6 @@ TEST(Union) {
CheckEqual( CheckEqual(
T.Union(T.ObjectClass, T.Union(T.ObjectConstant1, T.ObjectClass)), T.Union(T.ObjectClass, T.Union(T.ObjectConstant1, T.ObjectClass)),
T.Union(T.ObjectClass, T.ObjectConstant1)); T.Union(T.ObjectClass, T.ObjectConstant1));
CheckSub(
T.None,
T.Union(T.ObjectClass, T.Union(T.ObjectConstant1, T.ObjectClass)));
CheckSub(
T.Union(T.ObjectClass, T.Union(T.ObjectConstant1, T.ObjectClass)),
T.Any);
CheckSub( CheckSub(
T.Union(T.ObjectClass, T.Union(T.ObjectConstant1, T.ObjectClass)), T.Union(T.ObjectClass, T.Union(T.ObjectConstant1, T.ObjectClass)),
T.Object); T.Object);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment