[explicit isolates] Delete last GetIsolate in parsing

Pass Isolate to ConsumedPreParsedScopeData::SetData (guaranteed to be
called on main thread) and use it to create the handle in
ConsumedPreParsedScopeData::GetDataForSkippableFunction, rather than
calling GetIsolate.

Bug: v8:7786
Change-Id: Ibd632bb57f35a921f37c620d77dd6dfdb1f092c6
Reviewed-on: https://chromium-review.googlesource.com/1088703
Commit-Queue: Dan Elphick <delphick@chromium.org>
Reviewed-by: Leszek Swirski <leszeks@chromium.org>
Reviewed-by: Marja Hölttä <marja@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54138}

src/compiler.cc

@@ -1095,7 +1095,7 @@ bool Compiler::Compile(Handle<SharedFunctionInfo> shared_info,
       Handle<PreParsedScopeData> data(
           PreParsedScopeData::cast(shared_info->preparsed_scope_data()),
           isolate);
-      parse_info.consumed_preparsed_scope_data()->SetData(data);
+      parse_info.consumed_preparsed_scope_data()->SetData(isolate, data);
       // After we've compiled the function, we don't need data about its
       // skippable functions any more.
       shared_info->ClearPreParsedScopeData();

src/parsing/preparsed-scope-data.cc

@@ -481,12 +481,15 @@ uint8_t ConsumedPreParsedScopeData::ByteData::ReadQuarter() {
 }
 
 ConsumedPreParsedScopeData::ConsumedPreParsedScopeData()
-    : scope_data_(new ByteData()), child_index_(0) {}
+    : isolate_(nullptr), scope_data_(new ByteData()), child_index_(0) {}
 
 ConsumedPreParsedScopeData::~ConsumedPreParsedScopeData() {}
 
-void ConsumedPreParsedScopeData::SetData(Handle<PreParsedScopeData> data) {
+void ConsumedPreParsedScopeData::SetData(Isolate* isolate,
+                                         Handle<PreParsedScopeData> data) {
+  DCHECK_NOT_NULL(isolate);
   DCHECK(data->IsPreParsedScopeData());
+  isolate_ = isolate;
   data_ = data;
 #ifdef DEBUG
   ByteData::ReadingScope reading_scope(this);
@@ -529,8 +532,7 @@ ConsumedPreParsedScopeData::GetDataForSkippableFunction(
     return nullptr;
   }
   Handle<PreParsedScopeData> child_data_handle(
-      PreParsedScopeData::cast(child_data),
-      PreParsedScopeData::cast(child_data)->GetIsolate());
+      PreParsedScopeData::cast(child_data), isolate_);
   return new (zone) ProducedPreParsedScopeData(child_data_handle, zone);
 }
 

src/parsing/preparsed-scope-data.h

@@ -225,7 +225,7 @@ class ConsumedPreParsedScopeData {
   ConsumedPreParsedScopeData();
   ~ConsumedPreParsedScopeData();
 
-  void SetData(Handle<PreParsedScopeData> data);
+  void SetData(Isolate* isolate, Handle<PreParsedScopeData> data);
 
   bool HasData() const { return !data_.is_null(); }
 
@@ -243,6 +243,7 @@ class ConsumedPreParsedScopeData {
   void RestoreDataForVariable(Variable* var);
   void RestoreDataForInnerScopes(Scope* scope);
 
+  Isolate* isolate_;
   Handle<PreParsedScopeData> data_;
   std::unique_ptr<ByteData> scope_data_;
   // When consuming the data, these indexes point to the data we're going to

test/cctest/parsing/test-preparser.cc

@@ -746,7 +746,7 @@ TEST(PreParserScopeAnalysis) {
       i::ParseInfo using_scope_data(isolate, shared);
       using_scope_data.set_lazy_compile();
       using_scope_data.consumed_preparsed_scope_data()->SetData(
-          produced_data_on_heap);
+          isolate, produced_data_on_heap);
       CHECK(i::parsing::ParseFunction(&using_scope_data, shared, isolate));
 
       // Verify that we skipped at least one function inside that scope.