Merge V8 5.8.283.32
Test: Build V8 for arm, arm64, x86, x86_64, mips, mips64 and
set a PAC script from the UI on bullhead
Change-Id: I7cc773b5daca34d869e768a1deebae3876f2dfac
diff --git a/src/ast/variables.cc b/src/ast/variables.cc
index 3771bfe..cd1d8f7 100644
--- a/src/ast/variables.cc
+++ b/src/ast/variables.cc
@@ -6,6 +6,7 @@
#include "src/ast/scopes.h"
#include "src/globals.h"
+#include "src/objects-inl.h"
namespace v8 {
namespace internal {
@@ -36,9 +37,8 @@
bool Variable::IsGlobalObjectProperty() const {
// Temporaries are never global, they must always be allocated in the
// activation frame.
- return (IsDynamicVariableMode(mode()) ||
- (IsDeclaredVariableMode(mode()) && !IsLexicalVariableMode(mode()))) &&
- scope_ != NULL && scope_->is_script_scope();
+ return (IsDynamicVariableMode(mode()) || mode() == VAR) &&
+ scope_ != nullptr && scope_->is_script_scope();
}
} // namespace internal