AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

PPC: [es6] Support super.property in eval and arrow functions

Browse Source 
Port 44e9810345

Original commit message:
When we enter a method that needs access to the [[HomeObject]]
we allocate a local variable `.home_object` and assign it the
value from the [[HomeObject]] private symbol. Something along
the lines of:

  method() {
    var .home_object = %ThisFunction()[home_object_symbol];
    ...
  }

R=arv@chromium.org, dstence@us.ibm.com, michael_dawson@ca.ibm.com
BUG=

Review URL: https://codereview.chromium.org/1161603004

Cr-Commit-Position: refs/heads/master@{#28665}
This commit is contained in:
mbrandy 2015-05-27 10:22:00 -07:00 committed by Commit bot
parent 629d275073
commit 4070b20aee
1 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/ppc/full-codegen-ppc.cc
View File

@ -247,6 +247,11 @@ void FullCodeGenerator::Generate() {
} }
} }
Variable* home_object_var = scope()->home_object_var();
if (home_object_var != nullptr) {
__ Push(r4);
}
ArgumentsAccessStub::HasNewTarget has_new_target = ArgumentsAccessStub::HasNewTarget has_new_target =
IsSubclassConstructor(info->function()->kind()) IsSubclassConstructor(info->function()->kind())
? ArgumentsAccessStub::HAS_NEW_TARGET ? ArgumentsAccessStub::HAS_NEW_TARGET
@ -311,6 +316,19 @@ void FullCodeGenerator::Generate() {
SetVar(arguments, r3, r4, r5); SetVar(arguments, r3, r4, r5);
} }
// Possibly set up a local binding to the [[HomeObject]].
if (home_object_var != nullptr) {
Comment cmnt(masm_, "[ Home object");
__ Pop(LoadDescriptor::ReceiverRegister());
Handle<Symbol> home_object_symbol(isolate()->heap()->home_object_symbol());
__ Move(LoadDescriptor::NameRegister(), home_object_symbol);
__ mov(LoadDescriptor::SlotRegister(),
Operand(SmiFromSlot(function()->HomeObjectFeedbackSlot())));
CallLoadIC(NOT_CONTEXTUAL);
SetVar(home_object_var, r3, r4, r5);
}
if (FLAG_trace) { if (FLAG_trace) {
__ CallRuntime(Runtime::kTraceEnter, 0); __ CallRuntime(Runtime::kTraceEnter, 0);
} }
@ -1285,27 +1303,6 @@ void FullCodeGenerator::VisitVariableProxy(VariableProxy* expr) {
} }
void FullCodeGenerator::EmitLoadHomeObject(SuperReference* expr) {
Comment cnmt(masm_, "[ SuperReference ");
__ LoadP(LoadDescriptor::ReceiverRegister(),
MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
Handle<Symbol> home_object_symbol(isolate()->heap()->home_object_symbol());
__ Move(LoadDescriptor::NameRegister(), home_object_symbol);
__ mov(LoadDescriptor::SlotRegister(),
Operand(SmiFromSlot(expr->HomeObjectFeedbackSlot())));
CallLoadIC(NOT_CONTEXTUAL);
__ Cmpi(r3, Operand(isolate()->factory()->undefined_value()), r0);
Label done;
__ bne(&done);
__ CallRuntime(Runtime::kThrowNonMethodError, 0);
__ bind(&done);
}
void FullCodeGenerator::EmitSetHomeObjectIfNeeded(Expression* initializer, void FullCodeGenerator::EmitSetHomeObjectIfNeeded(Expression* initializer,
int offset) { int offset) {
if (NeedsHomeObject(initializer)) { if (NeedsHomeObject(initializer)) {
@ -1934,7 +1931,8 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) {
break; break;
case NAMED_SUPER_PROPERTY: case NAMED_SUPER_PROPERTY:
VisitForStackValue(property->obj()->AsSuperReference()->this_var()); VisitForStackValue(property->obj()->AsSuperReference()->this_var());
EmitLoadHomeObject(property->obj()->AsSuperReference()); VisitForAccumulatorValue(
property->obj()->AsSuperReference()->home_object_var());
__ Push(result_register()); __ Push(result_register());
if (expr->is_compound()) { if (expr->is_compound()) {
const Register scratch = r4; const Register scratch = r4;
@ -1945,8 +1943,9 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) {
case KEYED_SUPER_PROPERTY: { case KEYED_SUPER_PROPERTY: {
const Register scratch = r4; const Register scratch = r4;
VisitForStackValue(property->obj()->AsSuperReference()->this_var()); VisitForStackValue(property->obj()->AsSuperReference()->this_var());
EmitLoadHomeObject(property->obj()->AsSuperReference()); VisitForAccumulatorValue(
__ Move(scratch, result_register()); property->obj()->AsSuperReference()->home_object_var());
__ mr(scratch, result_register());
VisitForAccumulatorValue(property->key()); VisitForAccumulatorValue(property->key());
__ Push(scratch, result_register()); __ Push(scratch, result_register());
if (expr->is_compound()) { if (expr->is_compound()) {
@ -2623,7 +2622,8 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) {
case NAMED_SUPER_PROPERTY: { case NAMED_SUPER_PROPERTY: {
__ Push(r3); __ Push(r3);
VisitForStackValue(prop->obj()->AsSuperReference()->this_var()); VisitForStackValue(prop->obj()->AsSuperReference()->this_var());
EmitLoadHomeObject(prop->obj()->AsSuperReference()); VisitForAccumulatorValue(
prop->obj()->AsSuperReference()->home_object_var());
// stack: value, this; r3: home_object // stack: value, this; r3: home_object
Register scratch = r5; Register scratch = r5;
Register scratch2 = r6; Register scratch2 = r6;
@ -2639,8 +2639,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) {
case KEYED_SUPER_PROPERTY: { case KEYED_SUPER_PROPERTY: {
__ Push(r3); __ Push(r3);
VisitForStackValue(prop->obj()->AsSuperReference()->this_var()); VisitForStackValue(prop->obj()->AsSuperReference()->this_var());
EmitLoadHomeObject(prop->obj()->AsSuperReference()); VisitForStackValue(prop->obj()->AsSuperReference()->home_object_var());
__ Push(result_register());
VisitForAccumulatorValue(prop->key()); VisitForAccumulatorValue(prop->key());
Register scratch = r5; Register scratch = r5;
Register scratch2 = r6; Register scratch2 = r6;
@ -2851,8 +2850,7 @@ void FullCodeGenerator::VisitProperty(Property* expr) {
EmitNamedPropertyLoad(expr); EmitNamedPropertyLoad(expr);
} else { } else {
VisitForStackValue(expr->obj()->AsSuperReference()->this_var()); VisitForStackValue(expr->obj()->AsSuperReference()->this_var());
EmitLoadHomeObject(expr->obj()->AsSuperReference()); VisitForStackValue(expr->obj()->AsSuperReference()->home_object_var());
__ Push(result_register());
EmitNamedSuperPropertyLoad(expr); EmitNamedSuperPropertyLoad(expr);
} }
} else { } else {
@ -2864,8 +2862,7 @@ void FullCodeGenerator::VisitProperty(Property* expr) {
EmitKeyedPropertyLoad(expr); EmitKeyedPropertyLoad(expr);
} else { } else {
VisitForStackValue(expr->obj()->AsSuperReference()->this_var()); VisitForStackValue(expr->obj()->AsSuperReference()->this_var());
EmitLoadHomeObject(expr->obj()->AsSuperReference()); VisitForStackValue(expr->obj()->AsSuperReference()->home_object_var());
__ Push(result_register());
VisitForStackValue(expr->key()); VisitForStackValue(expr->key());
EmitKeyedSuperPropertyLoad(expr); EmitKeyedSuperPropertyLoad(expr);
} }
@ -2928,7 +2925,7 @@ void FullCodeGenerator::EmitSuperCallWithLoadIC(Call* expr) {
// Load the function from the receiver. // Load the function from the receiver.
const Register scratch = r4; const Register scratch = r4;
SuperReference* super_ref = prop->obj()->AsSuperReference(); SuperReference* super_ref = prop->obj()->AsSuperReference();
EmitLoadHomeObject(super_ref); VisitForAccumulatorValue(super_ref->home_object_var());
__ mr(scratch, r3); __ mr(scratch, r3);
VisitForAccumulatorValue(super_ref->this_var()); VisitForAccumulatorValue(super_ref->this_var());
__ Push(scratch, r3, r3, scratch); __ Push(scratch, r3, r3, scratch);
@ -2985,13 +2982,10 @@ void FullCodeGenerator::EmitKeyedSuperCallWithLoadIC(Call* expr) {
// Load the function from the receiver. // Load the function from the receiver.
const Register scratch = r4; const Register scratch = r4;
SuperReference* super_ref = prop->obj()->AsSuperReference(); SuperReference* super_ref = prop->obj()->AsSuperReference();
EmitLoadHomeObject(super_ref); VisitForAccumulatorValue(super_ref->home_object_var());
__ Push(r3); __ mr(scratch, r3);
VisitForAccumulatorValue(super_ref->this_var()); VisitForAccumulatorValue(super_ref->this_var());
__ Push(r3); __ Push(scratch, r3, r3, scratch);
__ Push(r3);
__ LoadP(scratch, MemOperand(sp, kPointerSize * 2));
__ Push(scratch);
VisitForStackValue(prop->key()); VisitForStackValue(prop->key());
// Stack here: // Stack here:
@ -4857,7 +4851,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
case NAMED_SUPER_PROPERTY: { case NAMED_SUPER_PROPERTY: {
VisitForStackValue(prop->obj()->AsSuperReference()->this_var()); VisitForStackValue(prop->obj()->AsSuperReference()->this_var());
EmitLoadHomeObject(prop->obj()->AsSuperReference()); VisitForAccumulatorValue(
prop->obj()->AsSuperReference()->home_object_var());
__ Push(result_register()); __ Push(result_register());
const Register scratch = r4; const Register scratch = r4;
__ LoadP(scratch, MemOperand(sp, kPointerSize)); __ LoadP(scratch, MemOperand(sp, kPointerSize));
@ -4868,10 +4863,11 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
case KEYED_SUPER_PROPERTY: { case KEYED_SUPER_PROPERTY: {
VisitForStackValue(prop->obj()->AsSuperReference()->this_var()); VisitForStackValue(prop->obj()->AsSuperReference()->this_var());
EmitLoadHomeObject(prop->obj()->AsSuperReference()); VisitForAccumulatorValue(
prop->obj()->AsSuperReference()->home_object_var());
const Register scratch = r4; const Register scratch = r4;
const Register scratch1 = r5; const Register scratch1 = r5;
__ Move(scratch, result_register()); __ mr(scratch, result_register());
VisitForAccumulatorValue(prop->key()); VisitForAccumulatorValue(prop->key());
__ Push(scratch, result_register()); __ Push(scratch, result_register());
__ LoadP(scratch1, MemOperand(sp, 2 * kPointerSize)); __ LoadP(scratch1, MemOperand(sp, 2 * kPointerSize));