Index: src/ia32/codegen-ia32.cc |
diff --git a/src/ia32/codegen-ia32.cc b/src/ia32/codegen-ia32.cc |
index cf990a00e4ae2ff0476ef75d50f1c31dfd79b2fe..2d17a72df920be30df83ec01e54d41295fb61d3a 100644 |
--- a/src/ia32/codegen-ia32.cc |
+++ b/src/ia32/codegen-ia32.cc |
@@ -10174,7 +10174,7 @@ static void MemCopyWrapper(void* dest, const void* src, size_t size) { |
} |
-MemCopyFunction CreateMemCopyFunction() { |
+OS::MemCopyFunction CreateMemCopyFunction() { |
HandleScope scope; |
MacroAssembler masm(NULL, 1 * KB); |
@@ -10198,7 +10198,7 @@ MemCopyFunction CreateMemCopyFunction() { |
if (FLAG_debug_code) { |
__ cmp(Operand(esp, kSizeOffset + stack_offset), |
- Immediate(kMinComplexMemCopy)); |
+ Immediate(OS::kMinComplexMemCopy)); |
Label ok; |
__ j(greater_equal, &ok); |
__ int3(); |
@@ -10377,7 +10377,8 @@ MemCopyFunction CreateMemCopyFunction() { |
if (chunk == NULL) return &MemCopyWrapper; |
memcpy(chunk->GetStartAddress(), desc.buffer, desc.instr_size); |
CPU::FlushICache(chunk->GetStartAddress(), desc.instr_size); |
- return FUNCTION_CAST<MemCopyFunction>(chunk->GetStartAddress()); |
+ MemoryBarrier(); |
+ return FUNCTION_CAST<OS::MemCopyFunction>(chunk->GetStartAddress()); |
} |
#undef __ |