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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 index_(-1), | 43 index_(-1), |
44 initializer_position_(RelocInfo::kNoPosition), | 44 initializer_position_(RelocInfo::kNoPosition), |
45 has_strong_mode_reference_(false), | 45 has_strong_mode_reference_(false), |
46 strong_mode_reference_start_position_(RelocInfo::kNoPosition), | 46 strong_mode_reference_start_position_(RelocInfo::kNoPosition), |
47 strong_mode_reference_end_position_(RelocInfo::kNoPosition), | 47 strong_mode_reference_end_position_(RelocInfo::kNoPosition), |
48 local_if_not_shadowed_(NULL), | 48 local_if_not_shadowed_(NULL), |
49 force_context_allocation_(false), | 49 force_context_allocation_(false), |
50 is_used_(false), | 50 is_used_(false), |
51 initialization_flag_(initialization_flag), | 51 initialization_flag_(initialization_flag), |
52 maybe_assigned_(maybe_assigned_flag) { | 52 maybe_assigned_(maybe_assigned_flag) { |
| 53 if (scope && scope->is_function_body_scope()) { |
| 54 // The function body is the proper declaration scope, however, the |
| 55 // declaration is added to the outer scope in order to ensure allocation |
| 56 // works correctly. Mark the scope as the outer scope here so that |
| 57 // checking the declaration context works. |
| 58 scope_ = scope->outer_scope(); |
| 59 DCHECK(scope_->is_function_scope()); |
| 60 } |
| 61 |
53 // Var declared variables never need initialization. | 62 // Var declared variables never need initialization. |
54 DCHECK(!(mode == VAR && initialization_flag == kNeedsInitialization)); | 63 DCHECK(!(mode == VAR && initialization_flag == kNeedsInitialization)); |
55 } | 64 } |
56 | 65 |
57 | 66 |
58 bool Variable::IsGlobalObjectProperty() const { | 67 bool Variable::IsGlobalObjectProperty() const { |
59 // Temporaries are never global, they must always be allocated in the | 68 // Temporaries are never global, they must always be allocated in the |
60 // activation frame. | 69 // activation frame. |
61 return (IsDynamicVariableMode(mode_) || | 70 return (IsDynamicVariableMode(mode_) || |
62 (IsDeclaredVariableMode(mode_) && !IsLexicalVariableMode(mode_))) | 71 (IsDeclaredVariableMode(mode_) && !IsLexicalVariableMode(mode_))) |
63 && scope_ != NULL && scope_->is_script_scope(); | 72 && scope_ != NULL && scope_->is_script_scope(); |
64 } | 73 } |
65 | 74 |
66 | 75 |
67 int Variable::CompareIndex(Variable* const* v, Variable* const* w) { | 76 int Variable::CompareIndex(Variable* const* v, Variable* const* w) { |
68 int x = (*v)->index(); | 77 int x = (*v)->index(); |
69 int y = (*w)->index(); | 78 int y = (*w)->index(); |
70 // Consider sorting them according to type as well? | 79 // Consider sorting them according to type as well? |
71 return x - y; | 80 return x - y; |
72 } | 81 } |
73 | 82 |
74 } } // namespace v8::internal | 83 } } // namespace v8::internal |
OLD | NEW |