| Index: src/arm/macro-assembler-arm.cc
|
| diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
|
| index 39e9ead4fb35a63d334a23a934c31c9cd38cae29..252bb3534d6ee6da90929154a52c1e366b5f5631 100644
|
| --- a/src/arm/macro-assembler-arm.cc
|
| +++ b/src/arm/macro-assembler-arm.cc
|
| @@ -3668,11 +3668,11 @@ bool AreAliased(Register reg1,
|
| #endif
|
|
|
|
|
| -CodePatcher::CodePatcher(byte* address, int instructions,
|
| +CodePatcher::CodePatcher(Isolate* isolate, byte* address, int instructions,
|
| FlushICache flush_cache)
|
| : address_(address),
|
| size_(instructions * Assembler::kInstrSize),
|
| - masm_(NULL, address, size_ + Assembler::kGap, CodeObjectRequired::kNo),
|
| + masm_(isolate, address, size_ + Assembler::kGap, CodeObjectRequired::kNo),
|
| flush_cache_(flush_cache) {
|
| // Create a new macro assembler pointing to the address of the code to patch.
|
| // The size is adjusted with kGap on order for the assembler to generate size
|
| @@ -3684,7 +3684,7 @@ CodePatcher::CodePatcher(byte* address, int instructions,
|
| CodePatcher::~CodePatcher() {
|
| // Indicate that code has changed.
|
| if (flush_cache_ == FLUSH) {
|
| - Assembler::FlushICacheWithoutIsolate(address_, size_);
|
| + Assembler::FlushICache(masm_.isolate(), address_, size_);
|
| }
|
|
|
| // Check that the code was patched as expected.
|
|
|