[Isolates] Merge 6700:7030 from bleeding_edge to isolates.

src/regexp-macro-assembler.cc

Index: src/regexp-macro-assembler.cc
===================================================================
--- src/regexp-macro-assembler.cc	(revision 7006)
+++ src/regexp-macro-assembler.cc	(working copy)
@@ -158,16 +158,12 @@
     int* output,
     Isolate* isolate) {
   ASSERT(isolate == Isolate::Current());
-  typedef int (*matcher)(String*, int, const byte*,
-                         const byte*, int*, Address, int, Isolate*);
-  matcher matcher_func = FUNCTION_CAST<matcher>(code->entry());
-
   // Ensure that the minimum stack has been allocated.
   RegExpStackScope stack_scope(isolate);
   Address stack_base = stack_scope.stack()->stack_base();
 
   int direct_call = 0;
-  int result = CALL_GENERATED_REGEXP_CODE(matcher_func,
+  int result = CALL_GENERATED_REGEXP_CODE(code->entry(),
                                           input,
                                           start_offset,
                                           input_start,