| Index: src/arm/codegen-arm.cc | 
| diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc | 
| index 83437936a9e77583d828a6d27bd1dc87829f7562..7ac14e382a525fbb02f2963b0fd54c145cf9829a 100644 | 
| --- a/src/arm/codegen-arm.cc | 
| +++ b/src/arm/codegen-arm.cc | 
| @@ -238,11 +238,12 @@ OS::MemCopyUint8Function CreateMemCopyUint8Function( | 
|  | 
| // Convert 8 to 16. The number of character to copy must be at least 8. | 
| OS::MemCopyUint16Uint8Function CreateMemCopyUint16Uint8Function( | 
| -      OS::MemCopyUint16Uint8Function stub) { | 
| +    bool serializer_enabled, | 
| +    OS::MemCopyUint16Uint8Function stub) { | 
| #if defined(USE_SIMULATOR) | 
| return stub; | 
| #else | 
| -  if (Serializer::enabled() || !CpuFeatures::IsSupported(UNALIGNED_ACCESSES)) { | 
| +  if (serializer_enabled || !CpuFeatures::IsSupported(UNALIGNED_ACCESSES)) { | 
| return stub; | 
| } | 
| size_t actual_size; | 
|  |