Index: src/ppc/builtins-ppc.cc |
diff --git a/src/ppc/builtins-ppc.cc b/src/ppc/builtins-ppc.cc |
index bc67762f277cbb50a504e3386aeb74ee96211157..57c3574a95a95e211f562da3ce726658de158a9a 100644 |
--- a/src/ppc/builtins-ppc.cc |
+++ b/src/ppc/builtins-ppc.cc |
@@ -1695,14 +1695,11 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) { |
__ CompareObjectType(r4, r7, r8, JS_FUNCTION_TYPE); |
__ Jump(masm->isolate()->builtins()->CallFunction(mode), |
RelocInfo::CODE_TARGET, eq); |
- __ cmpi(r8, Operand(JS_FUNCTION_PROXY_TYPE)); |
+ __ cmpi(r8, Operand(JS_PROXY_TYPE)); |
__ bne(&non_function); |
// 1. Call to function proxy. |
- // TODO(neis): This doesn't match the ES6 spec for [[Call]] on proxies. |
- __ LoadP(r4, FieldMemOperand(r4, JSFunctionProxy::kCallTrapOffset)); |
- __ AssertNotSmi(r4); |
- __ b(&non_smi); |
+ // TODO(neis): Implement [[Call]] on proxies. |
// 2. Call to something else, which might have a [[Call]] internal method (if |
// not we raise an exception). |
@@ -1756,13 +1753,12 @@ void Builtins::Generate_ConstructFunction(MacroAssembler* masm) { |
void Builtins::Generate_ConstructProxy(MacroAssembler* masm) { |
// ----------- S t a t e ------------- |
// -- r3 : the number of arguments (not including the receiver) |
- // -- r4 : the constructor to call (checked to be a JSFunctionProxy) |
+ // -- r4 : the constructor to call (checked to be a JSProxy) |
// -- r6 : 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. |
- __ LoadP(r4, FieldMemOperand(r4, JSFunctionProxy::kConstructTrapOffset)); |
__ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET); |
} |
@@ -1784,7 +1780,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) { |
__ CompareObjectType(r4, r7, r8, JS_FUNCTION_TYPE); |
__ Jump(masm->isolate()->builtins()->ConstructFunction(), |
RelocInfo::CODE_TARGET, eq); |
- __ cmpi(r8, Operand(JS_FUNCTION_PROXY_TYPE)); |
+ __ cmpi(r8, Operand(JS_PROXY_TYPE)); |
__ Jump(masm->isolate()->builtins()->ConstructProxy(), RelocInfo::CODE_TARGET, |
eq); |