Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Unified Diff: src/full-codegen/x87/full-codegen-x87.cc

Issue 2209573002: Separate Scope into DeclarationScope and Scope (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Move has_simple_parameters_ to DeclarationScope Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/full-codegen/x87/full-codegen-x87.cc
diff --git a/src/full-codegen/x87/full-codegen-x87.cc b/src/full-codegen/x87/full-codegen-x87.cc
index 2e90ca1a8317753496f6541c54f83f787106b199..041092e35e906d909b664766d3b1e815c2bbd901 100644
--- a/src/full-codegen/x87/full-codegen-x87.cc
+++ b/src/full-codegen/x87/full-codegen-x87.cc
@@ -196,7 +196,8 @@ void FullCodeGenerator::Generate() {
int num_parameters = info->scope()->num_parameters();
int first_parameter = info->scope()->has_this_declaration() ? -1 : 0;
for (int i = first_parameter; i < num_parameters; i++) {
- Variable* var = (i == -1) ? scope()->receiver() : scope()->parameter(i);
+ Variable* var =
+ (i == -1) ? info->scope()->receiver() : info->scope()->parameter(i);
if (var->IsContextSlot()) {
int parameter_offset = StandardFrameConstants::kCallerSPOffset +
(num_parameters - 1 - i) * kPointerSize;
@@ -227,7 +228,7 @@ void FullCodeGenerator::Generate() {
// Possibly set up a local binding to the this function which is used in
// derived constructors with super calls.
- Variable* this_function_var = scope()->this_function_var();
+ Variable* this_function_var = info->scope()->this_function_var();
if (this_function_var != nullptr) {
Comment cmnt(masm_, "[ This function");
if (!function_in_register) {
@@ -238,7 +239,7 @@ void FullCodeGenerator::Generate() {
}
// Possibly set up a local binding to the new target value.
- Variable* new_target_var = scope()->new_target_var();
+ Variable* new_target_var = info->scope()->new_target_var();
if (new_target_var != nullptr) {
Comment cmnt(masm_, "[ new.target");
SetVar(new_target_var, edx, ebx, ecx);
@@ -246,7 +247,7 @@ void FullCodeGenerator::Generate() {
// Possibly allocate RestParameters
int rest_index;
- Variable* rest_param = scope()->rest_parameter(&rest_index);
+ Variable* rest_param = info->scope()->rest_parameter(&rest_index);
if (rest_param) {
Comment cmnt(masm_, "[ Allocate rest parameter array");
if (!function_in_register) {
@@ -258,7 +259,7 @@ void FullCodeGenerator::Generate() {
SetVar(rest_param, eax, ebx, edx);
}
- Variable* arguments = scope()->arguments();
+ Variable* arguments = info->scope()->arguments();
if (arguments != NULL) {
// Arguments object must be allocated after the context object, in
// case the "arguments" or ".arguments" variables are in the context.
@@ -3517,7 +3518,7 @@ void FullCodeGenerator::LoadContextField(Register dst, int context_index) {
void FullCodeGenerator::PushFunctionArgumentForContextAllocation() {
- Scope* closure_scope = scope()->ClosureScope();
+ DeclarationScope* closure_scope = scope()->GetClosureScope();
if (closure_scope->is_script_scope() ||
closure_scope->is_module_scope()) {
// Contexts nested in the native context have a canonical empty function
« src/ast/scopes.cc ('K') | « src/full-codegen/x64/full-codegen-x64.cc ('k') | src/globals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698