Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index 2565328abef594157cc4ee6d5a8420cca5775676..9e39fd6eae5fbf789819e5e8ebb35697224593d6 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -19,11 +19,12 @@ |
namespace v8 { |
namespace internal { |
-MacroAssembler::MacroAssembler(Isolate* arg_isolate, void* buffer, int size) |
+MacroAssembler::MacroAssembler(Isolate* arg_isolate, void* buffer, int size, |
+ CodeObjectRequired create_code_object) |
: Assembler(arg_isolate, buffer, size), |
generating_stub_(false), |
has_frame_(false) { |
- if (isolate() != NULL) { |
+ if (create_code_object == CodeObjectRequired::kYes) { |
code_object_ = |
Handle<Object>::New(isolate()->heap()->undefined_value(), isolate()); |
} |
@@ -3645,12 +3646,11 @@ bool AreAliased(Register reg1, |
#endif |
-CodePatcher::CodePatcher(byte* address, |
- int instructions, |
+CodePatcher::CodePatcher(byte* address, int instructions, |
FlushICache flush_cache) |
: address_(address), |
size_(instructions * Assembler::kInstrSize), |
- masm_(NULL, address, size_ + Assembler::kGap), |
+ masm_(NULL, 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 |