[llvm] manual fix-ups to IDS codemod of DebugInfo library

Author: andrurogerz

llvm/include/llvm/DebugInfo/CodeView/ContinuationRecordBuilder.h

@@ -14,6 +14,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/DebugInfo/CodeView/CVRecord.h"
 #include "llvm/DebugInfo/CodeView/TypeRecordMapping.h"
+#include "llvm/DebugInfo/CodeView/TypeRecord.h"
 #include "llvm/Support/BinaryByteStream.h"
 #include "llvm/Support/BinaryStreamWriter.h"
 #include <cstdint>

llvm/include/llvm/DebugInfo/CodeView/SimpleTypeSerializer.h

@@ -11,6 +11,7 @@
 
 #include "llvm/Support/Compiler.h"
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/DebugInfo/CodeView/TypeRecord.h"
 #include <vector>
 
 namespace llvm {
@@ -32,7 +33,6 @@ class SimpleTypeSerializer {
   // Don't allow serialization of field list records using this interface.
   ArrayRef<uint8_t> serialize(const FieldListRecord &Record) = delete;
 };
-
 } // end namespace codeview
 } // end namespace llvm
 

llvm/include/llvm/DebugInfo/LogicalView/Core/LVSort.h

@@ -13,6 +13,8 @@
 #ifndef LLVM_DEBUGINFO_LOGICALVIEW_CORE_LVSORT_H
 #define LLVM_DEBUGINFO_LOGICALVIEW_CORE_LVSORT_H
 
+#include "llvm/Support/Compiler.h"
+
 namespace llvm {
 namespace logicalview {
 

llvm/include/llvm/DebugInfo/PDB/UDTLayout.h

@@ -15,8 +15,10 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/DebugInfo/PDB/PDBSymbol.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolData.h"
+#include "llvm/DebugInfo/PDB/PDBSymbolFunc.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeBaseClass.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h"
+#include "llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h"
 #include "llvm/DebugInfo/PDB/PDBSymbolTypeVTable.h"
 #include <cstdint>
@@ -115,6 +117,10 @@ class LLVM_ABI UDTLayoutBase : public LayoutItemBase {
                 const std::string &Name, uint32_t OffsetInParent, uint32_t Size,
                 bool IsElided);
 
+  // Explicitly non-copyable.
+  UDTLayoutBase(UDTLayoutBase const&) = delete;
+  UDTLayoutBase& operator=(UDTLayoutBase const&) = delete;
+
   uint32_t tailPadding() const override;
   ArrayRef<LayoutItemBase *> layout_items() const { return LayoutItems; }
   ArrayRef<BaseClassLayout *> bases() const { return AllBases; }
@@ -164,8 +170,6 @@ class LLVM_ABI ClassLayout : public UDTLayoutBase {
   explicit ClassLayout(const PDBSymbolTypeUDT &UDT);
   explicit ClassLayout(std::unique_ptr<PDBSymbolTypeUDT> UDT);
 
-  ClassLayout(ClassLayout &&Other) = default;
-
   const PDBSymbolTypeUDT &getClass() const { return UDT; }
   uint32_t immediatePadding() const override;
 

llvm/lib/DebugInfo/CodeView/ContinuationRecordBuilder.cpp

@@ -244,8 +244,8 @@ std::vector<CVType> ContinuationRecordBuilder::end(TypeIndex Index) {
 // implement this in the cpp file.
 #define TYPE_RECORD(EnumName, EnumVal, Name)
 #define TYPE_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)
-#define MEMBER_RECORD(EnumName, EnumVal, Name)                                 \
-  template void llvm::codeview::ContinuationRecordBuilder::writeMemberType(    \
+#define MEMBER_RECORD(EnumName, EnumVal, Name)  \
+  template LLVM_ABI void llvm::codeview::ContinuationRecordBuilder::writeMemberType(  \
       Name##Record &Record);
 #define MEMBER_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)
 #include "llvm/DebugInfo/CodeView/CodeViewTypes.def"

llvm/lib/DebugInfo/CodeView/SimpleTypeSerializer.cpp

@@ -11,6 +11,7 @@
 #include "llvm/DebugInfo/CodeView/RecordSerialization.h"
 #include "llvm/DebugInfo/CodeView/TypeRecordMapping.h"
 #include "llvm/Support/BinaryStreamWriter.h"
+#include "llvm/Support/Compiler.h"
 
 using namespace llvm;
 using namespace llvm::codeview;
@@ -59,9 +60,9 @@ ArrayRef<uint8_t> SimpleTypeSerializer::serialize(T &Record) {
 
 // Explicitly instantiate the member function for each known type so that we can
 // implement this in the cpp file.
-#define TYPE_RECORD(EnumName, EnumVal, Name)                                   \
-  template ArrayRef<uint8_t> llvm::codeview::SimpleTypeSerializer::serialize(  \
-      Name##Record &Record);
+#define TYPE_RECORD(EnumName, EnumVal, Name)  \
+  template LLVM_ABI ArrayRef<uint8_t>         \
+  llvm::codeview::SimpleTypeSerializer::serialize(Name##Record &Record);
 #define TYPE_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)
 #define MEMBER_RECORD(EnumName, EnumVal, Name)
 #define MEMBER_RECORD_ALIAS(EnumName, EnumVal, Name, AliasName)