[regexp][liveedit] Fix inconsistent JSArrays

src/js/macros.py

 # Copyright 2006-2009 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 99 matching lines @@
 # To avoid ES2015 Function name inference.
 macro ANONYMOUS_FUNCTION(fn) = (0, (fn));
 
 # Constants.  The compiler constant folds them.
 define INFINITY = (1/0);
 define UNDEFINED = (void 0);
 
 # Macros implemented in Python.
 python macro CHAR_CODE(str) = ord(str[1]);
 
-# Constants used on an array to implement the properties of the RegExp object.
+# Layout of internal RegExpLastMatchInfo object.
 define REGEXP_NUMBER_OF_CAPTURES = 0;
+define REGEXP_LAST_SUBJECT = 1;
+define REGEXP_LAST_INPUT = 2;
 define REGEXP_FIRST_CAPTURE = 3;
+define CAPTURE0 = 3;  # Aliases REGEXP_FIRST_CAPTURE.
+define CAPTURE1 = 4;
+
+macro NUMBER_OF_CAPTURES(array) = ((array)[REGEXP_NUMBER_OF_CAPTURES]);
+macro LAST_SUBJECT(array) = ((array)[REGEXP_LAST_SUBJECT]);
+macro LAST_INPUT(array) = ((array)[REGEXP_LAST_INPUT]);
+macro CAPTURE(index) = (REGEXP_FIRST_CAPTURE + (index));
 
 # Macros for internal slot access.
 macro REGEXP_GLOBAL(regexp) = (%_RegExpFlags(regexp) & 1);
 macro REGEXP_IGNORE_CASE(regexp) = (%_RegExpFlags(regexp) & 2);
 macro REGEXP_MULTILINE(regexp) = (%_RegExpFlags(regexp) & 4);
 macro REGEXP_STICKY(regexp) = (%_RegExpFlags(regexp) & 8);
 macro REGEXP_UNICODE(regexp) = (%_RegExpFlags(regexp) & 16);
 macro REGEXP_SOURCE(regexp) = (%_RegExpSource(regexp));
 
-# We can't put macros in macros so we use constants here.
-# REGEXP_NUMBER_OF_CAPTURES
-macro NUMBER_OF_CAPTURES(array) = ((array)[0]);
-
-# Last input and last subject of regexp matches.
-define LAST_SUBJECT_INDEX = 1;
-macro LAST_SUBJECT(array) = ((array)[1]);
-macro LAST_INPUT(array) = ((array)[2]);
-
-# REGEXP_FIRST_CAPTURE
-macro CAPTURE(index) = (3 + (index));
-define CAPTURE0 = 3;
-define CAPTURE1 = 4;
-
 # For the regexp capture override array.  This has the same
 # format as the arguments to a function called from
 # String.prototype.replace.
 macro OVERRIDE_MATCH(override) = ((override)[0]);
 macro OVERRIDE_POS(override) = ((override)[(override).length - 2]);
 macro OVERRIDE_SUBJECT(override) = ((override)[(override).length - 1]);
 # 1-based so index of 1 returns the first capture
 macro OVERRIDE_CAPTURE(override, index) = ((override)[(index)]);
 
 # For messages.js
@@ skipping 72 matching lines @@
 define kSloppyModeBlockScopedFunctionRedefinition = 22;
 define kForInInitializer = 23;
 define kArrayProtectorDirtied = 24;
 define kArraySpeciesModified = 25;
 define kArrayPrototypeConstructorModified = 26;
 define kArrayInstanceProtoModified = 27;
 define kArrayInstanceConstructorModified = 28;
 define kLegacyFunctionDeclaration = 29;
 define kRegExpPrototypeSourceGetter = 30;
 define kRegExpPrototypeOldFlagGetter = 31;