Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index 83fb983ed1f5d9b9212c3a7e4a795a54a96d553f..f4d57a6db4c49c9905543394adabb98c9a5b4225 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -9,6 +9,7 @@ |
#include "src/assembler-inl.h" |
#include "src/base/bits.h" |
#include "src/base/division-by-constant.h" |
+#include "src/base/utils/random-number-generator.h" |
#include "src/bootstrapper.h" |
#include "src/codegen.h" |
#include "src/counters.h" |
@@ -22,14 +23,19 @@ |
namespace v8 { |
namespace internal { |
-MacroAssembler::MacroAssembler(Isolate* arg_isolate, void* buffer, int size, |
+MacroAssembler::MacroAssembler(Isolate* isolate, void* buffer, int size, |
CodeObjectRequired create_code_object) |
- : Assembler(arg_isolate, buffer, size), |
+ : Assembler(isolate, buffer, size), |
generating_stub_(false), |
- has_frame_(false) { |
+ has_frame_(false), |
+ isolate_(isolate), |
+ jit_cookie_(0) { |
+ if (FLAG_mask_constants_with_cookie) { |
+ jit_cookie_ = isolate->random_number_generator()->NextInt(); |
+ } |
if (create_code_object == CodeObjectRequired::kYes) { |
code_object_ = |
- Handle<Object>::New(isolate()->heap()->undefined_value(), isolate()); |
+ Handle<Object>::New(isolate_->heap()->undefined_value(), isolate_); |
} |
} |
@@ -3814,7 +3820,6 @@ bool AreAliased(Register reg1, |
} |
#endif |
- |
CodePatcher::CodePatcher(Isolate* isolate, byte* address, int instructions, |
FlushICache flush_cache) |
: address_(address), |