| Index: src/js/macros.py | 
| diff --git a/src/js/macros.py b/src/js/macros.py | 
| index 926942e9052a222e74509e3524432860ade30a29..8259ee8da526cbac3819f833c2516455e0738731 100644 | 
| --- a/src/js/macros.py | 
| +++ b/src/js/macros.py | 
| @@ -147,8 +147,8 @@ macro TO_INTEGER_MAP_MINUS_ZERO(arg) = (%_IsSmi(%IS_VAR(arg)) ? arg : %NumberToI | 
| macro TO_INT32(arg) = ((arg) | 0); | 
| macro TO_UINT32(arg) = ((arg) >>> 0); | 
| macro TO_LENGTH(arg) = (%ToLength(arg)); | 
| -macro TO_LENGTH_OR_UINT32(arg) = (harmony_tolength ? TO_LENGTH(arg) : TO_UINT32(arg)); | 
| -macro TO_LENGTH_OR_INTEGER(arg) = (harmony_tolength ? TO_LENGTH(arg) : TO_INTEGER(arg)); | 
| +macro TO_LENGTH_OR_UINT32(arg) = (FLAG_harmony_tolength ? TO_LENGTH(arg) : TO_UINT32(arg)); | 
| +macro TO_LENGTH_OR_INTEGER(arg) = (FLAG_harmony_tolength ? TO_LENGTH(arg) : TO_INTEGER(arg)); | 
| macro TO_STRING(arg) = (%_ToString(arg)); | 
| macro TO_NUMBER(arg) = (%_ToNumber(arg)); | 
| macro TO_OBJECT(arg) = (%_ToObject(arg)); | 
|  |