| Index: src/arm/full-codegen-arm.cc
|
| diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
|
| index d40833f8ede636f70b64c9cd2c5b402d14b2937c..98303ce39f7b806da5db3e49e7673859c79f04eb 100644
|
| --- a/src/arm/full-codegen-arm.cc
|
| +++ b/src/arm/full-codegen-arm.cc
|
| @@ -2964,6 +2964,14 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) {
|
| }
|
|
|
|
|
| +void FullCodeGenerator::EmitLoadSuperConstructor(SuperReference* expr) {
|
| + DCHECK(super_ref != NULL);
|
| + __ ldr(r0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| + __ Push(r0);
|
| + __ CallRuntime(Runtime::kGetPrototype, 1);
|
| +}
|
| +
|
| +
|
| void FullCodeGenerator::VisitCall(Call* expr) {
|
| #ifdef DEBUG
|
| // We want to verify that RecordJSReturnSite gets called on all paths
|
| @@ -3081,10 +3089,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
|
| }
|
| } else if (call_type == Call::SUPER_CALL) {
|
| SuperReference* super_ref = callee->AsSuperReference();
|
| - DCHECK(super_ref != NULL);
|
| - __ ldr(r0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| - __ Push(r0);
|
| - __ CallRuntime(Runtime::kGetPrototype, 1);
|
| + EmitLoadSuperConstructor(super_ref);
|
| __ Push(result_register());
|
| VisitForStackValue(super_ref->this_var());
|
| EmitCall(expr, CallICState::METHOD);
|
| @@ -3116,7 +3121,12 @@ void FullCodeGenerator::VisitCallNew(CallNew* expr) {
|
| // Push constructor on the stack. If it's not a function it's used as
|
| // receiver for CALL_NON_FUNCTION, otherwise the value on the stack is
|
| // ignored.
|
| - VisitForStackValue(expr->expression());
|
| + if (expr->expression()->IsSuperReference()) {
|
| + EmitLoadSuperConstructor(expr->expression()->AsSuperReference());
|
| + __ Push(result_register());
|
| + } else {
|
| + VisitForStackValue(expr->expression());
|
| + }
|
|
|
| // Push the arguments ("left-to-right") on the stack.
|
| ZoneList<Expression*>* args = expr->arguments();
|
|
|