Chromium Code Reviews| Index: src/runtime.js |
| diff --git a/src/runtime.js b/src/runtime.js |
| index 6aab91daae4cd83a2613a9f2f08db22f4d39e7c5..7d04ebafc69b275017306f9a0538c26791afcbf6 100644 |
| --- a/src/runtime.js |
| +++ b/src/runtime.js |
| @@ -107,7 +107,7 @@ EQUALS = function EQUALS(y) { |
| while (true) { |
| if (IS_NUMBER(y)) return %NumberEquals(x, y); |
| if (IS_NULL_OR_UNDEFINED(y)) return 1; // not equal |
| - if (IS_SYMBOL(y)) return 1; // not equal |
| + if (IS_SYMBOL(y) || IS_FLOAT32X4(y)) return 1; // not equal |
| if (!IS_SPEC_OBJECT(y)) { |
| // String or boolean. |
| return %NumberEquals(x, %$toNumber(y)); |
| @@ -117,7 +117,7 @@ EQUALS = function EQUALS(y) { |
| } else if (IS_STRING(x)) { |
| while (true) { |
| if (IS_STRING(y)) return %StringEquals(x, y); |
| - if (IS_SYMBOL(y)) return 1; // not equal |
| + if (IS_SYMBOL(y) || IS_FLOAT32X4(y)) return 1; // not equal |
| if (IS_NUMBER(y)) return %NumberEquals(%$toNumber(x), y); |
| if (IS_BOOLEAN(y)) return %NumberEquals(%$toNumber(x), %$toNumber(y)); |
| if (IS_NULL_OR_UNDEFINED(y)) return 1; // not equal |
| @@ -131,19 +131,23 @@ EQUALS = function EQUALS(y) { |
| if (IS_NULL_OR_UNDEFINED(y)) return 1; |
| if (IS_NUMBER(y)) return %NumberEquals(%$toNumber(x), y); |
| if (IS_STRING(y)) return %NumberEquals(%$toNumber(x), %$toNumber(y)); |
| - if (IS_SYMBOL(y)) return 1; // not equal |
| + if (IS_SYMBOL(y) || IS_FLOAT32X4(y)) return 1; // not equal |
| // y is object. |
| x = %$toNumber(x); |
| y = %$toPrimitive(y, NO_HINT); |
| } else if (IS_NULL_OR_UNDEFINED(x)) { |
| return IS_NULL_OR_UNDEFINED(y) ? 0 : 1; |
| + } else if (IS_FLOAT32X4(x)) { |
| + if (IS_FLOAT32X4(y)) |
| + return %Float32x4Equals(x, y); |
| + return 1; // not equal |
| } else { |
| // x is an object. |
| if (IS_SPEC_OBJECT(y)) { |
| return %_ObjectEquals(x, y) ? 0 : 1; |
| } |
| if (IS_NULL_OR_UNDEFINED(y)) return 1; // not equal |
| - if (IS_SYMBOL(y)) return 1; // not equal |
| + if (IS_SYMBOL(y) || IS_FLOAT32X4(y)) return 1; // not equal |
| if (IS_BOOLEAN(y)) y = %$toNumber(y); |
| x = %$toPrimitive(x, NO_HINT); |
| } |
| @@ -162,6 +166,9 @@ STRICT_EQUALS = function STRICT_EQUALS(x) { |
| return %NumberEquals(this, x); |
| } |
| + if (IS_FLOAT32X4(this) && IS_FLOAT32X4(x)) |
| + return %Float32x4Equals(this, x); |
| + |
| // If anything else gets here, we just do simple identity check. |
| // Objects (including functions), null, undefined and booleans were |
| // checked in the CompareStub, so there should be nothing left. |
| @@ -830,6 +837,7 @@ function ToPrimitive(x, hint) { |
| // Normal behavior. |
| if (!IS_SPEC_OBJECT(x)) return x; |
| if (IS_SYMBOL_WRAPPER(x)) throw MakeTypeError(kSymbolToPrimitive); |
| + if (IS_FLOAT32X4(x)) return x; |
| if (hint == NO_HINT) hint = (IS_DATE(x)) ? STRING_HINT : NUMBER_HINT; |
| return (hint == NUMBER_HINT) ? DefaultNumber(x) : DefaultString(x); |
| } |
| @@ -855,6 +863,7 @@ function ToNumber(x) { |
| if (IS_BOOLEAN(x)) return x ? 1 : 0; |
| if (IS_UNDEFINED(x)) return NAN; |
| if (IS_SYMBOL(x)) throw MakeTypeError(kSymbolToNumber); |
| + if (IS_FLOAT32X4(x)) throw MakeTypeError(kSimdToNumber); |
| return (IS_NULL(x)) ? 0 : ToNumber(DefaultNumber(x)); |
| } |
| @@ -866,6 +875,7 @@ function NonNumberToNumber(x) { |
| if (IS_BOOLEAN(x)) return x ? 1 : 0; |
| if (IS_UNDEFINED(x)) return NAN; |
| if (IS_SYMBOL(x)) throw MakeTypeError(kSymbolToNumber); |
| + if (IS_FLOAT32X4(x)) throw MakeTypeError(kSimdToNumber); |
| return (IS_NULL(x)) ? 0 : ToNumber(DefaultNumber(x)); |
| } |
| @@ -901,6 +911,7 @@ function ToObject(x) { |
| if (IS_NUMBER(x)) return new GlobalNumber(x); |
| if (IS_BOOLEAN(x)) return new GlobalBoolean(x); |
| if (IS_SYMBOL(x)) return %NewSymbolWrapper(x); |
| + if (IS_FLOAT32X4(x)) return %NewFloat32x4Wrapper(x); |
| if (IS_NULL_OR_UNDEFINED(x) && !IS_UNDETECTABLE(x)) { |
| throw MakeTypeError(kUndefinedOrNullToObject); |
| } |
| @@ -948,6 +959,9 @@ function SameValue(x, y) { |
| return false; |
| } |
| } |
| + if (IS_FLOAT32X4(x)) { |
| + return %Float32x4SameValue(x, y) ? true : false; |
|
rossberg
2015/07/13 11:13:23
The ?: seems redundant.
bbudge
2015/07/13 23:10:39
Yep, I was trying to fix a weird problem and thoug
|
| + } |
| return x === y; |
| } |
| @@ -958,9 +972,13 @@ function SameValueZero(x, y) { |
| if (IS_NUMBER(x)) { |
| if (NUMBER_IS_NAN(x) && NUMBER_IS_NAN(y)) return true; |
| } |
| + if (IS_FLOAT32X4(x)) { |
| + return %Float32x4SameValueZero(x, y) ? true : false; |
|
rossberg
2015/07/13 11:13:23
Same here.
bbudge
2015/07/13 23:10:39
Done.
|
| + } |
| return x === y; |
| } |
| + |
| function ConcatIterableToArray(target, iterable) { |
| var index = target.length; |
| for (var element of iterable) { |
| @@ -996,7 +1014,7 @@ function IsConcatSpreadable(O) { |
| // ECMA-262, section 8.6.2.6, page 28. |
| function DefaultNumber(x) { |
| - if (!IS_SYMBOL_WRAPPER(x)) { |
| + if (!IS_SYMBOL_WRAPPER(x) && !IS_FLOAT32X4_WRAPPER(x)) { |
| var valueOf = x.valueOf; |
| if (IS_SPEC_FUNCTION(valueOf)) { |
| var v = %_CallFunction(x, valueOf); |