Index: src/arm/builtins-arm.cc |
diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc |
index b9ba08eb42ec503ce53bb354e6d1ac9680a547f3..f028cad5ace535e2e064b8edc56bbfdf0c3b9159 100644 |
--- a/src/arm/builtins-arm.cc |
+++ b/src/arm/builtins-arm.cc |
@@ -1682,14 +1682,11 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) { |
__ CompareObjectType(r1, r4, r5, JS_FUNCTION_TYPE); |
__ Jump(masm->isolate()->builtins()->CallFunction(mode), |
RelocInfo::CODE_TARGET, eq); |
- __ cmp(r5, Operand(JS_FUNCTION_PROXY_TYPE)); |
+ __ cmp(r5, Operand(JS_PROXY_TYPE)); |
__ b(ne, &non_function); |
- // 1. Call to function proxy. |
- // TODO(neis): This doesn't match the ES6 spec for [[Call]] on proxies. |
- __ ldr(r1, FieldMemOperand(r1, JSFunctionProxy::kCallTrapOffset)); |
- __ AssertNotSmi(r1); |
- __ b(&non_smi); |
+ // 1. Call to Proxy. |
+ // TODO(neis): Implement [[Call]] on proxies. |
// 2. Call to something else, which might have a [[Call]] internal method (if |
// not we raise an exception). |
@@ -1741,13 +1738,12 @@ void Builtins::Generate_ConstructFunction(MacroAssembler* masm) { |
void Builtins::Generate_ConstructProxy(MacroAssembler* masm) { |
// ----------- S t a t e ------------- |
// -- r0 : the number of arguments (not including the receiver) |
- // -- r1 : the constructor to call (checked to be a JSFunctionProxy) |
+ // -- r1 : the constructor to call (checked to be a JSProxy) |
// -- r3 : the new target (either the same as the constructor or |
// the JSFunction on which new was invoked initially) |
// ----------------------------------- |
// TODO(neis): This doesn't match the ES6 spec for [[Construct]] on proxies. |
- __ ldr(r1, FieldMemOperand(r1, JSFunctionProxy::kConstructTrapOffset)); |
__ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET); |
} |
@@ -1769,7 +1765,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) { |
__ CompareObjectType(r1, r4, r5, JS_FUNCTION_TYPE); |
__ Jump(masm->isolate()->builtins()->ConstructFunction(), |
RelocInfo::CODE_TARGET, eq); |
- __ cmp(r5, Operand(JS_FUNCTION_PROXY_TYPE)); |
+ __ cmp(r5, Operand(JS_PROXY_TYPE)); |
__ Jump(masm->isolate()->builtins()->ConstructProxy(), RelocInfo::CODE_TARGET, |
eq); |