diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:25:14 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:56:31 +0100 |
| commit | 6313e1fe4c27755adde87e62db1c2f9fac534ae4 (patch) | |
| tree | c57bb29f65e02fbfcc07895a8cc2903fff9300ba /src/3rdparty/v8/src/variables.cc | |
| parent | b5a49a260d03249c386f1b63c249089383dd81fa (diff) | |
| parent | cac65e7a222b848a735a974b0aeb43209b0cfa18 (diff) | |
| download | qtjsbackend-6313e1fe4c27755adde87e62db1c2f9fac534ae4.tar.gz | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I892bbc73c276842894a720f761ce31ad1b015672
Diffstat (limited to 'src/3rdparty/v8/src/variables.cc')
| -rw-r--r-- | src/3rdparty/v8/src/variables.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/3rdparty/v8/src/variables.cc b/src/3rdparty/v8/src/variables.cc index 4984cbd..3e735d6 100644 --- a/src/3rdparty/v8/src/variables.cc +++ b/src/3rdparty/v8/src/variables.cc @@ -41,7 +41,7 @@ const char* Variable::Mode2String(VariableMode mode) { switch (mode) { case VAR: return "VAR"; case CONST: return "CONST"; - case CONST_HARMONY: return "CONST"; + case CONST_HARMONY: return "CONST_HARMONY"; case LET: return "LET"; case DYNAMIC: return "DYNAMIC"; case DYNAMIC_GLOBAL: return "DYNAMIC_GLOBAL"; @@ -82,10 +82,11 @@ Variable::Variable(Scope* scope, } -bool Variable::is_global() const { +bool Variable::IsGlobalObjectProperty() const { // Temporaries are never global, they must always be allocated in the // activation frame. - return mode_ != TEMPORARY && scope_ != NULL && scope_->is_global_scope(); + return mode_ != TEMPORARY && !IsLexicalVariableMode(mode_) + && scope_ != NULL && scope_->is_global_scope(); } |