Split parsing of functions and top-level code into two separate methods

src/parsing/parser.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/parsing/parser.h"
 
 #include <memory>
 
 #include "src/api.h"
 #include "src/ast/ast-expression-rewriter.h"
@@ skipping 3812 matching lines @@
           v8::tracing::TracingCategoryObserver::ENABLED_BY_NATIVE) {
     // Copy over the counters from the background thread to the main counters on
     // the isolate.
     // TODO(cbruni,lpy): properly attach the runtime stats to the trace for
     // background parsing.
     isolate->counters()->runtime_call_stats()->Add(runtime_call_stats_);
   }
 }
 
 
 // ----------------------------------------------------------------------------

[marja, 2016/11/30 11:30:29]

This comment is now obsolete & doesn't belong here

 // The Parser interface.
 
-
-bool Parser::ParseStatic(ParseInfo* info) {
-  Parser parser(info);
-  if (parser.Parse(info)) {
-    info->set_language_mode(info->literal()->language_mode());
-    return true;
-  }
-  return false;
-}
-
-
-bool Parser::Parse(ParseInfo* info) {
-  DCHECK(info->literal() == NULL);
-  FunctionLiteral* result = NULL;
-  // Ok to use Isolate here; this function is only called in the main thread.
-  DCHECK(parsing_on_main_thread_);
-  Isolate* isolate = info->isolate();
-
-  if (info->is_toplevel()) {

[marja, 2016/11/30 11:30:29]

Could you add DCHECKs into the relevant parse functions that we're using the
right one, like, in ParseProgram info->is_toplevel (or whatever is the right
condition)?

[jochen (gone - plz use gerrit), 2016/11/30 11:49:58]

those DCHECKs are already in place

-    SetCachedData(info);
-    result = ParseProgram(isolate, info);
-  } else {
-    result = ParseFunction(isolate, info);
-  }
-  info->set_literal(result);
-
-  Internalize(isolate, info->script(), result == NULL);
-  return (result != NULL);
-}
-
-
 void Parser::ParseOnBackground(ParseInfo* info) {
   parsing_on_main_thread_ = false;
 
   DCHECK(info->literal() == NULL);
   FunctionLiteral* result = NULL;
 
   ParserLogger logger;
   if (produce_cached_parse_data()) {
     if (allow_lazy_) {
       log_ = &logger;
@@ skipping 1623 matching lines @@
 
   return final_loop;
 }
 
 #undef CHECK_OK
 #undef CHECK_OK_VOID
 #undef CHECK_FAILED
 
 }  // namespace internal
 }  // namespace v8