OLD | NEW |
1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "src/v8.h" | 5 #include "src/v8.h" |
6 | 6 |
7 #include "src/ast.h" | 7 #include "src/ast.h" |
8 #include "src/scopes.h" | 8 #include "src/scopes.h" |
9 #include "src/variables.h" | 9 #include "src/variables.h" |
10 | 10 |
(...skipping 16 matching lines...) Expand all Loading... |
27 case INTERNAL: return "INTERNAL"; | 27 case INTERNAL: return "INTERNAL"; |
28 case TEMPORARY: return "TEMPORARY"; | 28 case TEMPORARY: return "TEMPORARY"; |
29 } | 29 } |
30 UNREACHABLE(); | 30 UNREACHABLE(); |
31 return NULL; | 31 return NULL; |
32 } | 32 } |
33 | 33 |
34 | 34 |
35 Variable::Variable(Scope* scope, const AstRawString* name, VariableMode mode, | 35 Variable::Variable(Scope* scope, const AstRawString* name, VariableMode mode, |
36 Kind kind, InitializationFlag initialization_flag, | 36 Kind kind, InitializationFlag initialization_flag, |
37 MaybeAssignedFlag maybe_assigned_flag) | 37 MaybeAssignedFlag maybe_assigned_flag, |
| 38 int consecutive_declaration_group_start) |
38 : scope_(scope), | 39 : scope_(scope), |
39 name_(name), | 40 name_(name), |
40 mode_(mode), | 41 mode_(mode), |
41 kind_(kind), | 42 kind_(kind), |
42 location_(UNALLOCATED), | 43 location_(UNALLOCATED), |
43 index_(-1), | 44 index_(-1), |
44 initializer_position_(RelocInfo::kNoPosition), | 45 initializer_position_(RelocInfo::kNoPosition), |
45 has_strong_mode_reference_(false), | 46 has_strong_mode_reference_(false), |
46 strong_mode_reference_start_position_(RelocInfo::kNoPosition), | 47 strong_mode_reference_start_position_(RelocInfo::kNoPosition), |
47 strong_mode_reference_end_position_(RelocInfo::kNoPosition), | 48 strong_mode_reference_end_position_(RelocInfo::kNoPosition), |
48 local_if_not_shadowed_(NULL), | 49 local_if_not_shadowed_(NULL), |
49 force_context_allocation_(false), | 50 force_context_allocation_(false), |
50 is_used_(false), | 51 is_used_(false), |
51 initialization_flag_(initialization_flag), | 52 initialization_flag_(initialization_flag), |
52 maybe_assigned_(maybe_assigned_flag) { | 53 maybe_assigned_(maybe_assigned_flag), |
| 54 consecutive_declaration_group_start_(consecutive_declaration_group_start), |
| 55 corresponding_outer_class_variable_(nullptr) { |
53 // Var declared variables never need initialization. | 56 // Var declared variables never need initialization. |
54 DCHECK(!(mode == VAR && initialization_flag == kNeedsInitialization)); | 57 DCHECK(!(mode == VAR && initialization_flag == kNeedsInitialization)); |
55 } | 58 } |
56 | 59 |
57 | 60 |
58 bool Variable::IsGlobalObjectProperty() const { | 61 bool Variable::IsGlobalObjectProperty() const { |
59 // Temporaries are never global, they must always be allocated in the | 62 // Temporaries are never global, they must always be allocated in the |
60 // activation frame. | 63 // activation frame. |
61 return (IsDynamicVariableMode(mode_) || | 64 return (IsDynamicVariableMode(mode_) || |
62 (IsDeclaredVariableMode(mode_) && !IsLexicalVariableMode(mode_))) | 65 (IsDeclaredVariableMode(mode_) && !IsLexicalVariableMode(mode_))) |
63 && scope_ != NULL && scope_->is_script_scope(); | 66 && scope_ != NULL && scope_->is_script_scope(); |
64 } | 67 } |
65 | 68 |
66 | 69 |
67 int Variable::CompareIndex(Variable* const* v, Variable* const* w) { | 70 int Variable::CompareIndex(Variable* const* v, Variable* const* w) { |
68 int x = (*v)->index(); | 71 int x = (*v)->index(); |
69 int y = (*w)->index(); | 72 int y = (*w)->index(); |
70 // Consider sorting them according to type as well? | 73 // Consider sorting them according to type as well? |
71 return x - y; | 74 return x - y; |
72 } | 75 } |
73 | 76 |
74 } } // namespace v8::internal | 77 } } // namespace v8::internal |
OLD | NEW |