Upgrade V8 to version 4.9.385.28
https://chromium.googlesource.com/v8/v8/+/4.9.385.28
FPIIM-449
Change-Id: I4b2e74289d4bf3667f2f3dc8aa2e541f63e26eb4
diff --git a/test/cctest/compiler/test-loop-assignment-analysis.cc b/test/cctest/compiler/test-loop-assignment-analysis.cc
index aabd95b..69f5e15 100644
--- a/test/cctest/compiler/test-loop-assignment-analysis.cc
+++ b/test/cctest/compiler/test-loop-assignment-analysis.cc
@@ -2,14 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "src/ast/scopes.h"
#include "src/compiler/ast-loop-assignment-analyzer.h"
-#include "src/parser.h"
-#include "src/rewriter.h"
-#include "src/scopes.h"
+#include "src/parsing/parser.h"
+#include "src/parsing/rewriter.h"
#include "test/cctest/cctest.h"
-using namespace v8::internal;
-using namespace v8::internal::compiler;
+namespace v8 {
+namespace internal {
+namespace compiler {
namespace {
const int kBufferSize = 1024;
@@ -29,28 +30,29 @@
void CheckLoopAssignedCount(int expected, const char* var_name) {
// TODO(titzer): don't scope analyze every single time.
- CompilationInfo info(function, main_zone());
+ ParseInfo parse_info(main_zone(), function);
+ CompilationInfo info(&parse_info);
- CHECK(Parser::Parse(&info));
- CHECK(Rewriter::Rewrite(&info));
- CHECK(Scope::Analyze(&info));
+ CHECK(Parser::ParseStatic(&parse_info));
+ CHECK(Rewriter::Rewrite(&parse_info));
+ CHECK(Scope::Analyze(&parse_info));
- Scope* scope = info.function()->scope();
- AstValueFactory* factory = info.ast_value_factory();
- CHECK_NE(NULL, scope);
+ Scope* scope = info.literal()->scope();
+ AstValueFactory* factory = parse_info.ast_value_factory();
+ CHECK(scope);
if (result == NULL) {
AstLoopAssignmentAnalyzer analyzer(main_zone(), &info);
result = analyzer.Analyze();
- CHECK_NE(NULL, result);
+ CHECK(result);
}
const i::AstRawString* name = factory->GetOneByteString(var_name);
i::Variable* var = scope->Lookup(name);
- CHECK_NE(NULL, var);
+ CHECK(var);
- if (var->location() == Variable::UNALLOCATED) {
+ if (var->location() == VariableLocation::UNALLOCATED) {
CHECK_EQ(0, expected);
} else {
CHECK(var->IsStackAllocated());
@@ -58,7 +60,7 @@
}
}
};
-}
+} // namespace
TEST(SimpleLoop1) {
@@ -292,3 +294,7 @@
f.CheckLoopAssignedCount(5, "z");
f.CheckLoopAssignedCount(0, "w");
}
+
+} // namespace compiler
+} // namespace internal
+} // namespace v8