Index: src/macros.py |
diff --git a/src/macros.py b/src/macros.py |
index f3b646b3d94e5f11c6d02d287ff996fe36bf1994..6de9120fb29edc740d3f21b21f1b204cb6c4c824 100644 |
--- a/src/macros.py |
+++ b/src/macros.py |
@@ -141,12 +141,12 @@ define kBoundArgumentsStartIndex = 2; |
# Inline macros. Use %IS_VAR to make sure arg is evaluated only once. |
macro NUMBER_IS_NAN(arg) = (!%_IsSmi(%IS_VAR(arg)) && !(arg == arg)); |
macro NUMBER_IS_FINITE(arg) = (%_IsSmi(%IS_VAR(arg)) || ((arg == arg) && (arg != 1/0) && (arg != -1/0))); |
-macro TO_INTEGER(arg) = (%_IsSmi(%IS_VAR(arg)) ? arg : %NumberToInteger(ToNumber(arg))); |
-macro TO_INTEGER_FOR_SIDE_EFFECT(arg) = (%_IsSmi(%IS_VAR(arg)) ? arg : ToNumber(arg)); |
+macro TO_INTEGER(arg) = (%_ToInteger(arg)); |
macro TO_INTEGER_MAP_MINUS_ZERO(arg) = (%_IsSmi(%IS_VAR(arg)) ? arg : %NumberToIntegerMapMinusZero(ToNumber(arg))); |
macro TO_INT32(arg) = (arg | 0); |
macro TO_UINT32(arg) = (arg >>> 0); |
-macro TO_LENGTH_OR_UINT32(arg) = (harmony_tolength ? $toLength(arg) : TO_UINT32(arg)); |
+macro TO_LENGTH(arg) = (%ToLength(arg)); |
+macro TO_LENGTH_OR_UINT32(arg) = (harmony_tolength ? TO_LENGTH(arg) : TO_UINT32(arg)); |
macro TO_STRING(arg) = (%_ToString(arg)); |
macro TO_NUMBER_INLINE(arg) = (IS_NUMBER(%IS_VAR(arg)) ? arg : $nonNumberToNumber(arg)); |
macro TO_OBJECT(arg) = (%_ToObject(arg)); |