Finalizing parsing in a compile job should immediately report errors

src/compiler-dispatcher/compiler-dispatcher-job.cc

 // Copyright 2016 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/compiler-dispatcher/compiler-dispatcher-job.h"
 
 #include "src/assert-scope.h"
 #include "src/global-handles.h"
 #include "src/isolate.h"
 #include "src/objects-inl.h"
@@ skipping 101 matching lines @@
       reinterpret_cast<uintptr_t>(&stack_limit) - max_stack_size_ * KB;
 
   parser_->set_stack_limit(stack_limit);
   parser_->ParseOnBackground(parse_info_.get());
 
   parse_info_->set_isolate(isolate_);
 
   status_ = CompileJobStatus::kParsed;
 }
 
-void CompilerDispatcherJob::FinalizeParsingOnMainThread() {
+bool CompilerDispatcherJob::FinalizeParsingOnMainThread() {
   DCHECK(ThreadId::Current().Equals(isolate_->thread_id()));
   DCHECK(status() == CompileJobStatus::kParsed);
 
   if (!source_.is_null()) {
     i::GlobalHandles::Destroy(Handle<Object>::cast(source_).location());
     source_ = Handle<String>::null();
   }
 
   if (parse_info_->literal() == nullptr) {
     status_ = CompileJobStatus::kFailed;
-    return;
+  } else {
+    status_ = CompileJobStatus::kReadyToCompile;
   }
 
-  InternalizeParsingResult();
+  DeferredHandleScope scope(isolate_);
+  {
+    // Create a canonical handle scope before internalizing parsed values if
+    // compiling bytecode. This is required for off-thread bytecode generation.
+    std::unique_ptr<CanonicalHandleScope> canonical;
+    if (FLAG_ignition) canonical.reset(new CanonicalHandleScope(isolate_));
 
-  status_ = CompileJobStatus::kReadyToCompile;
-}
+    Handle<SharedFunctionInfo> shared(function_->shared(), isolate_);
+    Handle<Script> script(Script::cast(shared->script()), isolate_);
 
-void CompilerDispatcherJob::ReportErrorsOnMainThread() {
-  DCHECK(ThreadId::Current().Equals(isolate_->thread_id()));
-  DCHECK(status() == CompileJobStatus::kFailed);
+    parse_info_->set_script(script);
+    parse_info_->set_context(handle(function_->context(), isolate_));
 
-  // Internalizing the parsing result will throw the error.
-  InternalizeParsingResult();
+    // Do the parsing tasks which need to be done on the main thread. This will
+    // also handle parse errors.
+    parser_->Internalize(isolate_, script, parse_info_->literal() == nullptr);
+    parser_->HandleSourceURLComments(isolate_, script);
 
-  status_ = CompileJobStatus::kDone;
+    parse_info_->set_character_stream(nullptr);
+    parse_info_->set_unicode_cache(nullptr);
+    parser_.reset();
+    unicode_cache_.reset();
+    character_stream_.reset();
+  }
+  handles_from_parsing_.reset(scope.Detach());
+
+  return status_ != CompileJobStatus::kFailed;
 }
 
 void CompilerDispatcherJob::ResetOnMainThread() {
   DCHECK(ThreadId::Current().Equals(isolate_->thread_id()));
 
   parser_.reset();
   unicode_cache_.reset();
   character_stream_.reset();
   parse_info_.reset();
   zone_.reset();
+  handles_from_parsing_.reset();
 
   if (!source_.is_null()) {
     i::GlobalHandles::Destroy(Handle<Object>::cast(source_).location());
     source_ = Handle<String>::null();
   }
 
   status_ = CompileJobStatus::kInitial;
 }
 
-void CompilerDispatcherJob::InternalizeParsingResult() {
-  DCHECK(ThreadId::Current().Equals(isolate_->thread_id()));
-  DCHECK(status() == CompileJobStatus::kParsed ||
-         status() == CompileJobStatus::kFailed);
-
-  HandleScope scope(isolate_);
-
-  // Create a canonical handle scope before internalizing parsed values if
-  // compiling bytecode. This is required for off-thread bytecode generation.
-  std::unique_ptr<CanonicalHandleScope> canonical;
-  if (FLAG_ignition) canonical.reset(new CanonicalHandleScope(isolate_));
-
-  Handle<SharedFunctionInfo> shared(function_->shared(), isolate_);
-  Handle<Script> script(Script::cast(shared->script()), isolate_);
-
-  parse_info_->set_script(script);
-  parse_info_->set_context(handle(function_->context(), isolate_));
-
-  // Do the parsing tasks which need to be done on the main thread. This will
-  // also handle parse errors.
-  parser_->Internalize(isolate_, script, parse_info_->literal() == nullptr);
-  parser_->HandleSourceURLComments(isolate_, script);
-
-  parse_info_->set_character_stream(nullptr);
-  parse_info_->set_unicode_cache(nullptr);
-  parser_.reset();
-  unicode_cache_.reset();
-  character_stream_.reset();
-}
-
 }  // namespace internal
 }  // namespace v8