[llvm] manual fixups to export annotations

Author: andrurogerz

llvm/include/llvm/Support/AArch64AttributeParser.h

@@ -9,13 +9,14 @@
 #ifndef LLVM_SUPPORT_AARCH64ATTRIBUTEPARSER_H
 #define LLVM_SUPPORT_AARCH64ATTRIBUTEPARSER_H
 
+#include "llvm/Support/Compiler.h"
 #include "llvm/Support/ELFAttrParserExtended.h"
 #include "llvm/Support/ELFAttributes.h"
 
 namespace llvm {
 
 class AArch64AttributeParser : public ELFExtendedAttrParser {
-  static std::vector<SubsectionAndTagToTagName> &returnTagsNamesMap();
+  LLVM_ABI static std::vector<SubsectionAndTagToTagName> &returnTagsNamesMap();
 
 public:
   AArch64AttributeParser(ScopedPrinter *Sw)

llvm/include/llvm/Support/ARMAttributeParser.h

@@ -11,14 +11,15 @@
 
 #include "ARMBuildAttributes.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/Compiler.h"
 #include "llvm/Support/ELFAttrParserCompact.h"
 #include "llvm/Support/Error.h"
 
 namespace llvm {
 
 class ScopedPrinter;
 
-class ARMAttributeParser : public ELFCompactAttrParser {
+class LLVM_ABI ARMAttributeParser : public ELFCompactAttrParser {
   struct DisplayHandler {
     ARMBuildAttrs::AttrType attribute;
     Error (ARMAttributeParser::*routine)(ARMBuildAttrs::AttrType);

llvm/include/llvm/Support/BinaryStreamError.h

@@ -25,17 +25,17 @@ enum class stream_error_code {
 };
 
 /// Base class for errors originating when parsing raw PDB files
-class BinaryStreamError : public ErrorInfo<BinaryStreamError> {
+class LLVM_ABI BinaryStreamError : public ErrorInfo<BinaryStreamError> {
 public:
-  LLVM_ABI static char ID;
-  LLVM_ABI explicit BinaryStreamError(stream_error_code C);
-  LLVM_ABI explicit BinaryStreamError(StringRef Context);
-  LLVM_ABI BinaryStreamError(stream_error_code C, StringRef Context);
+  static char ID;
+  explicit BinaryStreamError(stream_error_code C);
+  explicit BinaryStreamError(StringRef Context);
+  BinaryStreamError(stream_error_code C, StringRef Context);
 
-  LLVM_ABI void log(raw_ostream &OS) const override;
-  LLVM_ABI std::error_code convertToErrorCode() const override;
+  void log(raw_ostream &OS) const override;
+  std::error_code convertToErrorCode() const override;
 
-  LLVM_ABI StringRef getErrorMessage() const;
+  StringRef getErrorMessage() const;
 
   stream_error_code getErrorCode() const { return Code; }
 

llvm/include/llvm/Support/BinaryStreamReader.h

@@ -27,14 +27,13 @@ namespace llvm {
 /// null-terminated strings, integers in various flavors of endianness, etc.
 /// Can be subclassed to provide reading of custom datatypes, although no
 /// are overridable.
-class BinaryStreamReader {
+class LLVM_ABI BinaryStreamReader {
 public:
   BinaryStreamReader() = default;
-  LLVM_ABI explicit BinaryStreamReader(BinaryStreamRef Ref);
-  LLVM_ABI explicit BinaryStreamReader(BinaryStream &Stream);
-  LLVM_ABI explicit BinaryStreamReader(ArrayRef<uint8_t> Data,
-                                       llvm::endianness Endian);
-  LLVM_ABI explicit BinaryStreamReader(StringRef Data, llvm::endianness Endian);
+  explicit BinaryStreamReader(BinaryStreamRef Ref);
+  explicit BinaryStreamReader(BinaryStream &Stream);
+  explicit BinaryStreamReader(ArrayRef<uint8_t> Data, llvm::endianness Endian);
+  explicit BinaryStreamReader(StringRef Data, llvm::endianness Endian);
 
   BinaryStreamReader(const BinaryStreamReader &Other) = default;
 
@@ -48,7 +47,7 @@ class BinaryStreamReader {
   ///
   /// \returns a success error code if the data was successfully read, otherwise
   /// returns an appropriate error code.
-  LLVM_ABI Error readLongestContiguousChunk(ArrayRef<uint8_t> &Buffer);
+  Error readLongestContiguousChunk(ArrayRef<uint8_t> &Buffer);
 
   /// Read \p Size bytes from the underlying stream at the current offset and
   /// and set \p Buffer to the resulting data slice.  Whether a copy occurs
@@ -57,7 +56,7 @@ class BinaryStreamReader {
   ///
   /// \returns a success error code if the data was successfully read, otherwise
   /// returns an appropriate error code.
-  LLVM_ABI Error readBytes(ArrayRef<uint8_t> &Buffer, uint32_t Size);
+  Error readBytes(ArrayRef<uint8_t> &Buffer, uint32_t Size);
 
   /// Read an integer of the specified endianness into \p Dest and update the
   /// stream's offset.  The data is always copied from the stream's underlying
@@ -93,44 +92,44 @@ class BinaryStreamReader {
   ///
   /// \returns a success error code if the data was successfully read, otherwise
   /// returns an appropriate error code.
-  LLVM_ABI Error readULEB128(uint64_t &Dest);
+  Error readULEB128(uint64_t &Dest);
 
   /// Read a signed LEB128 encoded value.
   ///
   /// \returns a success error code if the data was successfully read, otherwise
   /// returns an appropriate error code.
-  LLVM_ABI Error readSLEB128(int64_t &Dest);
+  Error readSLEB128(int64_t &Dest);
 
   /// Read a null terminated string from \p Dest.  Whether a copy occurs depends
   /// on the implementation of the underlying stream.  Updates the stream's
   /// offset to point after the newly read data.
   ///
   /// \returns a success error code if the data was successfully read, otherwise
   /// returns an appropriate error code.
-  LLVM_ABI Error readCString(StringRef &Dest);
+  Error readCString(StringRef &Dest);
 
   /// Similar to readCString, however read a null-terminated UTF16 string
   /// instead.
   ///
   /// \returns a success error code if the data was successfully read, otherwise
   /// returns an appropriate error code.
-  LLVM_ABI Error readWideString(ArrayRef<UTF16> &Dest);
+  Error readWideString(ArrayRef<UTF16> &Dest);
 
   /// Read a \p Length byte string into \p Dest.  Whether a copy occurs depends
   /// on the implementation of the underlying stream.  Updates the stream's
   /// offset to point after the newly read data.
   ///
   /// \returns a success error code if the data was successfully read, otherwise
   /// returns an appropriate error code.
-  LLVM_ABI Error readFixedString(StringRef &Dest, uint32_t Length);
+  Error readFixedString(StringRef &Dest, uint32_t Length);
 
   /// Read the entire remainder of the underlying stream into \p Ref.  This is
   /// equivalent to calling getUnderlyingStream().slice(Offset).  Updates the
   /// stream's offset to point to the end of the stream.  Never causes a copy.
   ///
   /// \returns a success error code if the data was successfully read, otherwise
   /// returns an appropriate error code.
-  LLVM_ABI Error readStreamRef(BinaryStreamRef &Ref);
+  Error readStreamRef(BinaryStreamRef &Ref);
 
   /// Read \p Length bytes from the underlying stream into \p Ref.  This is
   /// equivalent to calling getUnderlyingStream().slice(Offset, Length).
@@ -139,7 +138,7 @@ class BinaryStreamReader {
   ///
   /// \returns a success error code if the data was successfully read, otherwise
   /// returns an appropriate error code.
-  LLVM_ABI Error readStreamRef(BinaryStreamRef &Ref, uint32_t Length);
+  Error readStreamRef(BinaryStreamRef &Ref, uint32_t Length);
 
   /// Read \p Length bytes from the underlying stream into \p Ref.  This is
   /// equivalent to calling getUnderlyingStream().slice(Offset, Length).
@@ -148,7 +147,7 @@ class BinaryStreamReader {
   ///
   /// \returns a success error code if the data was successfully read, otherwise
   /// returns an appropriate error code.
-  LLVM_ABI Error readSubstream(BinarySubstreamRef &Ref, uint32_t Length);
+  Error readSubstream(BinarySubstreamRef &Ref, uint32_t Length);
 
   /// Get a pointer to an object of type T from the underlying stream, as if by
   /// memcpy, and store the result into \p Dest.  It is up to the caller to
@@ -253,17 +252,17 @@ class BinaryStreamReader {
   ///
   /// \returns a success error code if at least \p Amount bytes remain in the
   /// stream, otherwise returns an appropriate error code.
-  LLVM_ABI Error skip(uint64_t Amount);
+  Error skip(uint64_t Amount);
 
   /// Examine the next byte of the underlying stream without advancing the
   /// stream's offset.  If the stream is empty the behavior is undefined.
   ///
   /// \returns the next byte in the stream.
-  LLVM_ABI uint8_t peek() const;
+  uint8_t peek() const;
 
-  LLVM_ABI Error padToAlignment(uint32_t Align);
+  Error padToAlignment(uint32_t Align);
 
-  LLVM_ABI std::pair<BinaryStreamReader, BinaryStreamReader>
+  std::pair<BinaryStreamReader, BinaryStreamReader>
   split(uint64_t Offset) const;
 
 private:

llvm/include/llvm/Support/COM.h

@@ -14,16 +14,18 @@
 #ifndef LLVM_SUPPORT_COM_H
 #define LLVM_SUPPORT_COM_H
 
+#include "llvm/Support/Compiler.h"
+
 namespace llvm {
 namespace sys {
 
 enum class COMThreadingMode { SingleThreaded, MultiThreaded };
 
-class InitializeCOMRAII {
+class LLVM_ABI InitializeCOMRAII {
 public:
-  LLVM_ABI explicit InitializeCOMRAII(COMThreadingMode Threading,
-                                      bool SpeedOverMemory = false);
-  LLVM_ABI ~InitializeCOMRAII();
+  explicit InitializeCOMRAII(COMThreadingMode Threading,
+                             bool SpeedOverMemory = false);
+  ~InitializeCOMRAII();
 
 private:
   InitializeCOMRAII(const InitializeCOMRAII &) = delete;

llvm/include/llvm/Support/CSKYAttributeParser.h

@@ -10,10 +10,11 @@
 #define LLVM_SUPPORT_CSKYATTRIBUTEPARSER_H
 
 #include "llvm/Support/CSKYAttributes.h"
+#include "llvm/Support/Compiler.h"
 #include "llvm/Support/ELFAttrParserCompact.h"
 
 namespace llvm {
-class CSKYAttributeParser : public ELFCompactAttrParser {
+class LLVM_ABI CSKYAttributeParser : public ELFCompactAttrParser {
   struct DisplayHandler {
     CSKYAttrs::AttrType attribute;
     Error (CSKYAttributeParser::*routine)(unsigned);