Revision: 14994
Author:   [email protected]
Date:     Fri Jun  7 01:38:05 2013
Log:      Remove use of Isolate::Current in regexp macro assemblers.

BUG=
[email protected]

Review URL: https://chromiumcodereview.appspot.com/16026020
http://code.google.com/p/v8/source/detail?r=14994

Modified:
 /branches/bleeding_edge/src/arm/regexp-macro-assembler-arm.cc
 /branches/bleeding_edge/src/ia32/regexp-macro-assembler-ia32.cc
 /branches/bleeding_edge/src/mips/regexp-macro-assembler-mips.cc
 /branches/bleeding_edge/src/regexp-macro-assembler-irregexp.cc
 /branches/bleeding_edge/src/regexp-macro-assembler-irregexp.h
 /branches/bleeding_edge/src/x64/regexp-macro-assembler-x64.cc

=======================================
--- /branches/bleeding_edge/src/arm/regexp-macro-assembler-arm.cc Thu Jun 6 03:17:07 2013 +++ /branches/bleeding_edge/src/arm/regexp-macro-assembler-arm.cc Fri Jun 7 01:38:05 2013
@@ -122,7 +122,7 @@
     int registers_to_save,
     Zone* zone)
     : NativeRegExpMacroAssembler(zone),
-      masm_(new MacroAssembler(Isolate::Current(), NULL, kRegExpCodeSize)),
+      masm_(new MacroAssembler(zone->isolate(), NULL, kRegExpCodeSize)),
       mode_(mode),
       num_registers_(registers_to_save),
       num_saved_registers_(registers_to_save),
=======================================
--- /branches/bleeding_edge/src/ia32/regexp-macro-assembler-ia32.cc Thu Jun 6 03:17:07 2013 +++ /branches/bleeding_edge/src/ia32/regexp-macro-assembler-ia32.cc Fri Jun 7 01:38:05 2013
@@ -104,7 +104,7 @@
     int registers_to_save,
     Zone* zone)
     : NativeRegExpMacroAssembler(zone),
-      masm_(new MacroAssembler(Isolate::Current(), NULL, kRegExpCodeSize)),
+      masm_(new MacroAssembler(zone->isolate(), NULL, kRegExpCodeSize)),
       mode_(mode),
       num_registers_(registers_to_save),
       num_saved_registers_(registers_to_save),
=======================================
--- /branches/bleeding_edge/src/mips/regexp-macro-assembler-mips.cc Thu Jun 6 03:17:07 2013 +++ /branches/bleeding_edge/src/mips/regexp-macro-assembler-mips.cc Fri Jun 7 01:38:05 2013
@@ -122,7 +122,7 @@
     int registers_to_save,
     Zone* zone)
     : NativeRegExpMacroAssembler(zone),
-      masm_(new MacroAssembler(Isolate::Current(), NULL, kRegExpCodeSize)),
+      masm_(new MacroAssembler(zone->isolate(), NULL, kRegExpCodeSize)),
       mode_(mode),
       num_registers_(registers_to_save),
       num_saved_registers_(registers_to_save),
=======================================
--- /branches/bleeding_edge/src/regexp-macro-assembler-irregexp.cc Thu Jun 6 03:17:07 2013 +++ /branches/bleeding_edge/src/regexp-macro-assembler-irregexp.cc Fri Jun 7 01:38:05 2013
@@ -44,8 +44,8 @@
       buffer_(buffer),
       pc_(0),
       own_buffer_(false),
-      advance_current_end_(kInvalidPC) {
-}
+      advance_current_end_(kInvalidPC),
+      isolate_(zone->isolate()) { }


 RegExpMacroAssemblerIrregexp::~RegExpMacroAssemblerIrregexp() {
@@ -445,7 +445,7 @@
     Handle<String> source) {
   Bind(&backtrack_);
   Emit(BC_POP_BT, 0);
-  Handle<ByteArray> array = FACTORY->NewByteArray(length());
+  Handle<ByteArray> array = isolate_->factory()->NewByteArray(length());
   Copy(array->GetDataStartAddress());
   return array;
 }
=======================================
--- /branches/bleeding_edge/src/regexp-macro-assembler-irregexp.h Thu Jun 6 03:17:07 2013 +++ /branches/bleeding_edge/src/regexp-macro-assembler-irregexp.h Fri Jun 7 01:38:05 2013
@@ -134,6 +134,8 @@
   int advance_current_offset_;
   int advance_current_end_;

+  Isolate* isolate_;
+
   static const int kInvalidPC = -1;

   DISALLOW_IMPLICIT_CONSTRUCTORS(RegExpMacroAssemblerIrregexp);
=======================================
--- /branches/bleeding_edge/src/x64/regexp-macro-assembler-x64.cc Thu Jun 6 03:17:07 2013 +++ /branches/bleeding_edge/src/x64/regexp-macro-assembler-x64.cc Fri Jun 7 01:38:05 2013
@@ -120,7 +120,7 @@
     int registers_to_save,
     Zone* zone)
     : NativeRegExpMacroAssembler(zone),
-      masm_(Isolate::Current(), NULL, kRegExpCodeSize),
+      masm_(zone->isolate(), NULL, kRegExpCodeSize),
       no_root_array_scope_(&masm_),
       code_relative_fixup_positions_(4, zone),
       mode_(mode),

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to