| Index: src/ia32/macro-assembler-ia32.cc
|
| diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
|
| index 2ad52208e4ce5116bb911d7eba21a6b86a65fba4..dd624b9c1f0e4cb6e0ac3ecb14bea93cde2eac77 100644
|
| --- a/src/ia32/macro-assembler-ia32.cc
|
| +++ b/src/ia32/macro-assembler-ia32.cc
|
| @@ -1795,33 +1795,8 @@ void MacroAssembler::GetMapConstructor(Register result, Register map,
|
| }
|
|
|
|
|
| -void MacroAssembler::TryGetFunctionPrototype(Register function,
|
| - Register result,
|
| - Register scratch,
|
| - Label* miss,
|
| - bool miss_on_bound_function) {
|
| - 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.
|
| - CmpObjectType(function, JS_FUNCTION_TYPE, result);
|
| - j(not_equal, miss);
|
| -
|
| - // If a bound function, go to miss label.
|
| - mov(scratch,
|
| - FieldOperand(function, JSFunction::kSharedFunctionInfoOffset));
|
| - BooleanBitTest(scratch, SharedFunctionInfo::kCompilerHintsOffset,
|
| - SharedFunctionInfo::kBoundFunction);
|
| - j(not_zero, miss);
|
| -
|
| - // Make sure that the function has an instance prototype.
|
| - movzx_b(scratch, FieldOperand(result, Map::kBitFieldOffset));
|
| - test(scratch, Immediate(1 << Map::kHasNonInstancePrototype));
|
| - j(not_zero, &non_instance);
|
| - }
|
| -
|
| +void MacroAssembler::TryGetFunctionPrototype(Register function, Register result,
|
| + Register scratch, Label* miss) {
|
| // Get the prototype or initial map from the function.
|
| mov(result,
|
| FieldOperand(function, JSFunction::kPrototypeOrInitialMapOffset));
|
| @@ -1835,20 +1810,11 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
|
| // If the function does not have an initial map, we're done.
|
| Label done;
|
| CmpObjectType(result, MAP_TYPE, scratch);
|
| - j(not_equal, &done);
|
| + j(not_equal, &done, Label::kNear);
|
|
|
| // Get the prototype from the initial map.
|
| mov(result, FieldOperand(result, Map::kPrototypeOffset));
|
|
|
| - if (miss_on_bound_function) {
|
| - jmp(&done);
|
| -
|
| - // Non-instance prototype: Fetch prototype from constructor field
|
| - // in initial map.
|
| - bind(&non_instance);
|
| - GetMapConstructor(result, result, scratch);
|
| - }
|
| -
|
| // All done.
|
| bind(&done);
|
| }
|
|
|