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

src/regexp-macro-assembler.cc

 // Copyright 2008 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 140 matching lines @@
 
 NativeRegExpMacroAssembler::Result NativeRegExpMacroAssembler::Execute(
     Code* code,
     String* input,
     int start_offset,
     const byte* input_start,
     const byte* input_end,
     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,
                                           input_end,
                                           output,
                                           stack_base,
                                           direct_call,
                                           isolate);
   ASSERT(result <= SUCCESS);
   ASSERT(result >= RETRY);
@@ skipping 80 matching lines @@
     return NULL;
   }
   *stack_base = new_stack_base;
   intptr_t stack_content_size = old_stack_base - stack_pointer;
   return new_stack_base - stack_content_size;
 }
 
 #endif  // V8_INTERPRETED_REGEXP
 
 } }  // namespace v8::internal