minidump: Reorganize MinidumpModuleCrashpadInfo to improve linking between structures

minidump/minidump_extensions.h

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 304 matching lines @@
 
 //! \brief A list of ::RVA pointers.
 struct ALIGNAS(4) PACKED MinidumpRVAList {
   //! \brief The number of children present in the #children array.
   uint32_t count;
 
   //! \brief Pointers to other structures in the minidump file.
   RVA children[0];
 };
 
-//! \brief A list of MINIDUMP_LOCATION_DESCRIPTOR objects.
-struct ALIGNAS(4) PACKED MinidumpLocationDescriptorList {
-  //! \brief The number of children present in the #children array.
-  uint32_t count;
-
-  //! \brief Pointers to other structures in the minidump file.
-  MINIDUMP_LOCATION_DESCRIPTOR children[0];
-};
-
 //! \brief A key-value pair.
 struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionaryEntry {
   //! \brief ::RVA of a MinidumpUTF8String containing the key of a key-value
   //!     pair.
   RVA key;
 
   //! \brief ::RVA of a MinidumpUTF8String containing the value of a key-value
   //!     pair.
   RVA value;
 };
@@ skipping 32 matching lines @@
   //!
   //! Readers can use this field to determine which other fields in the
   //! structure are valid. Upon encountering a value greater than #kVersion, a
   //! reader should assume that the structure’s layout is compatible with the
   //! structure defined as having value #kVersion.
   //!
   //! Writers may produce values less than #kVersion in this field if there is
   //! no need for any fields present in later versions.
   uint32_t version;
 
-  //! \brief A link to a MINIDUMP_MODULE structure in the module list stream.
-  //!
-  //! This field is an index into MINIDUMP_MODULE_LIST::Modules. This field’s
-  //! value must be in the range of MINIDUMP_MODULE_LIST::NumberOfEntries.
-  //!
-  //! This field is present when #version is at least `1`.
-  uint32_t minidump_module_list_index;
-
   //! \brief A MinidumpRVAList pointing to MinidumpUTF8String objects. The
   //!     module controls the data that appears here.
   //!
   //! These strings correspond to ModuleSnapshot::AnnotationsVector() and do not
   //! duplicate anything in #simple_annotations.
   //!
   //! This field is present when #version is at least `1`.
   MINIDUMP_LOCATION_DESCRIPTOR list_annotations;
 
   //! \brief A MinidumpSimpleStringDictionary pointing to strings interpreted as
   //!     key-value pairs. The module controls the data that appears here.
   //!
   //! These key-value pairs correspond to
   //! ModuleSnapshot::AnnotationsSimpleMap() and do not duplicate anything in
   //! #list_annotations.
   //!
   //! This field is present when #version is at least `1`.
   MINIDUMP_LOCATION_DESCRIPTOR simple_annotations;
 };
 
+//! \brief A link between a MINIDUMP_MODULE structure and additional
+//!     Crashpad-specific information about a module carried within a minidump
+//!     file.
+struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoLink {
+  //! \brief A link to a MINIDUMP_MODULE structure in the module list stream.
+  //!
+  //! This field is an index into MINIDUMP_MODULE_LIST::Modules. This field’s
+  //! value must be in the range of MINIDUMP_MODULE_LIST::NumberOfEntries.
+  uint32_t minidump_module_list_index;
+
+  //! \brief A link to a MinidumpModuleCrashpadInfo structure.
+  //!
+  //! MinidumpModuleCrashpadInfo structures are accessed indirectly through
+  //! MINIDUMP_LOCATION_DESCRIPTOR pointers to allow for future growth of the
+  //! MinidumpModuleCrashpadInfo structure.
+  MINIDUMP_LOCATION_DESCRIPTOR location;
+};
+
 //! \brief Additional Crashpad-specific information about modules carried within
 //!     a minidump file.
 //!
 //! This structure augments the information provided by
 //! MINIDUMP_MODULE_LIST. The minidump file must contain a module list stream
 //! (::kMinidumpStreamTypeModuleList) in order for this structure to appear.
 //!
 //! MinidumpModuleCrashpadInfoList::count may be less than the value of
 //! MINIDUMP_MODULE_LIST::NumberOfModules because not every MINIDUMP_MODULE
 //! structure carried within the minidump file will necessarily have
 //! Crashpad-specific information provided by a MinidumpModuleCrashpadInfo
 //! structure.
-//!
-//! MinidumpModuleCrashpadInfoList::children references
-//! MinidumpModuleCrashpadInfo children indirectly through
-//! MINIDUMP_LOCATION_DESCRIPTOR pointers to allow for future growth of the
-//! MinidumpModuleCrashpadInfo structure.
-using MinidumpModuleCrashpadInfoList = MinidumpLocationDescriptorList;
+struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoList {
+  //! \brief The number of children present in the #modules array.
+  uint32_t count;
+
+  //! \brief Crashpad-specific information about modules, along with links to
+  //!     MINIDUMP_MODULE structures that contain module information
+  //!     traditionally carried within minidump files.
+  MinidumpModuleCrashpadInfoLink modules[0];
+};
 
 //! \brief Additional Crashpad-specific information carried within a minidump
 //!     file.
 //!
 //! This structure is versioned. When changing this structure, leave the
 //! existing structure intact so that earlier parsers will be able to understand
 //! the fields they are aware of, and make additions at the end of the
 //! structure. Revise #kVersion and document each field’s validity based on
 //! #version, so that newer parsers will be able to determine whether the added
 //! fields are valid or not.
@@ skipping 32 matching lines @@
 #if defined(COMPILER_MSVC)
 #pragma pack(pop)
 #endif  // COMPILER_MSVC
 #undef PACKED
 
 MSVC_POP_WARNING();  // C4200
 
 }  // namespace crashpad
 
 #endif  // CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_