Index: src/ia32/assembler-ia32.cc |
diff --git a/src/ia32/assembler-ia32.cc b/src/ia32/assembler-ia32.cc |
index 4da15342c2b8c17b21502f1742546fcf451f4164..bb69cff8ab1eacb96e044e04dc12bae6c1a00054 100644 |
--- a/src/ia32/assembler-ia32.cc |
+++ b/src/ia32/assembler-ia32.cc |
@@ -207,18 +207,18 @@ uint32_t RelocInfo::wasm_function_table_size_reference() { |
} |
void RelocInfo::unchecked_update_wasm_memory_reference( |
- Address address, ICacheFlushMode icache_flush_mode) { |
+ Isolate* isolate, Address address, ICacheFlushMode icache_flush_mode) { |
Memory::Address_at(pc_) = address; |
if (icache_flush_mode != SKIP_ICACHE_FLUSH) { |
- Assembler::FlushICache(isolate_, pc_, sizeof(Address)); |
+ Assembler::FlushICache(isolate, pc_, sizeof(Address)); |
} |
} |
-void RelocInfo::unchecked_update_wasm_size(uint32_t size, |
+void RelocInfo::unchecked_update_wasm_size(Isolate* isolate, uint32_t size, |
ICacheFlushMode icache_flush_mode) { |
Memory::uint32_at(pc_) = size; |
if (icache_flush_mode != SKIP_ICACHE_FLUSH) { |
- Assembler::FlushICache(isolate_, pc_, sizeof(uint32_t)); |
+ Assembler::FlushICache(isolate, pc_, sizeof(uint32_t)); |
} |
} |
@@ -306,8 +306,8 @@ Register Operand::reg() const { |
#define EMIT(x) \ |
*pc_++ = (x) |
-Assembler::Assembler(Isolate* isolate, void* buffer, int buffer_size) |
- : AssemblerBase(isolate, buffer, buffer_size) { |
+Assembler::Assembler(IsolateData isolate_data, void* buffer, int buffer_size) |
+ : AssemblerBase(isolate_data, buffer, buffer_size) { |
// Clear the buffer in debug mode unless it was provided by the |
// caller in which case we can't be sure it's okay to overwrite |
// existing code in it; see CodePatcher::CodePatcher(...). |
@@ -2973,7 +2973,7 @@ void Assembler::GrowBuffer() { |
// they must ensure that kMaximalBufferSize is not too large. |
if (desc.buffer_size > kMaximalBufferSize || |
static_cast<size_t>(desc.buffer_size) > |
- isolate()->heap()->MaxOldGenerationSize()) { |
+ isolate_data().max_old_generation_size_) { |
V8::FatalProcessOutOfMemory("Assembler::GrowBuffer"); |
} |
@@ -3116,7 +3116,7 @@ void Assembler::RecordRelocInfo(RelocInfo::Mode rmode, intptr_t data) { |
!serializer_enabled() && !emit_debug_code()) { |
return; |
} |
- RelocInfo rinfo(isolate(), pc_, rmode, data, NULL); |
+ RelocInfo rinfo(pc_, rmode, data, NULL); |
reloc_info_writer.Write(&rinfo); |
} |