Commit 9afacc32 authored by cdai2's avatar cdai2

X87: Refactor lexical home object binding.

port 345fa142 (r28802).

    port of r28769 overwrite some of r28802 so we port them again.

original commit message:

    Before this we had 3 super related lexical bindings that got injected
    into method bodies: .home_object, .this_function,  and new.target.
    With this change we get rid of the .home_object one in favor of using
    .this_function[home_object_symbol] which allows some simplifications
    throughout the code base.

BUG=
R=weiliang.lin@intel.com

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

Cr-Commit-Position: refs/heads/master@{#28949}
parent c8b7c249
...@@ -231,11 +231,6 @@ void FullCodeGenerator::Generate() { ...@@ -231,11 +231,6 @@ void FullCodeGenerator::Generate() {
} }
} }
Variable* home_object_var = scope()->home_object_var();
if (home_object_var != nullptr) {
__ push(edi);
}
// Possibly set up a local binding to the this function which is used in // Possibly set up a local binding to the this function which is used in
// derived constructors with super calls. // derived constructors with super calls.
Variable* this_function_var = scope()->this_function_var(); Variable* this_function_var = scope()->this_function_var();
...@@ -1915,7 +1910,7 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) { ...@@ -1915,7 +1910,7 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) {
VisitForStackValue( VisitForStackValue(
property->obj()->AsSuperPropertyReference()->this_var()); property->obj()->AsSuperPropertyReference()->this_var());
VisitForAccumulatorValue( VisitForAccumulatorValue(
property->obj()->AsSuperPropertyReference()->home_object_var()); property->obj()->AsSuperPropertyReference()->home_object());
__ push(result_register()); __ push(result_register());
if (expr->is_compound()) { if (expr->is_compound()) {
__ push(MemOperand(esp, kPointerSize)); __ push(MemOperand(esp, kPointerSize));
...@@ -1935,7 +1930,7 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) { ...@@ -1935,7 +1930,7 @@ void FullCodeGenerator::VisitAssignment(Assignment* expr) {
VisitForStackValue( VisitForStackValue(
property->obj()->AsSuperPropertyReference()->this_var()); property->obj()->AsSuperPropertyReference()->this_var());
VisitForStackValue( VisitForStackValue(
property->obj()->AsSuperPropertyReference()->home_object_var()); property->obj()->AsSuperPropertyReference()->home_object());
VisitForAccumulatorValue(property->key()); VisitForAccumulatorValue(property->key());
__ Push(result_register()); __ Push(result_register());
if (expr->is_compound()) { if (expr->is_compound()) {
...@@ -2562,7 +2557,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, ...@@ -2562,7 +2557,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr,
__ push(eax); __ push(eax);
VisitForStackValue(prop->obj()->AsSuperPropertyReference()->this_var()); VisitForStackValue(prop->obj()->AsSuperPropertyReference()->this_var());
VisitForAccumulatorValue( VisitForAccumulatorValue(
prop->obj()->AsSuperPropertyReference()->home_object_var()); prop->obj()->AsSuperPropertyReference()->home_object());
// stack: value, this; eax: home_object // stack: value, this; eax: home_object
Register scratch = ecx; Register scratch = ecx;
Register scratch2 = edx; Register scratch2 = edx;
...@@ -2579,7 +2574,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, ...@@ -2579,7 +2574,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr,
__ push(eax); __ push(eax);
VisitForStackValue(prop->obj()->AsSuperPropertyReference()->this_var()); VisitForStackValue(prop->obj()->AsSuperPropertyReference()->this_var());
VisitForStackValue( VisitForStackValue(
prop->obj()->AsSuperPropertyReference()->home_object_var()); prop->obj()->AsSuperPropertyReference()->home_object());
VisitForAccumulatorValue(prop->key()); VisitForAccumulatorValue(prop->key());
Register scratch = ecx; Register scratch = ecx;
Register scratch2 = edx; Register scratch2 = edx;
...@@ -2803,7 +2798,7 @@ void FullCodeGenerator::VisitProperty(Property* expr) { ...@@ -2803,7 +2798,7 @@ void FullCodeGenerator::VisitProperty(Property* expr) {
} else { } else {
VisitForStackValue(expr->obj()->AsSuperPropertyReference()->this_var()); VisitForStackValue(expr->obj()->AsSuperPropertyReference()->this_var());
VisitForStackValue( VisitForStackValue(
expr->obj()->AsSuperPropertyReference()->home_object_var()); expr->obj()->AsSuperPropertyReference()->home_object());
EmitNamedSuperPropertyLoad(expr); EmitNamedSuperPropertyLoad(expr);
} }
} else { } else {
...@@ -2816,7 +2811,7 @@ void FullCodeGenerator::VisitProperty(Property* expr) { ...@@ -2816,7 +2811,7 @@ void FullCodeGenerator::VisitProperty(Property* expr) {
} else { } else {
VisitForStackValue(expr->obj()->AsSuperPropertyReference()->this_var()); VisitForStackValue(expr->obj()->AsSuperPropertyReference()->this_var());
VisitForStackValue( VisitForStackValue(
expr->obj()->AsSuperPropertyReference()->home_object_var()); expr->obj()->AsSuperPropertyReference()->home_object());
VisitForStackValue(expr->key()); VisitForStackValue(expr->key());
EmitKeyedSuperPropertyLoad(expr); EmitKeyedSuperPropertyLoad(expr);
} }
...@@ -2875,7 +2870,7 @@ void FullCodeGenerator::EmitSuperCallWithLoadIC(Call* expr) { ...@@ -2875,7 +2870,7 @@ void FullCodeGenerator::EmitSuperCallWithLoadIC(Call* expr) {
DCHECK(!key->value()->IsSmi()); DCHECK(!key->value()->IsSmi());
// Load the function from the receiver. // Load the function from the receiver.
SuperPropertyReference* super_ref = prop->obj()->AsSuperPropertyReference(); SuperPropertyReference* super_ref = prop->obj()->AsSuperPropertyReference();
VisitForStackValue(super_ref->home_object_var()); VisitForStackValue(super_ref->home_object());
VisitForAccumulatorValue(super_ref->this_var()); VisitForAccumulatorValue(super_ref->this_var());
__ push(eax); __ push(eax);
__ push(eax); __ push(eax);
...@@ -2931,7 +2926,7 @@ void FullCodeGenerator::EmitKeyedSuperCallWithLoadIC(Call* expr) { ...@@ -2931,7 +2926,7 @@ void FullCodeGenerator::EmitKeyedSuperCallWithLoadIC(Call* expr) {
SetSourcePosition(prop->position()); SetSourcePosition(prop->position());
// Load the function from the receiver. // Load the function from the receiver.
SuperPropertyReference* super_ref = prop->obj()->AsSuperPropertyReference(); SuperPropertyReference* super_ref = prop->obj()->AsSuperPropertyReference();
VisitForStackValue(super_ref->home_object_var()); VisitForStackValue(super_ref->home_object());
VisitForAccumulatorValue(super_ref->this_var()); VisitForAccumulatorValue(super_ref->this_var());
__ push(eax); __ push(eax);
__ push(eax); __ push(eax);
...@@ -4822,7 +4817,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { ...@@ -4822,7 +4817,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
case NAMED_SUPER_PROPERTY: { case NAMED_SUPER_PROPERTY: {
VisitForStackValue(prop->obj()->AsSuperPropertyReference()->this_var()); VisitForStackValue(prop->obj()->AsSuperPropertyReference()->this_var());
VisitForAccumulatorValue( VisitForAccumulatorValue(
prop->obj()->AsSuperPropertyReference()->home_object_var()); prop->obj()->AsSuperPropertyReference()->home_object());
__ push(result_register()); __ push(result_register());
__ push(MemOperand(esp, kPointerSize)); __ push(MemOperand(esp, kPointerSize));
__ push(result_register()); __ push(result_register());
...@@ -4833,7 +4828,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { ...@@ -4833,7 +4828,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
case KEYED_SUPER_PROPERTY: { case KEYED_SUPER_PROPERTY: {
VisitForStackValue(prop->obj()->AsSuperPropertyReference()->this_var()); VisitForStackValue(prop->obj()->AsSuperPropertyReference()->this_var());
VisitForStackValue( VisitForStackValue(
prop->obj()->AsSuperPropertyReference()->home_object_var()); prop->obj()->AsSuperPropertyReference()->home_object());
VisitForAccumulatorValue(prop->key()); VisitForAccumulatorValue(prop->key());
__ push(result_register()); __ push(result_register());
__ push(MemOperand(esp, 2 * kPointerSize)); __ push(MemOperand(esp, 2 * kPointerSize));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment