Inline the ParseInfo structure as parameters to the Parser constructor.

test/cctest/test-parsing.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1036 matching lines @@
                              i::StrLength(surroundings[j].suffix) +
                              i::StrLength(source_data[i].body);
       i::ScopedVector<char> program(kProgramByteSize + 1);
       i::SNPrintF(program, "%s%s%s", surroundings[j].prefix,
                   source_data[i].body, surroundings[j].suffix);
       i::Handle<i::String> source =
           factory->NewStringFromUtf8(i::CStrVector(program.start()))
               .ToHandleChecked();
       i::Handle<i::Script> script = factory->NewScript(source);
       i::CompilationInfoWithZone info(script);
-      i::Parser::ParseInfo parse_info = {isolate->stack_guard()->real_climit(),
-                                         isolate->heap()->HashSeed(),
-                                         isolate->unicode_cache()};
-      i::Parser parser(&info, &parse_info);
+      i::Parser parser(&info, isolate->stack_guard()->real_climit(),
+                       isolate->heap()->HashSeed(), isolate->unicode_cache());
       parser.set_allow_harmony_arrow_functions(true);
       parser.set_allow_harmony_classes(true);
       parser.set_allow_harmony_object_literals(true);
       parser.set_allow_harmony_scoping(true);
       parser.set_allow_harmony_sloppy(true);
       info.MarkAsGlobal();
       CHECK(parser.Parse());
       CHECK(i::Rewriter::Rewrite(&info));
       CHECK(i::Scope::Analyze(&info));
       CHECK(info.function() != NULL);
@@ skipping 234 matching lines @@
                          source_data[i].outer_prefix,
                          source_data[i].inner_source,
                          source_data[i].outer_suffix);
 
     // Parse program source.
     i::Handle<i::String> source = factory->NewStringFromUtf8(
         i::CStrVector(program.start())).ToHandleChecked();
     CHECK_EQ(source->length(), kProgramSize);
     i::Handle<i::Script> script = factory->NewScript(source);
     i::CompilationInfoWithZone info(script);
-    i::Parser::ParseInfo parse_info = {isolate->stack_guard()->real_climit(),
-                                       isolate->heap()->HashSeed(),
-                                       isolate->unicode_cache()};
-    i::Parser parser(&info, &parse_info);
+    i::Parser parser(&info, isolate->stack_guard()->real_climit(),
+                     isolate->heap()->HashSeed(), isolate->unicode_cache());
     parser.set_allow_lazy(true);
     parser.set_allow_harmony_scoping(true);
     parser.set_allow_harmony_arrow_functions(true);
     info.MarkAsGlobal();
     info.SetLanguageMode(source_data[i].language_mode);
     parser.Parse();
     CHECK(info.function() != NULL);
 
     // Check scope types and positions.
     i::Scope* scope = info.function()->scope();
@@ skipping 137 matching lines @@
     CHECK_EQ(i::PreParser::kPreParseSuccess, result);
   }
 
   bool preparse_error = log.HasError();
 
   // Parse the data
   i::FunctionLiteral* function;
   {
     i::Handle<i::Script> script = factory->NewScript(source);
     i::CompilationInfoWithZone info(script);
-    i::Parser::ParseInfo parse_info = {isolate->stack_guard()->real_climit(),
-                                       isolate->heap()->HashSeed(),
-                                       isolate->unicode_cache()};
-    i::Parser parser(&info, &parse_info);
+    i::Parser parser(&info, isolate->stack_guard()->real_climit(),
+                     isolate->heap()->HashSeed(), isolate->unicode_cache());
     SetParserFlags(&parser, flags);
     info.MarkAsGlobal();
     parser.Parse();
     function = info.function();
     if (function) {
       parser_materialized_literals = function->materialized_literal_count();
     }
   }
 
   // Check that preparsing fails iff parsing fails.
@@ skipping 1942 matching lines @@
 
           i::SNPrintF(program, "%s%s%s%s%s%s%s", prefix, outer_comment, outer,
                       midfix, inner_comment, inner, suffix);
           i::Handle<i::String> source =
               factory->InternalizeUtf8String(program.start());
           source->PrintOn(stdout);
           printf("\n");
 
           i::Handle<i::Script> script = factory->NewScript(source);
           i::CompilationInfoWithZone info(script);
-          i::Parser::ParseInfo parse_info = {
-              isolate->stack_guard()->real_climit(),
-              isolate->heap()->HashSeed(), isolate->unicode_cache()};
-          i::Parser parser(&info, &parse_info);
+          i::Parser parser(&info, isolate->stack_guard()->real_climit(),
+                           isolate->heap()->HashSeed(),
+                           isolate->unicode_cache());
           parser.set_allow_harmony_scoping(true);
           CHECK(parser.Parse());
           CHECK(i::Compiler::Analyze(&info));
           CHECK(info.function() != NULL);
 
           i::Scope* scope = info.function()->scope();
           CHECK_EQ(scope->inner_scopes()->length(), 1);
           i::Scope* inner_scope = scope->inner_scopes()->at(0);
           const i::AstRawString* var_name =
               info.ast_value_factory()->GetOneByteString("x");
@@ skipping 1589 matching lines @@
     i::ScopedVector<char> program(kProgramByteSize + 1);
     i::SNPrintF(program, "%s", kSources[i]);
     i::Handle<i::String> source =
         factory->NewStringFromUtf8(i::CStrVector(program.start()))
             .ToHandleChecked();
 
     // Show that parsing as a module works
     {
       i::Handle<i::Script> script = factory->NewScript(source);
       i::CompilationInfoWithZone info(script);
-      i::Parser::ParseInfo parse_info = {isolate->stack_guard()->real_climit(),
-                                         isolate->heap()->HashSeed(),
-                                         isolate->unicode_cache()};
-      i::Parser parser(&info, &parse_info);
+      i::Parser parser(&info, isolate->stack_guard()->real_climit(),
+                       isolate->heap()->HashSeed(), isolate->unicode_cache());
       parser.set_allow_harmony_classes(true);
       parser.set_allow_harmony_modules(true);
       parser.set_allow_harmony_scoping(true);
       info.MarkAsModule();
       if (!parser.Parse()) {
         i::Handle<i::JSObject> exception_handle(
             i::JSObject::cast(isolate->pending_exception()));
         i::Handle<i::String> message_string =
             i::Handle<i::String>::cast(i::Object::GetProperty(
                   isolate, exception_handle, "message").ToHandleChecked());
 
         v8::base::OS::Print(
             "Parser failed on:\n"
             "\t%s\n"
             "with error:\n"
             "\t%s\n"
             "However, we expected no error.",
             source->ToCString().get(), message_string->ToCString().get());
         CHECK(false);
       }
     }
 
     // And that parsing a script does not.
     {
       i::Handle<i::Script> script = factory->NewScript(source);
       i::CompilationInfoWithZone info(script);
-      i::Parser::ParseInfo parse_info = {isolate->stack_guard()->real_climit(),
-                                         isolate->heap()->HashSeed(),
-                                         isolate->unicode_cache()};
-      i::Parser parser(&info, &parse_info);
+      i::Parser parser(&info, isolate->stack_guard()->real_climit(),
+                       isolate->heap()->HashSeed(), isolate->unicode_cache());
       parser.set_allow_harmony_classes(true);
       parser.set_allow_harmony_modules(true);
       parser.set_allow_harmony_scoping(true);
       info.MarkAsGlobal();
       CHECK(!parser.Parse());
     }
   }
 }
 
 
@@ skipping 68 matching lines @@
   for (unsigned i = 0; i < arraysize(kErrorSources); ++i) {
     int kProgramByteSize = i::StrLength(kErrorSources[i]);
     i::ScopedVector<char> program(kProgramByteSize + 1);
     i::SNPrintF(program, "%s", kErrorSources[i]);
     i::Handle<i::String> source =
         factory->NewStringFromUtf8(i::CStrVector(program.start()))
             .ToHandleChecked();
 
     i::Handle<i::Script> script = factory->NewScript(source);
     i::CompilationInfoWithZone info(script);
-    i::Parser::ParseInfo parse_info = {isolate->stack_guard()->real_climit(),
-                                       isolate->heap()->HashSeed(),
-                                       isolate->unicode_cache()};
-    i::Parser parser(&info, &parse_info);
+    i::Parser parser(&info, isolate->stack_guard()->real_climit(),
+                     isolate->heap()->HashSeed(), isolate->unicode_cache());
     parser.set_allow_harmony_classes(true);
     parser.set_allow_harmony_modules(true);
     parser.set_allow_harmony_scoping(true);
     info.MarkAsModule();
     CHECK(!parser.Parse());
   }
 }
 
 
 TEST(DuplicateProtoError) {
@@ skipping 72 matching lines @@
   i::Factory* factory = isolate->factory();
   v8::HandleScope handles(CcTest::isolate());
   v8::Handle<v8::Context> context = v8::Context::New(CcTest::isolate());
   v8::Context::Scope context_scope(context);
   isolate->stack_guard()->SetStackLimit(i::GetCurrentStackPosition() -
                                         128 * 1024);
 
   i::Handle<i::Script> script =
       factory->NewScript(factory->NewStringFromAsciiChecked(source));
   i::CompilationInfoWithZone info(script);
-  i::Parser::ParseInfo parse_info = {isolate->stack_guard()->real_climit(),
-                                     isolate->heap()->HashSeed(),
-                                     isolate->unicode_cache()};
-  i::Parser parser(&info, &parse_info);
+  i::Parser parser(&info, isolate->stack_guard()->real_climit(),
+                   isolate->heap()->HashSeed(), isolate->unicode_cache());
   parser.set_allow_strong_mode(true);
   info.MarkAsGlobal();
   parser.Parse();
   CHECK(info.function() != NULL);
   CHECK_EQ(expected_language_mode, info.function()->language_mode());
 }
 
 
 TEST(LanguageModeDirectives) {
   TestLanguageMode("\"use nothing\"", i::SLOPPY);
@@ skipping 49 matching lines @@
       "class C {static set arguments(_) {}}",
 
       NULL};
 
   static const ParserFlag always_flags[] = {
       kAllowHarmonyClasses, kAllowHarmonyObjectLiterals, kAllowHarmonyScoping,
       kAllowStrongMode};
   RunParserSyncTest(context_data, statement_data, kSuccess, NULL, 0,
                     always_flags, arraysize(always_flags));
 }