Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/src/crankshaft/typing.cc b/src/crankshaft/typing.cc
index df50f81..69d7efe 100644
--- a/src/crankshaft/typing.cc
+++ b/src/crankshaft/typing.cc
@@ -45,7 +45,7 @@
Effect AstTyper::ObservedOnStack(Object* value) {
Type* lower = Type::NowOf(value, zone());
- return Effect(Bounds(lower, Type::Any(zone())));
+ return Effect(Bounds(lower, Type::Any()));
}
@@ -393,7 +393,7 @@
void AstTyper::VisitRegExpLiteral(RegExpLiteral* expr) {
// TODO(rossberg): Reintroduce RegExp type.
- NarrowType(expr, Bounds(Type::Object(zone())));
+ NarrowType(expr, Bounds(Type::Object()));
}
@@ -421,7 +421,7 @@
RECURSE(Visit(prop->value()));
}
- NarrowType(expr, Bounds(Type::Object(zone())));
+ NarrowType(expr, Bounds(Type::Object()));
}
@@ -432,7 +432,7 @@
RECURSE(Visit(value));
}
- NarrowType(expr, Bounds(Type::Object(zone())));
+ NarrowType(expr, Bounds(Type::Object()));
}
@@ -485,7 +485,7 @@
RECURSE(Visit(expr->exception()));
// TODO(rossberg): is it worth having a non-termination effect?
- NarrowType(expr, Bounds(Type::None(zone())));
+ NarrowType(expr, Bounds(Type::None()));
}
@@ -569,7 +569,7 @@
RECURSE(Visit(arg));
}
- NarrowType(expr, Bounds(Type::None(zone()), Type::Receiver(zone())));
+ NarrowType(expr, Bounds(Type::None(), Type::Receiver()));
}
@@ -596,13 +596,13 @@
switch (expr->op()) {
case Token::NOT:
case Token::DELETE:
- NarrowType(expr, Bounds(Type::Boolean(zone())));
+ NarrowType(expr, Bounds(Type::Boolean()));
break;
case Token::VOID:
- NarrowType(expr, Bounds(Type::Undefined(zone())));
+ NarrowType(expr, Bounds(Type::Undefined()));
break;
case Token::TYPEOF:
- NarrowType(expr, Bounds(Type::InternalizedString(zone())));
+ NarrowType(expr, Bounds(Type::InternalizedString()));
break;
default:
UNREACHABLE();
@@ -624,7 +624,7 @@
RECURSE(Visit(expr->expression()));
- NarrowType(expr, Bounds(Type::SignedSmall(zone()), Type::Number(zone())));
+ NarrowType(expr, Bounds(Type::SignedSmall(), Type::Number()));
VariableProxy* proxy = expr->expression()->AsVariableProxy();
if (proxy != NULL && proxy->var()->IsStackAllocated()) {
@@ -679,8 +679,8 @@
RECURSE(Visit(expr->right()));
Type* upper = Type::Union(
expr->left()->bounds().upper, expr->right()->bounds().upper, zone());
- if (!upper->Is(Type::Signed32())) upper = Type::Signed32(zone());
- Type* lower = Type::Intersect(Type::SignedSmall(zone()), upper, zone());
+ if (!upper->Is(Type::Signed32())) upper = Type::Signed32();
+ Type* lower = Type::Intersect(Type::SignedSmall(), upper, zone());
NarrowType(expr, Bounds(lower, upper));
break;
}
@@ -689,8 +689,7 @@
case Token::SAR:
RECURSE(Visit(expr->left()));
RECURSE(Visit(expr->right()));
- NarrowType(expr,
- Bounds(Type::SignedSmall(zone()), Type::Signed32(zone())));
+ NarrowType(expr, Bounds(Type::SignedSmall(), Type::Signed32()));
break;
case Token::SHR:
RECURSE(Visit(expr->left()));
@@ -698,7 +697,7 @@
// TODO(rossberg): The upper bound would be Unsigned32, but since there
// is no 'positive Smi' type for the lower bound, we use the smallest
// union of Smi and Unsigned32 as upper bound instead.
- NarrowType(expr, Bounds(Type::SignedSmall(zone()), Type::Number(zone())));
+ NarrowType(expr, Bounds(Type::SignedSmall(), Type::Number()));
break;
case Token::ADD: {
RECURSE(Visit(expr->left()));
@@ -706,17 +705,19 @@
Bounds l = expr->left()->bounds();
Bounds r = expr->right()->bounds();
Type* lower =
- !l.lower->IsInhabited() || !r.lower->IsInhabited() ?
- Type::None(zone()) :
- l.lower->Is(Type::String()) || r.lower->Is(Type::String()) ?
- Type::String(zone()) :
- l.lower->Is(Type::Number()) && r.lower->Is(Type::Number()) ?
- Type::SignedSmall(zone()) : Type::None(zone());
+ !l.lower->IsInhabited() || !r.lower->IsInhabited()
+ ? Type::None()
+ : l.lower->Is(Type::String()) || r.lower->Is(Type::String())
+ ? Type::String()
+ : l.lower->Is(Type::Number()) && r.lower->Is(Type::Number())
+ ? Type::SignedSmall()
+ : Type::None();
Type* upper =
- l.upper->Is(Type::String()) || r.upper->Is(Type::String()) ?
- Type::String(zone()) :
- l.upper->Is(Type::Number()) && r.upper->Is(Type::Number()) ?
- Type::Number(zone()) : Type::NumberOrString(zone());
+ l.upper->Is(Type::String()) || r.upper->Is(Type::String())
+ ? Type::String()
+ : l.upper->Is(Type::Number()) && r.upper->Is(Type::Number())
+ ? Type::Number()
+ : Type::NumberOrString();
NarrowType(expr, Bounds(lower, upper));
break;
}
@@ -726,7 +727,7 @@
case Token::MOD:
RECURSE(Visit(expr->left()));
RECURSE(Visit(expr->right()));
- NarrowType(expr, Bounds(Type::SignedSmall(zone()), Type::Number(zone())));
+ NarrowType(expr, Bounds(Type::SignedSmall(), Type::Number()));
break;
default:
UNREACHABLE();
@@ -748,11 +749,11 @@
RECURSE(Visit(expr->left()));
RECURSE(Visit(expr->right()));
- NarrowType(expr, Bounds(Type::Boolean(zone())));
+ NarrowType(expr, Bounds(Type::Boolean()));
}
-void AstTyper::VisitSpread(Spread* expr) { RECURSE(Visit(expr->expression())); }
+void AstTyper::VisitSpread(Spread* expr) { UNREACHABLE(); }
void AstTyper::VisitEmptyParentheses(EmptyParentheses* expr) {
@@ -760,8 +761,7 @@
}
-void AstTyper::VisitThisFunction(ThisFunction* expr) {
-}
+void AstTyper::VisitThisFunction(ThisFunction* expr) {}
void AstTyper::VisitSuperPropertyReference(SuperPropertyReference* expr) {}
@@ -770,8 +770,7 @@
void AstTyper::VisitSuperCallReference(SuperCallReference* expr) {}
-void AstTyper::VisitRewritableAssignmentExpression(
- RewritableAssignmentExpression* expr) {
+void AstTyper::VisitRewritableExpression(RewritableExpression* expr) {
Visit(expr->expression());
}