[regexp][liveedit] Fix inconsistent JSArrays

src/regexp/jsregexp.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_REGEXP_JSREGEXP_H_
 #define V8_REGEXP_JSREGEXP_H_
 
 #include "src/allocation.h"
 #include "src/assembler.h"
 #include "src/regexp/regexp-ast.h"
@@ skipping 29 matching lines @@
   // generic data and choice of implementation - as well as what
   // the implementation wants to store in the data field.
   // Returns false if compilation fails.
   MUST_USE_RESULT static MaybeHandle<Object> Compile(Handle<JSRegExp> re,
                                                      Handle<String> pattern,
                                                      JSRegExp::Flags flags);
 
   // See ECMA-262 section 15.10.6.2.
   // This function calls the garbage collector if necessary.
   MUST_USE_RESULT static MaybeHandle<Object> Exec(
-      Handle<JSRegExp> regexp,
-      Handle<String> subject,
-      int index,
-      Handle<JSArray> lastMatchInfo);
+      Handle<JSRegExp> regexp, Handle<String> subject, int index,
+      Handle<JSObject> lastMatchInfo);
 
   // Prepares a JSRegExp object with Irregexp-specific data.
   static void IrregexpInitialize(Handle<JSRegExp> re,
                                  Handle<String> pattern,
                                  JSRegExp::Flags flags,
                                  int capture_register_count);
 
 
   static void AtomCompile(Handle<JSRegExp> re,
                           Handle<String> pattern,
                           JSRegExp::Flags flags,
                           Handle<String> match_pattern);
 
 
   static int AtomExecRaw(Handle<JSRegExp> regexp,
                          Handle<String> subject,
                          int index,
                          int32_t* output,
                          int output_size);
 
-
   static Handle<Object> AtomExec(Handle<JSRegExp> regexp,
-                                 Handle<String> subject,
-                                 int index,
-                                 Handle<JSArray> lastMatchInfo);
+                                 Handle<String> subject, int index,
+                                 Handle<JSObject> lastMatchInfo);
 
   enum IrregexpResult { RE_FAILURE = 0, RE_SUCCESS = 1, RE_EXCEPTION = -1 };
 
   // Prepare a RegExp for being executed one or more times (using
   // IrregexpExecOnce) on the subject.
   // This ensures that the regexp is compiled for the subject, and that
   // the subject is flat.
   // Returns the number of integer spaces required by IrregexpExecOnce
   // as its "registers" argument.  If the regexp cannot be compiled,
   // an exception is set as pending, and this function returns negative.
@@ skipping 10 matching lines @@
                              Handle<String> subject,
                              int index,
                              int32_t* output,
                              int output_size);
 
   // Execute an Irregexp bytecode pattern.
   // On a successful match, the result is a JSArray containing
   // captured positions.  On a failure, the result is the null value.
   // Returns an empty handle in case of an exception.
   MUST_USE_RESULT static MaybeHandle<Object> IrregexpExec(
-      Handle<JSRegExp> regexp,
-      Handle<String> subject,
-      int index,
-      Handle<JSArray> lastMatchInfo);
+      Handle<JSRegExp> regexp, Handle<String> subject, int index,
+      Handle<JSObject> lastMatchInfo);
 
   // Set last match info.  If match is NULL, then setting captures is omitted.
-  static Handle<JSArray> SetLastMatchInfo(Handle<JSArray> last_match_info,
-                                          Handle<String> subject,
-                                          int capture_count,
-                                          int32_t* match);
-
+  static Handle<JSObject> SetLastMatchInfo(Handle<JSObject> last_match_info,
+                                           Handle<String> subject,
+                                           int capture_count, int32_t* match);
 
   class GlobalCache {
    public:
     GlobalCache(Handle<JSRegExp> regexp,
                 Handle<String> subject,
                 Isolate* isolate);
 
     INLINE(~GlobalCache());
 
     // Fetch the next entry in the cache for global regexp match results.
@@ skipping 1456 matching lines @@
   static const int kStringOffset = 0;
   static const int kPatternOffset = 1;
   static const int kArrayOffset = 2;
   static const int kLastMatchOffset = 3;
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_REGEXP_JSREGEXP_H_