Index: src/mips64/macro-assembler-mips64.cc |
diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc |
index b1aed3726e33c4612a5b031eb249e92282b50e23..16b4ba9d5346a4399774bc024cfd6d1826ffcfc3 100644 |
--- a/src/mips64/macro-assembler-mips64.cc |
+++ b/src/mips64/macro-assembler-mips64.cc |
@@ -3933,32 +3933,28 @@ void MacroAssembler::TryGetFunctionPrototype(Register function, |
Register scratch, |
Label* miss, |
bool miss_on_bound_function) { |
- // Check that the receiver isn't a smi. |
- JumpIfSmi(function, miss); |
+ Label non_instance; |
+ if (miss_on_bound_function) { |
+ // Check that the receiver isn't a smi. |
+ JumpIfSmi(function, miss); |
- // Check that the function really is a function. Load map into result reg. |
- GetObjectType(function, result, scratch); |
- Branch(miss, ne, scratch, Operand(JS_FUNCTION_TYPE)); |
+ // Check that the function really is a function. Load map into result reg. |
+ GetObjectType(function, result, scratch); |
+ Branch(miss, ne, scratch, Operand(JS_FUNCTION_TYPE)); |
- if (miss_on_bound_function) { |
ld(scratch, |
FieldMemOperand(function, JSFunction::kSharedFunctionInfoOffset)); |
- // ld(scratch, |
- // FieldMemOperand(scratch, SharedFunctionInfo::kCompilerHintsOffset)); |
- // And(scratch, scratch, |
- // Operand(Smi::FromInt(1 << SharedFunctionInfo::kBoundFunction))); |
lwu(scratch, |
FieldMemOperand(scratch, SharedFunctionInfo::kCompilerHintsOffset)); |
And(scratch, scratch, |
Operand(1 << SharedFunctionInfo::kBoundFunction)); |
Branch(miss, ne, scratch, Operand(zero_reg)); |
- } |
- // Make sure that the function has an instance prototype. |
- Label non_instance; |
- lbu(scratch, FieldMemOperand(result, Map::kBitFieldOffset)); |
- And(scratch, scratch, Operand(1 << Map::kHasNonInstancePrototype)); |
- Branch(&non_instance, ne, scratch, Operand(zero_reg)); |
+ // Make sure that the function has an instance prototype. |
+ lbu(scratch, FieldMemOperand(result, Map::kBitFieldOffset)); |
+ And(scratch, scratch, Operand(1 << Map::kHasNonInstancePrototype)); |
+ Branch(&non_instance, ne, scratch, Operand(zero_reg)); |
+ } |
// Get the prototype or initial map from the function. |
ld(result, |
@@ -3977,12 +3973,15 @@ void MacroAssembler::TryGetFunctionPrototype(Register function, |
// Get the prototype from the initial map. |
ld(result, FieldMemOperand(result, Map::kPrototypeOffset)); |
- jmp(&done); |
- // Non-instance prototype: Fetch prototype from constructor field |
- // in initial map. |
- bind(&non_instance); |
- ld(result, FieldMemOperand(result, Map::kConstructorOffset)); |
+ if (miss_on_bound_function) { |
+ jmp(&done); |
+ |
+ // Non-instance prototype: Fetch prototype from constructor field |
+ // in initial map. |
+ bind(&non_instance); |
+ ld(result, FieldMemOperand(result, Map::kConstructorOffset)); |
+ } |
// All done. |
bind(&done); |