| Index: src/x64/regexp-macro-assembler-x64.cc
|
| diff --git a/src/x64/regexp-macro-assembler-x64.cc b/src/x64/regexp-macro-assembler-x64.cc
|
| index 914241ecdc42eabb9d3a50edbf92e0d6a13a63cb..e5ef64aedd6e456761d9d0859c0e98b4050f9c6e 100644
|
| --- a/src/x64/regexp-macro-assembler-x64.cc
|
| +++ b/src/x64/regexp-macro-assembler-x64.cc
|
| @@ -437,7 +437,7 @@ void RegExpMacroAssemblerX64::CheckNotBackReferenceIgnoreCase(
|
| // Set byte_length.
|
| __ movq(r8, rbx);
|
| // Isolate.
|
| - __ LoadAddress(r9, ExternalReference::isolate_address());
|
| + __ LoadAddress(r9, ExternalReference::isolate_address(masm_.isolate()));
|
| #else // AMD64 calling convention
|
| // Compute byte_offset2 (current position = rsi+rdi).
|
| __ lea(rax, Operand(rsi, rdi, times_1, 0));
|
| @@ -448,7 +448,7 @@ void RegExpMacroAssemblerX64::CheckNotBackReferenceIgnoreCase(
|
| // Set byte_length.
|
| __ movq(rdx, rbx);
|
| // Isolate.
|
| - __ LoadAddress(rcx, ExternalReference::isolate_address());
|
| + __ LoadAddress(rcx, ExternalReference::isolate_address(masm_.isolate()));
|
| #endif
|
|
|
| { // NOLINT: Can't find a way to open this scope without confusing the
|
| @@ -1055,12 +1055,12 @@ Handle<HeapObject> RegExpMacroAssemblerX64::GetCode(Handle<String> source) {
|
| // Microsoft passes parameters in rcx, rdx, r8.
|
| // First argument, backtrack stackpointer, is already in rcx.
|
| __ lea(rdx, Operand(rbp, kStackHighEnd)); // Second argument
|
| - __ LoadAddress(r8, ExternalReference::isolate_address());
|
| + __ LoadAddress(r8, ExternalReference::isolate_address(masm_.isolate()));
|
| #else
|
| // AMD64 ABI passes parameters in rdi, rsi, rdx.
|
| __ movq(rdi, backtrack_stackpointer()); // First argument.
|
| __ lea(rsi, Operand(rbp, kStackHighEnd)); // Second argument.
|
| - __ LoadAddress(rdx, ExternalReference::isolate_address());
|
| + __ LoadAddress(rdx, ExternalReference::isolate_address(masm_.isolate()));
|
| #endif
|
| ExternalReference grow_stack =
|
| ExternalReference::re_grow_stack(masm_.isolate());
|
|
|