| Index: src/x64/macro-assembler-x64.cc
|
| diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
|
| index 78f33b409cbf5c573115db7cbf459b692280a2dc..0229eb987f81a78f0a803f983be5b32eb0a635a4 100644
|
| --- a/src/x64/macro-assembler-x64.cc
|
| +++ b/src/x64/macro-assembler-x64.cc
|
| @@ -83,7 +83,7 @@ int64_t MacroAssembler::RootRegisterDelta(ExternalReference other) {
|
|
|
| Operand MacroAssembler::ExternalOperand(ExternalReference target,
|
| Register scratch) {
|
| - if (root_array_available_ && !Serializer::enabled()) {
|
| + if (root_array_available_ && !Serializer::enabled(isolate())) {
|
| int64_t delta = RootRegisterDelta(target);
|
| if (delta != kInvalidRootRegisterDelta && is_int32(delta)) {
|
| return Operand(kRootRegister, static_cast<int32_t>(delta));
|
| @@ -95,7 +95,7 @@ Operand MacroAssembler::ExternalOperand(ExternalReference target,
|
|
|
|
|
| void MacroAssembler::Load(Register destination, ExternalReference source) {
|
| - if (root_array_available_ && !Serializer::enabled()) {
|
| + if (root_array_available_ && !Serializer::enabled(isolate())) {
|
| int64_t delta = RootRegisterDelta(source);
|
| if (delta != kInvalidRootRegisterDelta && is_int32(delta)) {
|
| movp(destination, Operand(kRootRegister, static_cast<int32_t>(delta)));
|
| @@ -113,7 +113,7 @@ void MacroAssembler::Load(Register destination, ExternalReference source) {
|
|
|
|
|
| void MacroAssembler::Store(ExternalReference destination, Register source) {
|
| - if (root_array_available_ && !Serializer::enabled()) {
|
| + if (root_array_available_ && !Serializer::enabled(isolate())) {
|
| int64_t delta = RootRegisterDelta(destination);
|
| if (delta != kInvalidRootRegisterDelta && is_int32(delta)) {
|
| movp(Operand(kRootRegister, static_cast<int32_t>(delta)), source);
|
| @@ -132,7 +132,7 @@ void MacroAssembler::Store(ExternalReference destination, Register source) {
|
|
|
| void MacroAssembler::LoadAddress(Register destination,
|
| ExternalReference source) {
|
| - if (root_array_available_ && !Serializer::enabled()) {
|
| + if (root_array_available_ && !Serializer::enabled(isolate())) {
|
| int64_t delta = RootRegisterDelta(source);
|
| if (delta != kInvalidRootRegisterDelta && is_int32(delta)) {
|
| leap(destination, Operand(kRootRegister, static_cast<int32_t>(delta)));
|
| @@ -145,7 +145,7 @@ void MacroAssembler::LoadAddress(Register destination,
|
|
|
|
|
| int MacroAssembler::LoadAddressSize(ExternalReference source) {
|
| - if (root_array_available_ && !Serializer::enabled()) {
|
| + if (root_array_available_ && !Serializer::enabled(isolate())) {
|
| // This calculation depends on the internals of LoadAddress.
|
| // It's correctness is ensured by the asserts in the Call
|
| // instruction below.
|
| @@ -167,7 +167,7 @@ int MacroAssembler::LoadAddressSize(ExternalReference source) {
|
|
|
| void MacroAssembler::PushAddress(ExternalReference source) {
|
| int64_t address = reinterpret_cast<int64_t>(source.address());
|
| - if (is_int32(address) && !Serializer::enabled()) {
|
| + if (is_int32(address) && !Serializer::enabled(isolate())) {
|
| if (emit_debug_code()) {
|
| Move(kScratchRegister, kZapValue, Assembler::RelocInfoNone());
|
| }
|
| @@ -275,7 +275,7 @@ void MacroAssembler::InNewSpace(Register object,
|
| Condition cc,
|
| Label* branch,
|
| Label::Distance distance) {
|
| - if (Serializer::enabled()) {
|
| + if (Serializer::enabled(isolate())) {
|
| // Can't do arithmetic on external references if it might get serialized.
|
| // The mask isn't really an address. We load it as an external reference in
|
| // case the size of the new space is different between the snapshot maker
|
|
|