| Index: src/s390/code-stubs-s390.cc
|
| diff --git a/src/s390/code-stubs-s390.cc b/src/s390/code-stubs-s390.cc
|
| index a6b5247423bca7c897862a1e54626a26ee6ed795..4b5aafa9bfe53ebd9fd101cd27fd4585aac06c58 100644
|
| --- a/src/s390/code-stubs-s390.cc
|
| +++ b/src/s390/code-stubs-s390.cc
|
| @@ -1368,7 +1368,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
|
| // (6) External string. Make it, offset-wise, look like a sequential string.
|
| // Go to (4).
|
| // (7) Short external string or not a string? If yes, bail out to runtime.
|
| - // (8) Sliced string. Replace subject with parent. Go to (1).
|
| + // (8) Sliced or thin string. Replace subject with parent. Go to (1).
|
|
|
| Label seq_string /* 4 */, external_string /* 6 */, check_underlying /* 1 */,
|
| not_seq_nor_cons /* 5 */, not_long_external /* 7 */;
|
| @@ -1677,12 +1677,19 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
|
| __ AndP(r0, r3);
|
| __ bne(&runtime);
|
|
|
| - // (8) Sliced string. Replace subject with parent. Go to (4).
|
| + // (8) Sliced or thin string. Replace subject with parent. Go to (4).
|
| + Label thin_string;
|
| + __ CmpP(r3, Operand(kThinStringTag));
|
| + __ beq(&thin_string);
|
| // Load offset into ip and replace subject string with parent.
|
| __ LoadP(ip, FieldMemOperand(subject, SlicedString::kOffsetOffset));
|
| __ SmiUntag(ip);
|
| __ LoadP(subject, FieldMemOperand(subject, SlicedString::kParentOffset));
|
| __ b(&check_underlying); // Go to (4).
|
| +
|
| + __ bind(&thin_string);
|
| + __ LoadP(subject, FieldMemOperand(subject, ThinString::kActualOffset));
|
| + __ b(&check_underlying); // Go to (4).
|
| #endif // V8_INTERPRETED_REGEXP
|
| }
|
|
|
|
|