[modules] Partial support for (de-)serializing module descriptor entries.

src/ast/modules.h

 // 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.
 
 #ifndef V8_AST_MODULES_H_
 #define V8_AST_MODULES_H_
 
 #include "src/parsing/scanner.h"  // Only for Scanner::Location.
 #include "src/pending-compilation-error-handler.h"
 #include "src/zone-containers.h"
 
 namespace v8 {
 namespace internal {
 
 
 class AstRawString;
 
 
 class ModuleDescriptor : public ZoneObject {
  public:
   explicit ModuleDescriptor(Zone* zone)
       : special_exports_(1, zone),
         special_imports_(1, zone),
         regular_exports_(zone),
         regular_imports_(zone) {}
 
+  // The following Add* methods are high-level convenience functions for use by
+  // the parser.
+
   // import x from "foo.js";
   // import {x} from "foo.js";
   // import {x as y} from "foo.js";
   void AddImport(
     const AstRawString* import_name, const AstRawString* local_name,
     const AstRawString* module_request, const Scanner::Location loc,
     Zone* zone);
 
   // import * as x from "foo.js";
   void AddStarImport(
@@ skipping 39 matching lines @@
     const AstRawString* local_name;
     const AstRawString* import_name;
     const AstRawString* module_request;
 
     explicit Entry(Scanner::Location loc)
         : location(loc),
           export_name(nullptr),
           local_name(nullptr),
           import_name(nullptr),
           module_request(nullptr) {}
+
+    Handle<FixedArray> Serialize(Isolate* isolate) const;
+    static Entry* Deserialize(Isolate* isolate, AstValueFactory* avfactory,
+                              Handle<FixedArray> data);
   };
 
   // Empty imports and namespace imports.
   const ZoneList<const Entry*>& special_imports() const {
     return special_imports_;
   }
 
   // All the remaining imports, indexed by local name.
   const ZoneMap<const AstRawString*, const Entry*>& regular_imports() const {
     return regular_imports_;
   }
 
   // Star exports and explicitly indirect exports.
   const ZoneList<const Entry*>& special_exports() const {
     return special_exports_;
   }
 
   // All the remaining exports, indexed by local name.
   const ZoneMultimap<const AstRawString*, Entry*>& regular_exports() const {
     return regular_exports_;
   }
 
+  void AddRegularExport(Entry* entry) {

[adamk, 2016/08/25 15:56:20]

Can these methods be private?

[neis, 2016/08/26 07:28:03]

No, they are used by the ModuleScope constructor when deserializing a scope
info. See https://codereview.chromium.org/2277253003/

+    DCHECK_NOT_NULL(entry->export_name);
+    DCHECK_NOT_NULL(entry->local_name);
+    DCHECK_NULL(entry->import_name);
+    regular_exports_.insert(std::make_pair(entry->local_name, entry));
+  }
+
+  void AddSpecialExport(const Entry* entry, Zone* zone) {
+    DCHECK_NOT_NULL(entry->module_request);
+    special_exports_.Add(entry, zone);
+  }
+
+  void AddRegularImport(const Entry* entry) {
+    DCHECK_NOT_NULL(entry->import_name);
+    DCHECK_NOT_NULL(entry->local_name);
+    DCHECK_NOT_NULL(entry->module_request);
+    DCHECK_NULL(entry->export_name);
+    regular_imports_.insert(std::make_pair(entry->local_name, entry));
+    // We don't care if there's already an entry for this local name, as in that
+    // case we will report an error when declaring the variable.
+  }
+
+  void AddSpecialImport(const Entry* entry, Zone* zone) {
+    DCHECK_NOT_NULL(entry->module_request);
+    DCHECK_NULL(entry->export_name);
+    special_imports_.Add(entry, zone);
+  }
+
  private:
   // TODO(neis): Use STL datastructure instead of ZoneList?
   ZoneList<const Entry*> special_exports_;
   ZoneList<const Entry*> special_imports_;
   ZoneMultimap<const AstRawString*, Entry*> regular_exports_;
   ZoneMap<const AstRawString*, const Entry*> regular_imports_;
 
   // If there are multiple export entries with the same export name, return one
   // of them.  Otherwise return nullptr.
   const Entry* FindDuplicateExport(Zone* zone) const;
@@ skipping 14 matching lines @@
   // into:
   //   import {a as b} from "X"; export {a as c} from "X";
   // (The import entry is never deleted.)
   void MakeIndirectExportsExplicit(Zone* zone);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_AST_MODULES_H_