| Index: src/arm/regexp-macro-assembler-arm.cc
|
| diff --git a/src/arm/regexp-macro-assembler-arm.cc b/src/arm/regexp-macro-assembler-arm.cc
|
| index c8764679383d54b477e225dbe263489c1b47b2b1..b212f9f6e6a0922fba39f3d48c177e65e09a3ce2 100644
|
| --- a/src/arm/regexp-macro-assembler-arm.cc
|
| +++ b/src/arm/regexp-macro-assembler-arm.cc
|
| @@ -1111,6 +1111,11 @@ int RegExpMacroAssemblerARM::CheckStackGuardState(Address* return_address,
|
| frame_entry<const String*>(re_frame, kInputString) = *subject;
|
| frame_entry<const byte*>(re_frame, kInputStart) = new_address;
|
| frame_entry<const byte*>(re_frame, kInputEnd) = new_address + byte_length;
|
| + } else if (frame_entry<const String*>(re_frame, kInputString) != *subject) {
|
| + // Subject string might have been a ConsString that underwent
|
| + // short-circuiting during GC. That will not change start_address but
|
| + // will change pointer inside the subject handle.
|
| + frame_entry<const String*>(re_frame, kInputString) = *subject;
|
| }
|
|
|
| return 0;
|
|
|