Index: src/ia32/builtins-ia32.cc |
diff --git a/src/ia32/builtins-ia32.cc b/src/ia32/builtins-ia32.cc |
index 688ef13b1f7e6ec02a52872c604177cd4e9c0cce..276c0c717b301571089cc401aeac59059b4d2dae 100644 |
--- a/src/ia32/builtins-ia32.cc |
+++ b/src/ia32/builtins-ia32.cc |
@@ -1552,13 +1552,11 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) { |
__ CmpObjectType(edi, JS_FUNCTION_TYPE, ecx); |
__ j(equal, masm->isolate()->builtins()->CallFunction(mode), |
RelocInfo::CODE_TARGET); |
- __ CmpInstanceType(ecx, JS_FUNCTION_PROXY_TYPE); |
+ __ CmpInstanceType(ecx, 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. |
- __ mov(edi, FieldOperand(edi, JSFunctionProxy::kCallTrapOffset)); |
- __ AssertNotSmi(edi); |
+ // 1. Call to Proxy. |
+ // TODO(neis): Implement [[Call]] on proxies. |
__ jmp(&non_smi); |
Toon Verwaest
2015/12/03 11:48:42
probably want to drop this jmp
Camillo Bruni
2015/12/03 12:18:26
done.
|
// 2. Call to something else, which might have a [[Call]] internal method (if |
@@ -1613,11 +1611,10 @@ void Builtins::Generate_ConstructProxy(MacroAssembler* masm) { |
// -- eax : the number of arguments (not including the receiver) |
// -- edx : the new target (either the same as the constructor or |
// the JSFunction on which new was invoked initially) |
- // -- edi : the constructor to call (checked to be a JSFunctionProxy) |
+ // -- edi : the constructor to call (checked to be a JSProxy) |
// ----------------------------------- |
// TODO(neis): This doesn't match the ES6 spec for [[Construct]] on proxies. |
- __ mov(edi, FieldOperand(edi, JSFunctionProxy::kConstructTrapOffset)); |
__ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET); |
} |
@@ -1639,7 +1636,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) { |
__ CmpObjectType(edi, JS_FUNCTION_TYPE, ecx); |
__ j(equal, masm->isolate()->builtins()->ConstructFunction(), |
RelocInfo::CODE_TARGET); |
- __ CmpInstanceType(ecx, JS_FUNCTION_PROXY_TYPE); |
+ __ CmpInstanceType(ecx, JS_PROXY_TYPE); |
__ j(equal, masm->isolate()->builtins()->ConstructProxy(), |
RelocInfo::CODE_TARGET); |