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

objects.h splitting side work: move scopeinfo.cc to its logical place.

Browse Source 
src/ast/scopeinfo.cc -> src/objects/scope-info.cc

BUG=v8:5402

Review-Url: https://codereview.chromium.org/2637793002
Cr-Commit-Position: refs/heads/master@{#42357}
This commit is contained in:
marja 2017-01-16 02:30:59 -08:00 committed by Commit bot
parent c4a35ed7e8
commit 4fb60b2158
3 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -948,7 +948,6 @@ v8_source_set("v8_base") {
"src/ast/modules.h", "src/ast/modules.h",
"src/ast/prettyprinter.cc", "src/ast/prettyprinter.cc",
"src/ast/prettyprinter.h", "src/ast/prettyprinter.h",
"src/ast/scopeinfo.cc",
"src/ast/scopes.cc", "src/ast/scopes.cc",
"src/ast/scopes.h", "src/ast/scopes.h",
"src/ast/variables.cc", "src/ast/variables.cc",
@ -1570,6 +1569,7 @@ v8_source_set("v8_base") {
"src/objects/module-info.h", "src/objects/module-info.h",
"src/objects/object-macros-undef.h", "src/objects/object-macros-undef.h",
"src/objects/object-macros.h", "src/objects/object-macros.h",
"src/objects/scope-info.cc",
"src/objects/scope-info.h", "src/objects/scope-info.h",
"src/ostreams.cc", "src/ostreams.cc",
"src/ostreams.h", "src/ostreams.h",

44
src/ast/scopeinfo.cc → src/objects/scope-info.cc
View File

@ -396,37 +396,28 @@ Handle<ScopeInfo> ScopeInfo::CreateGlobalThisBinding(Isolate* isolate) {
return scope_info; return scope_info;
} }
ScopeInfo* ScopeInfo::Empty(Isolate* isolate) { ScopeInfo* ScopeInfo::Empty(Isolate* isolate) {
return isolate->heap()->empty_scope_info(); return isolate->heap()->empty_scope_info();
} }
ScopeType ScopeInfo::scope_type() { ScopeType ScopeInfo::scope_type() {
DCHECK_LT(0, length()); DCHECK_LT(0, length());
return ScopeTypeField::decode(Flags()); return ScopeTypeField::decode(Flags());
} }
bool ScopeInfo::CallsEval() { bool ScopeInfo::CallsEval() {
return length() > 0 && CallsEvalField::decode(Flags()); return length() > 0 && CallsEvalField::decode(Flags());
} }
LanguageMode ScopeInfo::language_mode() { LanguageMode ScopeInfo::language_mode() {
return length() > 0 ? LanguageModeField::decode(Flags()) : SLOPPY; return length() > 0 ? LanguageModeField::decode(Flags()) : SLOPPY;
} }
bool ScopeInfo::is_declaration_scope() { bool ScopeInfo::is_declaration_scope() {
return DeclarationScopeField::decode(Flags()); return DeclarationScopeField::decode(Flags());
} }
int ScopeInfo::LocalCount() { return StackLocalCount() + ContextLocalCount(); }
int ScopeInfo::LocalCount() {
return StackLocalCount() + ContextLocalCount();
}
int ScopeInfo::StackSlotCount() { int ScopeInfo::StackSlotCount() {
if (length() > 0) { if (length() > 0) {
@ -437,7 +428,6 @@ int ScopeInfo::StackSlotCount() {
return 0; return 0;
} }
int ScopeInfo::ContextLength() { int ScopeInfo::ContextLength() {
if (length() > 0) { if (length() > 0) {
int context_locals = ContextLocalCount(); int context_locals = ContextLocalCount();
@ -459,7 +449,6 @@ int ScopeInfo::ContextLength() {
return 0; return 0;
} }
bool ScopeInfo::HasReceiver() { bool ScopeInfo::HasReceiver() {
if (length() > 0) { if (length() > 0) {
return NONE != ReceiverVariableField::decode(Flags()); return NONE != ReceiverVariableField::decode(Flags());
@ -468,7 +457,6 @@ bool ScopeInfo::HasReceiver() {
} }
} }
bool ScopeInfo::HasAllocatedReceiver() { bool ScopeInfo::HasAllocatedReceiver() {
if (length() > 0) { if (length() > 0) {
VariableAllocationInfo allocation = ReceiverVariableField::decode(Flags()); VariableAllocationInfo allocation = ReceiverVariableField::decode(Flags());
@ -478,10 +466,8 @@ bool ScopeInfo::HasAllocatedReceiver() {
} }
} }
bool ScopeInfo::HasNewTarget() { return HasNewTargetField::decode(Flags()); } bool ScopeInfo::HasNewTarget() { return HasNewTargetField::decode(Flags()); }
bool ScopeInfo::HasFunctionName() { bool ScopeInfo::HasFunctionName() {
if (length() > 0) { if (length() > 0) {
return NONE != FunctionVariableField::decode(Flags()); return NONE != FunctionVariableField::decode(Flags());
@ -523,11 +509,7 @@ bool ScopeInfo::HasHeapAllocatedLocals() {
} }
} }
bool ScopeInfo::HasContext() { return ContextLength() > 0; }
bool ScopeInfo::HasContext() {
return ContextLength() > 0;
}
String* ScopeInfo::FunctionName() { String* ScopeInfo::FunctionName() {
DCHECK(HasFunctionName()); DCHECK(HasFunctionName());
@ -551,7 +533,6 @@ String* ScopeInfo::ParameterName(int var) {
return String::cast(get(info_index)); return String::cast(get(info_index));
} }
String* ScopeInfo::LocalName(int var) { String* ScopeInfo::LocalName(int var) {
DCHECK_LE(0, var); DCHECK_LE(0, var);
DCHECK_LT(var, LocalCount()); DCHECK_LT(var, LocalCount());
@ -561,7 +542,6 @@ String* ScopeInfo::LocalName(int var) {
return String::cast(get(info_index)); return String::cast(get(info_index));
} }
String* ScopeInfo::StackLocalName(int var) { String* ScopeInfo::StackLocalName(int var) {
DCHECK_LE(0, var); DCHECK_LE(0, var);
DCHECK_LT(var, StackLocalCount()); DCHECK_LT(var, StackLocalCount());
@ -569,7 +549,6 @@ String* ScopeInfo::StackLocalName(int var) {
return String::cast(get(info_index)); return String::cast(get(info_index));
} }
int ScopeInfo::StackLocalIndex(int var) { int ScopeInfo::StackLocalIndex(int var) {
DCHECK_LE(0, var); DCHECK_LE(0, var);
DCHECK_LT(var, StackLocalCount()); DCHECK_LT(var, StackLocalCount());
@ -577,7 +556,6 @@ int ScopeInfo::StackLocalIndex(int var) {
return first_slot_index + var; return first_slot_index + var;
} }
String* ScopeInfo::ContextLocalName(int var) { String* ScopeInfo::ContextLocalName(int var) {
DCHECK_LE(0, var); DCHECK_LE(0, var);
DCHECK_LT(var, ContextLocalCount()); DCHECK_LT(var, ContextLocalCount());
@ -585,7 +563,6 @@ String* ScopeInfo::ContextLocalName(int var) {
return String::cast(get(info_index)); return String::cast(get(info_index));
} }
VariableMode ScopeInfo::ContextLocalMode(int var) { VariableMode ScopeInfo::ContextLocalMode(int var) {
DCHECK_LE(0, var); DCHECK_LE(0, var);
DCHECK_LT(var, ContextLocalCount()); DCHECK_LT(var, ContextLocalCount());
@ -594,7 +571,6 @@ VariableMode ScopeInfo::ContextLocalMode(int var) {
return VariableModeField::decode(value); return VariableModeField::decode(value);
} }
InitializationFlag ScopeInfo::ContextLocalInitFlag(int var) { InitializationFlag ScopeInfo::ContextLocalInitFlag(int var) {
DCHECK_LE(0, var); DCHECK_LE(0, var);
DCHECK_LT(var, ContextLocalCount()); DCHECK_LT(var, ContextLocalCount());
@ -603,7 +579,6 @@ InitializationFlag ScopeInfo::ContextLocalInitFlag(int var) {
return InitFlagField::decode(value); return InitFlagField::decode(value);
} }
MaybeAssignedFlag ScopeInfo::ContextLocalMaybeAssignedFlag(int var) { MaybeAssignedFlag ScopeInfo::ContextLocalMaybeAssignedFlag(int var) {
DCHECK_LE(0, var); DCHECK_LE(0, var);
DCHECK_LT(var, ContextLocalCount()); DCHECK_LT(var, ContextLocalCount());
@ -621,7 +596,6 @@ bool ScopeInfo::VariableIsSynthetic(String* name) {
name->Equals(name->GetHeap()->this_string()); name->Equals(name->GetHeap()->this_string());
} }
int ScopeInfo::StackSlotIndex(String* name) { int ScopeInfo::StackSlotIndex(String* name) {
DCHECK(name->IsInternalizedString()); DCHECK(name->IsInternalizedString());
if (length() > 0) { if (length() > 0) {
@ -710,7 +684,6 @@ String* ScopeInfo::ContextSlotName(int slot_index) {
return ContextLocalName(var); return ContextLocalName(var);
} }
int ScopeInfo::ParameterIndex(String* name) { int ScopeInfo::ParameterIndex(String* name) {
DCHECK(name->IsInternalizedString()); DCHECK(name->IsInternalizedString());
if (length() > 0) { if (length() > 0) {
@ -730,7 +703,6 @@ int ScopeInfo::ParameterIndex(String* name) {
return -1; return -1;
} }
int ScopeInfo::ReceiverContextSlotIndex() { int ScopeInfo::ReceiverContextSlotIndex() {
if (length() > 0 && ReceiverVariableField::decode(Flags()) == CONTEXT) if (length() > 0 && ReceiverVariableField::decode(Flags()) == CONTEXT)
return Smi::cast(get(ReceiverInfoIndex()))->value(); return Smi::cast(get(ReceiverInfoIndex()))->value();
@ -748,7 +720,6 @@ int ScopeInfo::FunctionContextSlotIndex(String* name) {
return -1; return -1;
} }
FunctionKind ScopeInfo::function_kind() { FunctionKind ScopeInfo::function_kind() {
return FunctionKindField::decode(Flags()); return FunctionKindField::decode(Flags());
} }
@ -758,7 +729,6 @@ int ScopeInfo::ParameterNamesIndex() {
return kVariablePartIndex; return kVariablePartIndex;
} }
int ScopeInfo::StackLocalFirstSlotIndex() { int ScopeInfo::StackLocalFirstSlotIndex() {
return ParameterNamesIndex() + ParameterCount(); return ParameterNamesIndex() + ParameterCount();
} }
@ -824,15 +794,12 @@ void ScopeInfo::ModuleVariable(int i, String** name, int* index,
#ifdef DEBUG #ifdef DEBUG
static void PrintList(const char* list_name, static void PrintList(const char* list_name, int nof_internal_slots, int start,
int nof_internal_slots, int end, ScopeInfo* scope_info) {
int start,
int end,
ScopeInfo* scope_info) {
if (start < end) { if (start < end) {
PrintF("\n // %s\n", list_name); PrintF("\n // %s\n", list_name);
if (nof_internal_slots > 0) { if (nof_internal_slots > 0) {
PrintF(" %2d - %2d [internal slots]\n", 0 , nof_internal_slots - 1); PrintF(" %2d - %2d [internal slots]\n", 0, nof_internal_slots - 1);
} }
for (int i = nof_internal_slots; start < end; ++i, ++start) { for (int i = nof_internal_slots; start < end; ++i, ++start) {
PrintF(" %2d ", i); PrintF(" %2d ", i);
@ -842,7 +809,6 @@ static void PrintList(const char* list_name,
} }
} }
void ScopeInfo::Print() { void ScopeInfo::Print() {
PrintF("ScopeInfo "); PrintF("ScopeInfo ");
if (HasFunctionName()) { if (HasFunctionName()) {

2
src/v8.gyp
View File

@ -459,7 +459,6 @@
'ast/modules.h', 'ast/modules.h',
'ast/prettyprinter.cc', 'ast/prettyprinter.cc',
'ast/prettyprinter.h', 'ast/prettyprinter.h',
'ast/scopeinfo.cc',
'ast/scopes.cc', 'ast/scopes.cc',
'ast/scopes.h', 'ast/scopes.h',
'ast/variables.cc', 'ast/variables.cc',
@ -1079,6 +1078,7 @@
'objects/module-info.h', 'objects/module-info.h',
'objects/object-macros.h', 'objects/object-macros.h',
'objects/object-macros-undef.h', 'objects/object-macros-undef.h',
'objects/scope-info.cc',
'objects/scope-info.h', 'objects/scope-info.h',
'ostreams.cc', 'ostreams.cc',
'ostreams.h', 'ostreams.h',