Index: src/x87/builtins-x87.cc |
diff --git a/src/x87/builtins-x87.cc b/src/x87/builtins-x87.cc |
index 317166b294c433a5187f7e5251fb56aa6f2812ff..a42ce01ae25c534a30f6441922d0548892e02eff 100644 |
--- a/src/x87/builtins-x87.cc |
+++ b/src/x87/builtins-x87.cc |
@@ -2228,6 +2228,11 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode, |
__ CmpInstanceType(ecx, JS_BOUND_FUNCTION_TYPE); |
__ j(equal, masm->isolate()->builtins()->CallBoundFunction(tail_call_mode), |
RelocInfo::CODE_TARGET); |
+ |
+ // Check if target has a [[Call]] internal method. |
+ __ test_b(FieldOperand(ecx, Map::kBitFieldOffset), 1 << Map::kIsCallable); |
+ __ j(zero, &non_callable); |
+ |
__ CmpInstanceType(ecx, JS_PROXY_TYPE); |
__ j(not_equal, &non_function); |
@@ -2250,9 +2255,6 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode, |
// 2. Call to something else, which might have a [[Call]] internal method (if |
// not we raise an exception). |
__ bind(&non_function); |
- // Check if target has a [[Call]] internal method. |
- __ test_b(FieldOperand(ecx, Map::kBitFieldOffset), 1 << Map::kIsCallable); |
- __ j(zero, &non_callable, Label::kNear); |
// Overwrite the original receiver with the (original) target. |
__ mov(Operand(esp, eax, times_pointer_size, kPointerSize), edi); |
// Let the "call_as_function_delegate" take care of the rest. |