commit f91f0611dbaf29ca0f1d4aecb357ce243a19d2fa
author Ben Murdoch <benm@google.com> Tue Nov 29 16:50:11 2016 +0000
committer Ben Murdoch <benm@google.com> Thu Jan 12 12:33:05 2017 +0000
tree d24b57d9c6d116ea509c621669f8ed7ed8658d3f
parent 28ba1faee73929922c84d2503d2467afa1fea3c3

Merge V8 5.4.500.40

Test: Manual - built & ran d8
Change-Id: I4edfa2853d3e565b729723645395688ece3193f4

src/ast/variables.cc

diff --git a/src/ast/variables.cc b/src/ast/variables.cc
index 9048f79..0541f94 100644
--- a/src/ast/variables.cc
+++ b/src/ast/variables.cc
@@ -4,8 +4,8 @@
 
 #include "src/ast/variables.h"
 
-#include "src/ast/ast.h"
 #include "src/ast/scopes.h"
+#include "src/globals.h"
 
 namespace v8 {
 namespace internal {
@@ -28,7 +28,6 @@
   return NULL;
 }
 
-
 Variable::Variable(Scope* scope, const AstRawString* name, VariableMode mode,
                    Kind kind, InitializationFlag initialization_flag,
                    MaybeAssignedFlag maybe_assigned_flag)
@@ -38,7 +37,7 @@
       kind_(kind),
       location_(VariableLocation::UNALLOCATED),
       index_(-1),
-      initializer_position_(RelocInfo::kNoPosition),
+      initializer_position_(kNoSourcePosition),
       local_if_not_shadowed_(NULL),
       force_context_allocation_(false),
       is_used_(false),
@@ -54,7 +53,7 @@
   // activation frame.
   return (IsDynamicVariableMode(mode_) ||
           (IsDeclaredVariableMode(mode_) && !IsLexicalVariableMode(mode_))) &&
-         scope_ != NULL && scope_->is_script_scope() && !is_this();
+         scope_ != NULL && scope_->is_script_scope();
 }
 
 
@@ -62,7 +61,7 @@
   // Temporaries are never global, they must always be allocated in the
   // activation frame.
   return (IsDeclaredVariableMode(mode_) && !IsLexicalVariableMode(mode_)) &&
-         scope_ != NULL && scope_->is_script_scope() && !is_this();
+         scope_ != NULL && scope_->is_script_scope();
 }