From 3c56b026743808157129a32c6eb4a7d7d5d3ecbc Mon Sep 17 00:00:00 2001
From: cdai2 <chunyang.dai@intel.com>
Date: Sat, 7 Feb 2015 14:21:53 +0800
Subject: [PATCH] X87: Remove the dependency of Zone on Isolate

port c7b09aac317dd810d29b82061973199b80363b65 (r26252)

original commit message:

    Along the way:
    - Thread isolate parameter explicitly through code that used to
      rely on getting it from the zone.
    - Canonicalize the parameter position of isolate and zone for
      affected code
    - Change Hydrogen New<> instruction templates to automatically
      pass isolate

BUG=
R=weiliang.lin@intel.com

Review URL: https://codereview.chromium.org/903183003

Cr-Commit-Position: refs/heads/master@{#26501}
---
 src/x87/regexp-macro-assembler-x87.cc | 11 +++++------
 src/x87/regexp-macro-assembler-x87.h  |  3 ++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/x87/regexp-macro-assembler-x87.cc b/src/x87/regexp-macro-assembler-x87.cc
index 9bd08caa2a..cc3f34e420 100644
--- a/src/x87/regexp-macro-assembler-x87.cc
+++ b/src/x87/regexp-macro-assembler-x87.cc
@@ -77,12 +77,11 @@ namespace internal {
 
 #define __ ACCESS_MASM(masm_)
 
-RegExpMacroAssemblerX87::RegExpMacroAssemblerX87(
-    Mode mode,
-    int registers_to_save,
-    Zone* zone)
-    : NativeRegExpMacroAssembler(zone),
-      masm_(new MacroAssembler(zone->isolate(), NULL, kRegExpCodeSize)),
+RegExpMacroAssemblerX87::RegExpMacroAssemblerX87(Isolate* isolate, Zone* zone,
+                                                 Mode mode,
+                                                 int registers_to_save)
+    : NativeRegExpMacroAssembler(isolate, zone),
+      masm_(new MacroAssembler(isolate, NULL, kRegExpCodeSize)),
       mode_(mode),
       num_registers_(registers_to_save),
       num_saved_registers_(registers_to_save),
diff --git a/src/x87/regexp-macro-assembler-x87.h b/src/x87/regexp-macro-assembler-x87.h
index 3655bd9626..f893262704 100644
--- a/src/x87/regexp-macro-assembler-x87.h
+++ b/src/x87/regexp-macro-assembler-x87.h
@@ -15,7 +15,8 @@ namespace internal {
 #ifndef V8_INTERPRETED_REGEXP
 class RegExpMacroAssemblerX87: public NativeRegExpMacroAssembler {
  public:
-  RegExpMacroAssemblerX87(Mode mode, int registers_to_save, Zone* zone);
+  RegExpMacroAssemblerX87(Isolate* isolate, Zone* zone, Mode mode,
+                          int registers_to_save);
   virtual ~RegExpMacroAssemblerX87();
   virtual int stack_limit_slack();
   virtual void AdvanceCurrentPosition(int by);