Index: src/x64/builtins-x64.cc |
diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc |
index b83840b8222a86f4b0b8b29c331a5f7c98fd67f3..d56b9a61af9455a1ee52373f6f81ed305b250543 100644 |
--- a/src/x64/builtins-x64.cc |
+++ b/src/x64/builtins-x64.cc |
@@ -1749,13 +1749,11 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) { |
__ CmpObjectType(rdi, JS_FUNCTION_TYPE, rcx); |
__ j(equal, masm->isolate()->builtins()->CallFunction(mode), |
RelocInfo::CODE_TARGET); |
- __ CmpInstanceType(rcx, JS_FUNCTION_PROXY_TYPE); |
+ __ CmpInstanceType(rcx, JS_PROXY_TYPE); |
__ j(not_equal, &non_function); |
// 1. Call to function proxy. |
- // TODO(neis): This doesn't match the ES6 spec for [[Call]] on proxies. |
- __ movp(rdi, FieldOperand(rdi, JSFunctionProxy::kCallTrapOffset)); |
- __ AssertNotSmi(rdi); |
+ // TODO(neis): Implement [[Call]] on proxies. |
__ jmp(&non_smi); |
Toon Verwaest
2015/12/03 11:48:42
drop branch
Camillo Bruni
2015/12/03 12:18:26
done
|
// 2. Call to something else, which might have a [[Call]] internal method (if |
@@ -1811,11 +1809,10 @@ void Builtins::Generate_ConstructProxy(MacroAssembler* masm) { |
// -- rax : the number of arguments (not including the receiver) |
// -- rdx : the new target (either the same as the constructor or |
// the JSFunction on which new was invoked initially) |
- // -- rdi : the constructor to call (checked to be a JSFunctionProxy) |
+ // -- rdi : the constructor to call (checked to be a JSProxy) |
// ----------------------------------- |
// TODO(neis): This doesn't match the ES6 spec for [[Construct]] on proxies. |
- __ movp(rdi, FieldOperand(rdi, JSFunctionProxy::kConstructTrapOffset)); |
__ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET); |
} |
@@ -1838,7 +1835,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) { |
__ CmpObjectType(rdi, JS_FUNCTION_TYPE, rcx); |
__ j(equal, masm->isolate()->builtins()->ConstructFunction(), |
RelocInfo::CODE_TARGET); |
- __ CmpInstanceType(rcx, JS_FUNCTION_PROXY_TYPE); |
+ __ CmpInstanceType(rcx, JS_PROXY_TYPE); |
__ j(equal, masm->isolate()->builtins()->ConstructProxy(), |
RelocInfo::CODE_TARGET); |