Reviewers: jarin,
Description:
[turbofan] Improve typing of JSToNumber.
[email protected]
Please review this at https://codereview.chromium.org/786703002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+19, -3 lines):
M src/compiler/typer.h
M src/compiler/typer.cc
Index: src/compiler/typer.cc
diff --git a/src/compiler/typer.cc b/src/compiler/typer.cc
index
e5b7b839708ec537d23ce6978b99712ea45dc148..710487134edeff341d94e6b06b0f783962fe229c
100644
--- a/src/compiler/typer.cc
+++ b/src/compiler/typer.cc
@@ -162,11 +162,13 @@ Typer::Typer(Graph* graph, MaybeHandle<Context>
context)
Type::Constant(minusinfinity, zone), zone),
nan_or_minuszero, zone);
+ boolean_or_number = Type::Union(Type::Boolean(), Type::Number(), zone);
+ undefined_or_null = Type::Union(Type::Undefined(), Type::Null(), zone);
+ undefined_or_number = Type::Union(Type::Undefined(), Type::Number(),
zone);
negative_signed32 = Type::Union(
Type::SignedSmall(), Type::OtherSigned32(), zone);
non_negative_signed32 = Type::Union(
Type::UnsignedSmall(), Type::OtherUnsigned31(), zone);
- undefined_or_null = Type::Union(Type::Undefined(), Type::Null(), zone);
singleton_false = Type::Constant(f->false_value(), zone);
singleton_true = Type::Constant(f->true_value(), zone);
singleton_zero = Type::Range(zero, zero, zone);
@@ -520,10 +522,22 @@ Type* Typer::Visitor::ToBoolean(Type* type, Typer* t)
{
Type* Typer::Visitor::ToNumber(Type* type, Typer* t) {
if (type->Is(Type::Number())) return type;
+ if (type->Is(Type::Null())) return t->singleton_zero;
if (type->Is(Type::Undefined())) return Type::NaN();
+ if (type->Is(t->undefined_or_null)) {
+ return Type::Union(Type::NaN(), t->singleton_zero, t->zone());
+ }
+ if (type->Is(t->undefined_or_number)) {
+ return Type::Union(Type::Intersect(type, Type::Number(), t->zone()),
+ Type::NaN(), t->zone());
+ }
if (type->Is(t->singleton_false)) return t->singleton_zero;
if (type->Is(t->singleton_true)) return t->singleton_one;
if (type->Is(Type::Boolean())) return t->zero_or_one;
+ if (type->Is(t->boolean_or_number)) {
+ return Type::Union(Type::Intersect(type, Type::Number(), t->zone()),
+ t->zero_or_one, t->zone());
+ }
return Type::Number();
}
@@ -1172,7 +1186,7 @@ Bounds Typer::Visitor::TypeJSToBoolean(Node* node) {
Bounds Typer::Visitor::TypeJSToNumber(Node* node) {
- return Bounds(Type::None(zone()), Type::Number(zone()));
+ return TypeUnaryOp(node, ToNumber);
}
Index: src/compiler/typer.h
diff --git a/src/compiler/typer.h b/src/compiler/typer.h
index
7b740e1c997a56ec338db2d4cfdf66fa3d5beec6..a3e00ca43d2705a38df0a24eab78731e9790cb7a
100644
--- a/src/compiler/typer.h
+++ b/src/compiler/typer.h
@@ -38,9 +38,11 @@ class Typer {
Decorator* decorator_;
Zone* zone_;
+ Type* boolean_or_number;
+ Type* undefined_or_null;
+ Type* undefined_or_number;
Type* negative_signed32;
Type* non_negative_signed32;
- Type* undefined_or_null;
Type* singleton_false;
Type* singleton_true;
Type* singleton_zero;
--
--
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.
