| Index: src/mips64/code-stubs-mips64.cc
|
| diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc
|
| index d570c5879ea6ae6988d313a1a5189eba3715a709..f75792da7bf0fee370ed9a264415f896bed52fc3 100644
|
| --- a/src/mips64/code-stubs-mips64.cc
|
| +++ b/src/mips64/code-stubs-mips64.cc
|
| @@ -2809,14 +2809,16 @@ void StringCharCodeAtGenerator::GenerateFast(MacroAssembler* masm) {
|
| DCHECK(!a4.is(object_));
|
|
|
| // If the receiver is a smi trigger the non-string case.
|
| - __ JumpIfSmi(object_, receiver_not_string_);
|
| -
|
| - // Fetch the instance type of the receiver into result register.
|
| - __ ld(result_, FieldMemOperand(object_, HeapObject::kMapOffset));
|
| - __ lbu(result_, FieldMemOperand(result_, Map::kInstanceTypeOffset));
|
| - // If the receiver is not a string trigger the non-string case.
|
| - __ And(a4, result_, Operand(kIsNotStringMask));
|
| - __ Branch(receiver_not_string_, ne, a4, Operand(zero_reg));
|
| + if (check_mode_ == RECEIVER_IS_UNKNOWN) {
|
| + __ JumpIfSmi(object_, receiver_not_string_);
|
| +
|
| + // Fetch the instance type of the receiver into result register.
|
| + __ ld(result_, FieldMemOperand(object_, HeapObject::kMapOffset));
|
| + __ lbu(result_, FieldMemOperand(result_, Map::kInstanceTypeOffset));
|
| + // If the receiver is not a string trigger the non-string case.
|
| + __ And(a4, result_, Operand(kIsNotStringMask));
|
| + __ Branch(receiver_not_string_, ne, a4, Operand(zero_reg));
|
| + }
|
|
|
| // If the index is non-smi trigger the non-smi case.
|
| __ JumpIfNotSmi(index_, &index_not_smi_);
|
|
|