Index: src/ppc/builtins-ppc.cc |
diff --git a/src/ppc/builtins-ppc.cc b/src/ppc/builtins-ppc.cc |
index 800941134346d4ab20992ea57c3daae0bd0768d7..61806e50c86160821d5bf48f1b7f7ea8f7b373f8 100644 |
--- a/src/ppc/builtins-ppc.cc |
+++ b/src/ppc/builtins-ppc.cc |
@@ -1705,13 +1705,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); |
+ // TODO(neis): Implementy [[Call]] on proxies. |
__ b(&non_smi); |
Toon Verwaest
2015/12/03 11:48:42
drop branch (Implementy?)
Camillo Bruni
2015/12/03 12:18:26
done
|
// 2. Call to something else, which might have a [[Call]] internal method (if |
@@ -1766,13 +1764,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); |
} |
@@ -1794,7 +1791,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); |