<div dir="ltr"><div dir="ltr"><div dir="ltr">Hiya Juergen,<div><br></div><div>I've been looking over the build bots this morning and noticed that the tests added in r347823 have started failing on a windows build bot:</div><div><br></div><div><a href="http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/21829/steps/test/logs/stdio">http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/21829/steps/test/logs/stdio</a><br></div><div><br></div><div><a href="http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast">http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast</a><br></div><div><br></div><div>is there any chance you can take a look?</div><div><br></div><div>Kindest regards</div><div>Tom W</div></div></div></div><br><div class="gmail_quote"><div dir="ltr">On Thu, 29 Nov 2018 at 01:23, Juergen Ributzka via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ributzka<br>
Date: Wed Nov 28 17:20:46 2018<br>
New Revision: 347823<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=347823&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=347823&view=rev</a><br>
Log:<br>
[TextAPI] TBD Reader/Writer<br>
<br>
Add basic infrastructure for reading and writting TBD files (version 1 - 3).<br>
<br>
The TextAPI library is not used by anything yet (besides the unit tests). Tool<br>
support will be added in a separate commit.<br>
<br>
The TBD format is currently documented in the implementation file (TextStub.cpp).<br>
<br>
<a href="https://reviews.llvm.org/D53945" rel="noreferrer" target="_blank">https://reviews.llvm.org/D53945</a><br>
<br>
Update: This contains changes to fix issues discovered by the bots:<br>
 - add parentheses to silence warnings.<br>
 - rename variables<br>
 - use PlatformType from BinaryFormat<br>
<br>
Added:<br>
    llvm/trunk/include/llvm/TextAPI/<br>
    llvm/trunk/include/llvm/TextAPI/MachO/<br>
    llvm/trunk/include/llvm/TextAPI/MachO/Architecture.def<br>
    llvm/trunk/include/llvm/TextAPI/MachO/Architecture.h<br>
    llvm/trunk/include/llvm/TextAPI/MachO/ArchitectureSet.h<br>
    llvm/trunk/include/llvm/TextAPI/MachO/InterfaceFile.h<br>
    llvm/trunk/include/llvm/TextAPI/MachO/PackedVersion.h<br>
    llvm/trunk/include/llvm/TextAPI/MachO/Symbol.h<br>
    llvm/trunk/include/llvm/TextAPI/MachO/TextAPIReader.h<br>
    llvm/trunk/include/llvm/TextAPI/MachO/TextAPIWriter.h<br>
    llvm/trunk/lib/TextAPI/<br>
    llvm/trunk/lib/TextAPI/CMakeLists.txt<br>
    llvm/trunk/lib/TextAPI/LLVMBuild.txt<br>
    llvm/trunk/lib/TextAPI/MachO/<br>
    llvm/trunk/lib/TextAPI/MachO/Architecture.cpp<br>
    llvm/trunk/lib/TextAPI/MachO/ArchitectureSet.cpp<br>
    llvm/trunk/lib/TextAPI/MachO/InterfaceFile.cpp<br>
    llvm/trunk/lib/TextAPI/MachO/PackedVersion.cpp<br>
    llvm/trunk/lib/TextAPI/MachO/Symbol.cpp<br>
    llvm/trunk/lib/TextAPI/MachO/TextAPIContext.h<br>
    llvm/trunk/lib/TextAPI/MachO/TextStub.cpp<br>
    llvm/trunk/lib/TextAPI/MachO/TextStubCommon.cpp<br>
    llvm/trunk/lib/TextAPI/MachO/TextStubCommon.h<br>
    llvm/trunk/unittests/TextAPI/<br>
    llvm/trunk/unittests/TextAPI/CMakeLists.txt<br>
    llvm/trunk/unittests/TextAPI/TextStubV1Tests.cpp<br>
    llvm/trunk/unittests/TextAPI/TextStubV2Tests.cpp<br>
Modified:<br>
    llvm/trunk/lib/CMakeLists.txt<br>
    llvm/trunk/lib/LLVMBuild.txt<br>
    llvm/trunk/unittests/CMakeLists.txt<br>
<br>
Added: llvm/trunk/include/llvm/TextAPI/MachO/Architecture.def<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/Architecture.def?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/Architecture.def?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/TextAPI/MachO/Architecture.def (added)<br>
+++ llvm/trunk/include/llvm/TextAPI/MachO/Architecture.def Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,39 @@<br>
+//===- llvm/TextAPI/Architecture.def - Architecture -------------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef ARCHINFO<br>
+#define ARCHINFO(arch)<br>
+#endif<br>
+<br>
+///<br>
+/// X86 architectures sorted by cpu type and sub type id.<br>
+///<br>
+ARCHINFO(i386, MachO::CPU_TYPE_I386, MachO::CPU_SUBTYPE_I386_ALL)<br>
+ARCHINFO(x86_64, MachO::CPU_TYPE_X86_64, MachO::CPU_SUBTYPE_X86_64_ALL)<br>
+ARCHINFO(x86_64h, MachO::CPU_TYPE_X86_64, MachO::CPU_SUBTYPE_X86_64_H)<br>
+<br>
+<br>
+///<br>
+/// ARM architectures sorted by cpu sub type id.<br>
+///<br>
+ARCHINFO(armv4t, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V4T)<br>
+ARCHINFO(armv6, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V6)<br>
+ARCHINFO(armv5, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V5TEJ)<br>
+ARCHINFO(armv7, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7)<br>
+ARCHINFO(armv7s, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7S)<br>
+ARCHINFO(armv7k, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7K)<br>
+ARCHINFO(armv6m, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V6M)<br>
+ARCHINFO(armv7m, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7M)<br>
+ARCHINFO(armv7em, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7EM)<br>
+<br>
+<br>
+///<br>
+/// ARM64 architectures sorted by cpu sub type id.<br>
+///<br>
+ARCHINFO(arm64, MachO::CPU_TYPE_ARM64, MachO::CPU_SUBTYPE_ARM64_ALL)<br>
<br>
Added: llvm/trunk/include/llvm/TextAPI/MachO/Architecture.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/Architecture.h?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/Architecture.h?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/TextAPI/MachO/Architecture.h (added)<br>
+++ llvm/trunk/include/llvm/TextAPI/MachO/Architecture.h Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,49 @@<br>
+//===- llvm/TextAPI/Architecture.h - Architecture ---------------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Defines the architecture enum and helper methods.<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef LLVM_TEXTAPI_MACHO_ARCHITECTURE_H<br>
+#define LLVM_TEXTAPI_MACHO_ARCHITECTURE_H<br>
+<br>
+#include "llvm/ADT/StringRef.h"<br>
+#include "llvm/Support/raw_ostream.h"<br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+/// Defines the architecture slices that are supported by Text-based Stub files.<br>
+enum class Architecture : uint8_t {<br>
+#define ARCHINFO(Arch, Type, SubType) Arch,<br>
+#include "llvm/TextAPI/MachO/Architecture.def"<br>
+#undef ARCHINFO<br>
+  unknown, // this has to go last.<br>
+};<br>
+<br>
+/// Convert a CPU Type and Subtype pair to an architecture slice.<br>
+Architecture getArchitectureFromCpuType(uint32_t CPUType, uint32_t CPUSubType);<br>
+<br>
+/// Convert a name to an architecture slice.<br>
+Architecture getArchitectureFromName(StringRef Name);<br>
+<br>
+/// Convert an architecture slice to a string.<br>
+StringRef getArchitectureName(Architecture Arch);<br>
+<br>
+/// Convert an architecture slice to a CPU Type and Subtype pair.<br>
+std::pair<uint32_t, uint32_t> getCPUTypeFromArchitecture(Architecture Arch);<br>
+<br>
+raw_ostream &operator<<(raw_ostream &OS, Architecture Arch);<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
+<br>
+#endif // LLVM_TEXTAPI_MACHO_ARCHITECTURE_H<br>
<br>
Added: llvm/trunk/include/llvm/TextAPI/MachO/ArchitectureSet.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/ArchitectureSet.h?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/ArchitectureSet.h?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/TextAPI/MachO/ArchitectureSet.h (added)<br>
+++ llvm/trunk/include/llvm/TextAPI/MachO/ArchitectureSet.h Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,162 @@<br>
+//===- llvm/TextAPI/ArchitectureSet.h - ArchitectureSet ---------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Defines the architecture set.<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef LLVM_TEXTAPI_MACHO_ARCHITECTURE_SET_H<br>
+#define LLVM_TEXTAPI_MACHO_ARCHITECTURE_SET_H<br>
+<br>
+#include "llvm/Support/raw_ostream.h"<br>
+#include "llvm/TextAPI/MachO/Architecture.h"<br>
+#include <cstddef><br>
+#include <iterator><br>
+#include <limits><br>
+#include <vector><br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+class ArchitectureSet {<br>
+private:<br>
+  using ArchSetType = uint32_t;<br>
+<br>
+  const static ArchSetType EndIndexVal =<br>
+      std::numeric_limits<ArchSetType>::max();<br>
+  ArchSetType ArchSet{0};<br>
+<br>
+public:<br>
+  constexpr ArchitectureSet() = default;<br>
+  constexpr ArchitectureSet(ArchSetType Raw) : ArchSet(Raw) {}<br>
+  ArchitectureSet(Architecture Arch) : ArchitectureSet() { set(Arch); }<br>
+  ArchitectureSet(const std::vector<Architecture> &Archs);<br>
+<br>
+  void set(Architecture Arch) {<br>
+    if (Arch == Architecture::unknown)<br>
+      return;<br>
+    ArchSet |= 1U << static_cast<int>(Arch);<br>
+  }<br>
+<br>
+  void clear(Architecture Arch) { ArchSet &= ~(1U << static_cast<int>(Arch)); }<br>
+<br>
+  bool has(Architecture Arch) const {<br>
+    return ArchSet & (1U << static_cast<int>(Arch));<br>
+  }<br>
+<br>
+  bool contains(ArchitectureSet Archs) const {<br>
+    return (ArchSet & Archs.ArchSet) == Archs.ArchSet;<br>
+  }<br>
+<br>
+  size_t count() const;<br>
+<br>
+  bool empty() const { return ArchSet == 0; }<br>
+<br>
+  ArchSetType rawValue() const { return ArchSet; }<br>
+<br>
+  template <typename Ty><br>
+  class arch_iterator<br>
+      : public std::iterator<std::forward_iterator_tag, Architecture, size_t> {<br>
+  private:<br>
+    ArchSetType Index;<br>
+    Ty *ArchSet;<br>
+<br>
+    void findNextSetBit() {<br>
+      if (Index == EndIndexVal)<br>
+        return;<br>
+<br>
+      do {<br>
+        if (*ArchSet & (1UL << ++Index))<br>
+          return;<br>
+      } while (Index < sizeof(Ty) * 8);<br>
+<br>
+      Index = EndIndexVal;<br>
+    }<br>
+<br>
+  public:<br>
+    arch_iterator(Ty *ArchSet, ArchSetType Index = 0)<br>
+        : Index(Index), ArchSet(ArchSet) {<br>
+      if (Index != EndIndexVal && !(*ArchSet & (1UL << Index)))<br>
+        findNextSetBit();<br>
+    }<br>
+<br>
+    Architecture operator*() const { return static_cast<Architecture>(Index); }<br>
+<br>
+    arch_iterator &operator++() {<br>
+      findNextSetBit();<br>
+      return *this;<br>
+    }<br>
+<br>
+    arch_iterator operator++(int) {<br>
+      auto tmp = *this;<br>
+      findNextSetBit();<br>
+      return tmp;<br>
+    }<br>
+<br>
+    bool operator==(const arch_iterator &o) const {<br>
+      return std::tie(Index, ArchSet) == std::tie(o.Index, o.ArchSet);<br>
+    }<br>
+<br>
+    bool operator!=(const arch_iterator &o) const { return !(*this == o); }<br>
+  };<br>
+<br>
+  ArchitectureSet operator&(const ArchitectureSet &o) {<br>
+    return {ArchSet & o.ArchSet};<br>
+  }<br>
+<br>
+  ArchitectureSet operator|(const ArchitectureSet &o) {<br>
+    return {ArchSet | o.ArchSet};<br>
+  }<br>
+<br>
+  ArchitectureSet &operator|=(const ArchitectureSet &o) {<br>
+    ArchSet |= o.ArchSet;<br>
+    return *this;<br>
+  }<br>
+<br>
+  ArchitectureSet &operator|=(const Architecture &Arch) {<br>
+    set(Arch);<br>
+    return *this;<br>
+  }<br>
+<br>
+  bool operator==(const ArchitectureSet &o) const {<br>
+    return ArchSet == o.ArchSet;<br>
+  }<br>
+<br>
+  bool operator!=(const ArchitectureSet &o) const {<br>
+    return ArchSet != o.ArchSet;<br>
+  }<br>
+<br>
+  bool operator<(const ArchitectureSet &o) const { return ArchSet < o.ArchSet; }<br>
+<br>
+  using iterator = arch_iterator<ArchSetType>;<br>
+  using const_iterator = arch_iterator<const ArchSetType>;<br>
+<br>
+  iterator begin() { return {&ArchSet}; }<br>
+  iterator end() { return {&ArchSet, EndIndexVal}; }<br>
+<br>
+  const_iterator begin() const { return {&ArchSet}; }<br>
+  const_iterator end() const { return {&ArchSet, EndIndexVal}; }<br>
+<br>
+  operator std::string() const;<br>
+  operator std::vector<Architecture>() const;<br>
+  void print(raw_ostream &OS) const;<br>
+};<br>
+<br>
+inline ArchitectureSet operator|(const Architecture &lhs,<br>
+                                 const Architecture &rhs) {<br>
+  return ArchitectureSet(lhs) | ArchitectureSet(rhs);<br>
+}<br>
+<br>
+raw_ostream &operator<<(raw_ostream &OS, ArchitectureSet Set);<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
+<br>
+#endif // LLVM_TEXTAPI_MACHO_ARCHITECTURE_SET_H<br>
<br>
Added: llvm/trunk/include/llvm/TextAPI/MachO/InterfaceFile.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/InterfaceFile.h?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/InterfaceFile.h?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/TextAPI/MachO/InterfaceFile.h (added)<br>
+++ llvm/trunk/include/llvm/TextAPI/MachO/InterfaceFile.h Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,429 @@<br>
+//===- llvm/TextAPI/IntefaceFile.h - TAPI Interface File --------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief A generic and abstract interface representation for linkable objects.<br>
+///        This could be an MachO executable, bundle, dylib, or text-based stub<br>
+///        file.<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef LLVM_TEXTAPI_MACHO_INTERFACE_FILE_H<br>
+#define LLVM_TEXTAPI_MACHO_INTERFACE_FILE_H<br>
+<br>
+#include "llvm/ADT/BitmaskEnum.h"<br>
+#include "llvm/ADT/DenseMap.h"<br>
+#include "llvm/ADT/Hashing.h"<br>
+#include "llvm/ADT/StringRef.h"<br>
+#include "llvm/ADT/iterator.h"<br>
+#include "llvm/BinaryFormat/MachO.h"<br>
+#include "llvm/BinaryFormat/Magic.h"<br>
+#include "llvm/Support/Allocator.h"<br>
+#include "llvm/Support/Error.h"<br>
+#include "llvm/TextAPI/MachO/Architecture.h"<br>
+#include "llvm/TextAPI/MachO/ArchitectureSet.h"<br>
+#include "llvm/TextAPI/MachO/PackedVersion.h"<br>
+#include "llvm/TextAPI/MachO/Symbol.h"<br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+/// Defines a list of Objective-C constraints.<br>
+enum class ObjCConstraintType : unsigned {<br>
+  /// No constraint.<br>
+  None = 0,<br>
+<br>
+  /// Retain/Release.<br>
+  Retain_Release = 1,<br>
+<br>
+  /// Retain/Release for Simulator.<br>
+  Retain_Release_For_Simulator = 2,<br>
+<br>
+  /// Retain/Release or Garbage Collection.<br>
+  Retain_Release_Or_GC = 3,<br>
+<br>
+  /// Garbage Collection.<br>
+  GC = 4,<br>
+};<br>
+<br>
+// clang-format off<br>
+<br>
+/// Defines the file type this file represents.<br>
+enum FileType : unsigned {<br>
+  /// Invalid file type.<br>
+  Invalid = 0U,<br>
+<br>
+  /// Text-based stub file (.tbd) version 1.0<br>
+  TBD_V1  = 1U <<  0,<br>
+<br>
+  /// Text-based stub file (.tbd) version 2.0<br>
+  TBD_V2  = 1U <<  1,<br>
+<br>
+  /// Text-based stub file (.tbd) version 3.0<br>
+  TBD_V3  = 1U <<  2,<br>
+<br>
+  All     = ~0U,<br>
+<br>
+  LLVM_MARK_AS_BITMASK_ENUM(/*LargestValue=*/All),<br>
+};<br>
+<br>
+// clang-format on<br>
+<br>
+/// Reference to an interface file.<br>
+class InterfaceFileRef {<br>
+public:<br>
+  InterfaceFileRef() = default;<br>
+<br>
+  InterfaceFileRef(StringRef InstallName) : InstallName(InstallName) {}<br>
+<br>
+  InterfaceFileRef(StringRef InstallName, ArchitectureSet Archs)<br>
+      : InstallName(InstallName), Architectures(Archs) {}<br>
+<br>
+  StringRef getInstallName() const { return InstallName; };<br>
+  void addArchitectures(ArchitectureSet Archs) { Architectures |= Archs; }<br>
+  ArchitectureSet getArchitectures() const { return Architectures; }<br>
+  bool hasArchitecture(Architecture Arch) const {<br>
+    return Architectures.has(Arch);<br>
+  }<br>
+<br>
+  bool operator==(const InterfaceFileRef &O) const {<br>
+    return std::tie(InstallName, Architectures) ==<br>
+           std::tie(O.InstallName, O.Architectures);<br>
+  }<br>
+<br>
+  bool operator<(const InterfaceFileRef &O) const {<br>
+    return std::tie(InstallName, Architectures) <<br>
+           std::tie(O.InstallName, O.Architectures);<br>
+  }<br>
+<br>
+private:<br>
+  std::string InstallName;<br>
+  ArchitectureSet Architectures;<br>
+};<br>
+<br>
+} // end namespace MachO.<br>
+<br>
+struct SymbolsMapKey {<br>
+  MachO::SymbolKind Kind;<br>
+  StringRef Name;<br>
+<br>
+  SymbolsMapKey(MachO::SymbolKind Kind, StringRef Name)<br>
+      : Kind(Kind), Name(Name) {}<br>
+};<br>
+template <> struct DenseMapInfo<SymbolsMapKey> {<br>
+  static inline SymbolsMapKey getEmptyKey() {<br>
+    return SymbolsMapKey(MachO::SymbolKind::GlobalSymbol, StringRef{});<br>
+  }<br>
+<br>
+  static inline SymbolsMapKey getTombstoneKey() {<br>
+    return SymbolsMapKey(MachO::SymbolKind::ObjectiveCInstanceVariable,<br>
+                         StringRef{});<br>
+  }<br>
+<br>
+  static unsigned getHashValue(const SymbolsMapKey &Key) {<br>
+    return hash_combine(hash_value(Key.Kind), hash_value(Key.Name));<br>
+  }<br>
+<br>
+  static bool isEqual(const SymbolsMapKey &LHS, const SymbolsMapKey &RHS) {<br>
+    return std::tie(LHS.Kind, LHS.Name) == std::tie(RHS.Kind, RHS.Name);<br>
+  }<br>
+};<br>
+<br>
+namespace MachO {<br>
+<br>
+/// Defines the interface file.<br>
+class InterfaceFile {<br>
+public:<br>
+  /// Set the path from which this file was generated (if applicable).<br>
+  ///<br>
+  /// \param Path_ The path to the source file.<br>
+  void setPath(StringRef Path_) { Path = Path_; }<br>
+<br>
+  /// Get the path from which this file was generated (if applicable).<br>
+  ///<br>
+  /// \return The path to the source file or empty.<br>
+  StringRef getPath() const { return Path; }<br>
+<br>
+  /// Set the file type.<br>
+  ///<br>
+  /// This is used by the YAML writer to identify the specification it should<br>
+  /// use for writing the file.<br>
+  ///<br>
+  /// \param Type The file type.<br>
+  void setFileType(FileType Kind) { FileKind = Kind; }<br>
+<br>
+  /// Get the file type.<br>
+  ///<br>
+  /// \return The file type.<br>
+  FileType getFileType() const { return FileKind; }<br>
+<br>
+  /// Set the platform.<br>
+  void setPlatform(PlatformType Platform_) { Platform = Platform_; }<br>
+<br>
+  /// Get the platform.<br>
+  PlatformType getPlatform() const { return Platform; }<br>
+<br>
+  /// Specify the set of supported architectures by this file.<br>
+  void setArchitectures(ArchitectureSet Architectures_) {<br>
+    Architectures = Architectures_;<br>
+  }<br>
+<br>
+  /// Add the set of supported architectures by this file.<br>
+  void addArchitectures(ArchitectureSet Architectures_) {<br>
+    Architectures |= Architectures_;<br>
+  }<br>
+<br>
+  /// Add supported architecture by this file..<br>
+  void addArch(Architecture Arch) { Architectures.set(Arch); }<br>
+<br>
+  /// Get the set of supported architectures.<br>
+  ArchitectureSet getArchitectures() const { return Architectures; }<br>
+<br>
+  /// Set the install name of the library.<br>
+  void setInstallName(StringRef InstallName_) { InstallName = InstallName_; }<br>
+<br>
+  /// Get the install name of the library.<br>
+  StringRef getInstallName() const { return InstallName; }<br>
+<br>
+  /// Set the current version of the library.<br>
+  void setCurrentVersion(PackedVersion Version) { CurrentVersion = Version; }<br>
+<br>
+  /// Get the current version of the library.<br>
+  PackedVersion getCurrentVersion() const { return CurrentVersion; }<br>
+<br>
+  /// Set the compatibility version of the library.<br>
+  void setCompatibilityVersion(PackedVersion Version) {<br>
+    CompatibilityVersion = Version;<br>
+  }<br>
+<br>
+  /// Get the compatibility version of the library.<br>
+  PackedVersion getCompatibilityVersion() const { return CompatibilityVersion; }<br>
+<br>
+  /// Set the Swift ABI version of the library.<br>
+  void setSwiftABIVersion(uint8_t Version) { SwiftABIVersion = Version; }<br>
+<br>
+  /// Get the Swift ABI version of the library.<br>
+  uint8_t getSwiftABIVersion() const { return SwiftABIVersion; }<br>
+<br>
+  /// Specify if the library uses two-level namespace (or flat namespace).<br>
+  void setTwoLevelNamespace(bool V = true) { IsTwoLevelNamespace = V; }<br>
+<br>
+  /// Check if the library uses two-level namespace.<br>
+  bool isTwoLevelNamespace() const { return IsTwoLevelNamespace; }<br>
+<br>
+  /// Specify if the library is application extension safe (or not).<br>
+  void setApplicationExtensionSafe(bool V = true) { IsAppExtensionSafe = V; }<br>
+<br>
+  /// Check if the library is application extension safe.<br>
+  bool isApplicationExtensionSafe() const { return IsAppExtensionSafe; }<br>
+<br>
+  /// Set the Objective-C constraint.<br>
+  void setObjCConstraint(ObjCConstraintType Constraint) {<br>
+    ObjcConstraint = Constraint;<br>
+  }<br>
+<br>
+  /// Get the Objective-C constraint.<br>
+  ObjCConstraintType getObjCConstraint() const { return ObjcConstraint; }<br>
+<br>
+  /// Specify if this file was generated during InstallAPI (or not).<br>
+  void setInstallAPI(bool V = true) { IsInstallAPI = V; }<br>
+<br>
+  /// Check if this file was generated during InstallAPI.<br>
+  bool isInstallAPI() const { return IsInstallAPI; }<br>
+<br>
+  /// Set the parent umbrella framework.<br>
+  void setParentUmbrella(StringRef Parent) { ParentUmbrella = Parent; }<br>
+<br>
+  /// Get the parent umbrella framework.<br>
+  StringRef getParentUmbrella() const { return ParentUmbrella; }<br>
+<br>
+  /// Add an allowable client.<br>
+  ///<br>
+  /// Mach-O Dynamic libraries have the concept of allowable clients that are<br>
+  /// checked during static link time. The name of the application or library<br>
+  /// that is being generated needs to match one of the allowable clients or the<br>
+  /// linker refuses to link this library.<br>
+  ///<br>
+  /// \param Name The name of the client that is allowed to link this library.<br>
+  /// \param Architectures The set of architecture for which this applies.<br>
+  void addAllowableClient(StringRef Name, ArchitectureSet Architectures);<br>
+<br>
+  /// Get the list of allowable clients.<br>
+  ///<br>
+  /// \return Returns a list of allowable clients.<br>
+  const std::vector<InterfaceFileRef> &allowableClients() const {<br>
+    return AllowableClients;<br>
+  }<br>
+<br>
+  /// Add a re-exported library.<br>
+  ///<br>
+  /// \param Name The name of the library to re-export.<br>
+  /// \param Architectures The set of architecture for which this applies.<br>
+  void addReexportedLibrary(StringRef InstallName,<br>
+                            ArchitectureSet Architectures);<br>
+<br>
+  /// Get the list of re-exported libraries.<br>
+  ///<br>
+  /// \return Returns a list of re-exported libraries.<br>
+  const std::vector<InterfaceFileRef> &reexportedLibraries() const {<br>
+    return ReexportedLibraries;<br>
+  }<br>
+<br>
+  /// Add an architecture/UUID pair.<br>
+  ///<br>
+  /// \param Arch The architecture for which this applies.<br>
+  /// \param UUID The UUID of the library for the specified architecture.<br>
+  void addUUID(Architecture Arch, StringRef UUID);<br>
+<br>
+  /// Add an architecture/UUID pair.<br>
+  ///<br>
+  /// \param Arch The architecture for which this applies.<br>
+  /// \param UUID The UUID of the library for the specified architecture.<br>
+  void addUUID(Architecture Arch, uint8_t UUID[16]);<br>
+<br>
+  /// Get the list of architecture/UUID pairs.<br>
+  ///<br>
+  /// \return Returns a list of architecture/UUID pairs.<br>
+  const std::vector<std::pair<Architecture, std::string>> &uuids() const {<br>
+    return UUIDs;<br>
+  }<br>
+<br>
+  /// Add a symbol to the symbols list or extend an existing one.<br>
+  void addSymbol(SymbolKind Kind, StringRef Name, ArchitectureSet Architectures,<br>
+                 SymbolFlags Flags = SymbolFlags::None);<br>
+<br>
+  using SymbolMapType = DenseMap<SymbolsMapKey, Symbol *>;<br>
+  struct const_symbol_iterator<br>
+      : public iterator_adaptor_base<<br>
+            const_symbol_iterator, SymbolMapType::const_iterator,<br>
+            std::forward_iterator_tag, const Symbol *, ptrdiff_t,<br>
+            const Symbol *, const Symbol *> {<br>
+    const_symbol_iterator() = default;<br>
+<br>
+    template <typename U><br>
+    const_symbol_iterator(U &&u)<br>
+        : iterator_adaptor_base(std::forward<U &&>(u)) {}<br>
+<br>
+    reference operator*() const { return I->second; }<br>
+    pointer operator->() const { return I->second; }<br>
+  };<br>
+  using const_symbol_range = iterator_range<const_symbol_iterator>;<br>
+<br>
+  // Custom iterator to return only exported symbols.<br>
+  struct const_export_iterator<br>
+      : public iterator_adaptor_base<<br>
+            const_export_iterator, const_symbol_iterator,<br>
+            std::forward_iterator_tag, const Symbol *> {<br>
+    const_symbol_iterator _end;<br>
+<br>
+    void skipToNextSymbol() {<br>
+      while (I != _end && I->isUndefined())<br>
+        ++I;<br>
+    }<br>
+<br>
+    const_export_iterator() = default;<br>
+    template <typename U><br>
+    const_export_iterator(U &&it, U &&end)<br>
+        : iterator_adaptor_base(std::forward<U &&>(it)),<br>
+          _end(std::forward<U &&>(end)) {<br>
+      skipToNextSymbol();<br>
+    }<br>
+<br>
+    const_export_iterator &operator++() {<br>
+      ++I;<br>
+      skipToNextSymbol();<br>
+      return *this;<br>
+    }<br>
+<br>
+    const_export_iterator operator++(int) {<br>
+      const_export_iterator tmp(*this);<br>
+      ++(*this);<br>
+      return tmp;<br>
+    }<br>
+  };<br>
+  using const_export_range = llvm::iterator_range<const_export_iterator>;<br>
+<br>
+  // Custom iterator to return only undefined symbols.<br>
+  struct const_undefined_iterator<br>
+      : public iterator_adaptor_base<<br>
+            const_undefined_iterator, const_symbol_iterator,<br>
+            std::forward_iterator_tag, const Symbol *> {<br>
+    const_symbol_iterator _end;<br>
+<br>
+    void skipToNextSymbol() {<br>
+      while (I != _end && !I->isUndefined())<br>
+        ++I;<br>
+    }<br>
+<br>
+    const_undefined_iterator() = default;<br>
+    template <typename U><br>
+    const_undefined_iterator(U &&it, U &&end)<br>
+        : iterator_adaptor_base(std::forward<U &&>(it)),<br>
+          _end(std::forward<U &&>(end)) {<br>
+      skipToNextSymbol();<br>
+    }<br>
+<br>
+    const_undefined_iterator &operator++() {<br>
+      ++I;<br>
+      skipToNextSymbol();<br>
+      return *this;<br>
+    }<br>
+<br>
+    const_undefined_iterator operator++(int) {<br>
+      const_undefined_iterator tmp(*this);<br>
+      ++(*this);<br>
+      return tmp;<br>
+    }<br>
+  };<br>
+  using const_undefined_range = llvm::iterator_range<const_undefined_iterator>;<br>
+<br>
+  const_symbol_range symbols() const {<br>
+    return {Symbols.begin(), Symbols.end()};<br>
+  }<br>
+  const_export_range exports() const {<br>
+    return {{Symbols.begin(), Symbols.end()}, {Symbols.end(), Symbols.end()}};<br>
+  }<br>
+  const_undefined_range undefineds() const {<br>
+    return {{Symbols.begin(), Symbols.end()}, {Symbols.end(), Symbols.end()}};<br>
+  }<br>
+<br>
+private:<br>
+  llvm::BumpPtrAllocator Allocator;<br>
+  StringRef copyString(StringRef String) {<br>
+    if (String.empty())<br>
+      return {};<br>
+<br>
+    void *Ptr = Allocator.Allocate(String.size(), 1);<br>
+    memcpy(Ptr, String.data(), String.size());<br>
+    return StringRef(reinterpret_cast<const char *>(Ptr), String.size());<br>
+  }<br>
+<br>
+  std::string Path;<br>
+  FileType FileKind;<br>
+  PlatformType Platform;<br>
+  ArchitectureSet Architectures;<br>
+  std::string InstallName;<br>
+  PackedVersion CurrentVersion;<br>
+  PackedVersion CompatibilityVersion;<br>
+  uint8_t SwiftABIVersion{0};<br>
+  bool IsTwoLevelNamespace{false};<br>
+  bool IsAppExtensionSafe{false};<br>
+  bool IsInstallAPI{false};<br>
+  ObjCConstraintType ObjcConstraint = ObjCConstraintType::None;<br>
+  std::string ParentUmbrella;<br>
+  std::vector<InterfaceFileRef> AllowableClients;<br>
+  std::vector<InterfaceFileRef> ReexportedLibraries;<br>
+  std::vector<std::pair<Architecture, std::string>> UUIDs;<br>
+  SymbolMapType Symbols;<br>
+};<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
+<br>
+#endif // LLVM_TEXTAPI_MACHO_INTERFACE_FILE_H<br>
<br>
Added: llvm/trunk/include/llvm/TextAPI/MachO/PackedVersion.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/PackedVersion.h?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/PackedVersion.h?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/TextAPI/MachO/PackedVersion.h (added)<br>
+++ llvm/trunk/include/llvm/TextAPI/MachO/PackedVersion.h Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,66 @@<br>
+//===- llvm/TextAPI/PackedVersion.h - PackedVersion -------------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Defines the Mach-O packed version format.<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef LLVM_TEXTAPI_MACHO_PACKED_VERSION_H<br>
+#define LLVM_TEXTAPI_MACHO_PACKED_VERSION_H<br>
+<br>
+#include "llvm/ADT/StringRef.h"<br>
+#include "llvm/Support/raw_ostream.h"<br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+class PackedVersion {<br>
+  uint32_t Version{0};<br>
+<br>
+public:<br>
+  constexpr PackedVersion() = default;<br>
+  explicit constexpr PackedVersion(uint32_t RawVersion) : Version(RawVersion) {}<br>
+  PackedVersion(unsigned Major, unsigned Minor, unsigned Subminor)<br>
+      : Version((Major << 16) | ((Minor & 0xff) << 8) | (Subminor & 0xff)) {}<br>
+<br>
+  bool empty() const { return Version == 0; }<br>
+<br>
+  /// Retrieve the major version number.<br>
+  unsigned getMajor() const { return Version >> 16; }<br>
+<br>
+  /// Retrieve the minor version number, if provided.<br>
+  unsigned getMinor() const { return (Version >> 8) & 0xff; }<br>
+<br>
+  /// Retrieve the subminor version number, if provided.<br>
+  unsigned getSubminor() const { return Version & 0xff; }<br>
+<br>
+  bool parse32(StringRef Str);<br>
+  std::pair<bool, bool> parse64(StringRef Str);<br>
+<br>
+  bool operator<(const PackedVersion &O) const { return Version < O.Version; }<br>
+<br>
+  bool operator==(const PackedVersion &O) const { return Version == O.Version; }<br>
+<br>
+  bool operator!=(const PackedVersion &O) const { return Version != O.Version; }<br>
+<br>
+  uint32_t rawValue() const { return Version; }<br>
+<br>
+  void print(raw_ostream &OS) const;<br>
+};<br>
+<br>
+inline raw_ostream &operator<<(raw_ostream &OS, const PackedVersion &Version) {<br>
+  Version.print(OS);<br>
+  return OS;<br>
+}<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
+<br>
+#endif // LLVM_TEXTAPI_MACHO_PACKED_VERSION_H<br>
<br>
Added: llvm/trunk/include/llvm/TextAPI/MachO/Symbol.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/Symbol.h?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/Symbol.h?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/TextAPI/MachO/Symbol.h (added)<br>
+++ llvm/trunk/include/llvm/TextAPI/MachO/Symbol.h Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,102 @@<br>
+//===- llvm/TextAPI/Symbol.h - TAPI Symbol ----------------------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Symbol<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef LLVM_TEXTAPI_MACHO_SYMBOL_H<br>
+#define LLVM_TEXTAPI_MACHO_SYMBOL_H<br>
+<br>
+#include "llvm/ADT/BitmaskEnum.h"<br>
+#include "llvm/ADT/StringRef.h"<br>
+#include "llvm/Support/Error.h"<br>
+#include "llvm/Support/raw_ostream.h"<br>
+#include "llvm/TextAPI/MachO/ArchitectureSet.h"<br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+// clang-format off<br>
+<br>
+/// Symbol flags.<br>
+enum class SymbolFlags : uint8_t {<br>
+  /// No flags<br>
+  None             = 0,<br>
+<br>
+  /// Thread-local value symbol<br>
+  ThreadLocalValue = 1U << 0,<br>
+<br>
+  /// Weak defined symbol<br>
+  WeakDefined      = 1U << 1,<br>
+<br>
+  /// Weak referenced symbol<br>
+  WeakReferenced   = 1U << 2,<br>
+<br>
+  /// Undefined<br>
+  Undefined        = 1U << 3,<br>
+<br>
+  LLVM_MARK_AS_BITMASK_ENUM(/*LargestValue=*/Undefined),<br>
+};<br>
+<br>
+// clang-format on<br>
+<br>
+enum class SymbolKind : uint8_t {<br>
+  GlobalSymbol,<br>
+  ObjectiveCClass,<br>
+  ObjectiveCClassEHType,<br>
+  ObjectiveCInstanceVariable,<br>
+};<br>
+<br>
+class Symbol {<br>
+public:<br>
+  constexpr Symbol(SymbolKind Kind, StringRef Name,<br>
+                   ArchitectureSet Architectures, SymbolFlags Flags)<br>
+      : Name(Name), Architectures(Architectures), Kind(Kind), Flags(Flags) {}<br>
+<br>
+  SymbolKind getKind() const { return Kind; }<br>
+  StringRef getName() const { return Name; }<br>
+  ArchitectureSet getArchitectures() const { return Architectures; }<br>
+  void addArchitectures(ArchitectureSet Archs) { Architectures |= Archs; }<br>
+  SymbolFlags getFlags() const { return Flags; }<br>
+<br>
+  bool isWeakDefined() const {<br>
+    return (Flags & SymbolFlags::WeakDefined) == SymbolFlags::WeakDefined;<br>
+  }<br>
+<br>
+  bool isWeakReferenced() const {<br>
+    return (Flags & SymbolFlags::WeakReferenced) == SymbolFlags::WeakReferenced;<br>
+  }<br>
+<br>
+  bool isThreadLocalValue() const {<br>
+    return (Flags & SymbolFlags::ThreadLocalValue) ==<br>
+           SymbolFlags::ThreadLocalValue;<br>
+  }<br>
+<br>
+  bool isUndefined() const {<br>
+    return (Flags & SymbolFlags::Undefined) == SymbolFlags::Undefined;<br>
+  }<br>
+<br>
+#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)<br>
+  void dump(raw_ostream &OS) const;<br>
+  void dump() const { dump(llvm::errs()); }<br>
+#endif<br>
+<br>
+private:<br>
+  StringRef Name;<br>
+  ArchitectureSet Architectures;<br>
+  SymbolKind Kind;<br>
+  SymbolFlags Flags;<br>
+};<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
+<br>
+#endif // LLVM_TEXTAPI_MACHO_SYMBOL_H<br>
<br>
Added: llvm/trunk/include/llvm/TextAPI/MachO/TextAPIReader.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/TextAPIReader.h?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/TextAPIReader.h?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/TextAPI/MachO/TextAPIReader.h (added)<br>
+++ llvm/trunk/include/llvm/TextAPI/MachO/TextAPIReader.h Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,35 @@<br>
+//===--- TextAPIReader.h - Text API Reader ----------------------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef LLVM_TEXTAPI_MACHO_READER_H<br>
+#define LLVM_TEXTAPI_MACHO_READER_H<br>
+<br>
+#include "llvm/Support/Error.h"<br>
+#include "llvm/Support/MemoryBuffer.h"<br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+class InterfaceFile;<br>
+<br>
+class TextAPIReader {<br>
+public:<br>
+  static Expected<std::unique_ptr<InterfaceFile>><br>
+  get(std::unique_ptr<MemoryBuffer> InputBuffer);<br>
+<br>
+  static Expected<std::unique_ptr<InterfaceFile>><br>
+  getUnmanaged(llvm::MemoryBuffer *InputBuffer);<br>
+<br>
+  TextAPIReader() = delete;<br>
+};<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
+<br>
+#endif // LLVM_TEXTAPI_MACHO_READER_H<br>
<br>
Added: llvm/trunk/include/llvm/TextAPI/MachO/TextAPIWriter.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/TextAPIWriter.h?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/TextAPI/MachO/TextAPIWriter.h?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/TextAPI/MachO/TextAPIWriter.h (added)<br>
+++ llvm/trunk/include/llvm/TextAPI/MachO/TextAPIWriter.h Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,30 @@<br>
+//===--- TextAPIWriter.h - Text API Writer ----------------------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef LLVM_TEXTAPI_MACHO_WRITER_H<br>
+#define LLVM_TEXTAPI_MACHO_WRITER_H<br>
+<br>
+#include "llvm/Support/MemoryBuffer.h"<br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+class InterfaceFile;<br>
+<br>
+class TextAPIWriter {<br>
+public:<br>
+  TextAPIWriter() = delete;<br>
+<br>
+  static Error writeToStream(raw_ostream &os, const InterfaceFile &);<br>
+};<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
+<br>
+#endif // LLVM_TEXTAPI_MACHO_WRITER_H<br>
<br>
Modified: llvm/trunk/lib/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CMakeLists.txt?rev=347823&r1=347822&r2=347823&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CMakeLists.txt?rev=347823&r1=347822&r2=347823&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/CMakeLists.txt Wed Nov 28 17:20:46 2018<br>
@@ -12,6 +12,7 @@ add_subdirectory(Linker)<br>
 add_subdirectory(Analysis)<br>
 add_subdirectory(LTO)<br>
 add_subdirectory(MC)<br>
+add_subdirectory(TextAPI)<br>
 add_subdirectory(Object)<br>
 add_subdirectory(ObjectYAML)<br>
 add_subdirectory(Option)<br>
<br>
Modified: llvm/trunk/lib/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LLVMBuild.txt?rev=347823&r1=347822&r2=347823&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LLVMBuild.txt?rev=347823&r1=347822&r2=347823&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/LLVMBuild.txt (original)<br>
+++ llvm/trunk/lib/LLVMBuild.txt Wed Nov 28 17:20:46 2018<br>
@@ -42,6 +42,7 @@ subdirectories =<br>
  TableGen<br>
  Target<br>
  Testing<br>
+ TextAPI<br>
  ToolDrivers<br>
  Transforms<br>
  WindowsManifest<br>
<br>
Added: llvm/trunk/lib/TextAPI/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/CMakeLists.txt?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/CMakeLists.txt?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TextAPI/CMakeLists.txt (added)<br>
+++ llvm/trunk/lib/TextAPI/CMakeLists.txt Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,12 @@<br>
+add_llvm_library(LLVMTextAPI<br>
+  MachO/Architecture.cpp<br>
+  MachO/ArchitectureSet.cpp<br>
+  MachO/InterfaceFile.cpp<br>
+  MachO/PackedVersion.cpp<br>
+  MachO/Symbol.cpp<br>
+  MachO/TextStub.cpp<br>
+  MachO/TextStubCommon.cpp<br>
+<br>
+  ADDITIONAL_HEADER_DIRS<br>
+  "${LLVM_MAIN_INCLUDE_DIR}/llvm/TextAPI"<br>
+)<br>
<br>
Added: llvm/trunk/lib/TextAPI/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/LLVMBuild.txt?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/LLVMBuild.txt?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TextAPI/LLVMBuild.txt (added)<br>
+++ llvm/trunk/lib/TextAPI/LLVMBuild.txt Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,22 @@<br>
+;===- ./lib/TextAPI/LLVMBuild.txt ------------------------------*- Conf -*--===;<br>
+;<br>
+;                     The LLVM Compiler Infrastructure<br>
+;<br>
+; This file is distributed under the University of Illinois Open Source<br>
+; License. See LICENSE.TXT for details.<br>
+;<br>
+;===------------------------------------------------------------------------===;<br>
+;<br>
+; This is an LLVMBuild description file for the components in this subdirectory.<br>
+;<br>
+; For more information on the LLVMBuild system, please see:<br>
+;<br>
+;   <a href="http://llvm.org/docs/LLVMBuild.html" rel="noreferrer" target="_blank">http://llvm.org/docs/LLVMBuild.html</a><br>
+;<br>
+;===------------------------------------------------------------------------===;<br>
+<br>
+[component_0]<br>
+type = Library<br>
+name = TextAPI<br>
+parent = Libraries<br>
+required_libraries = Support BinaryFormat<br>
<br>
Added: llvm/trunk/lib/TextAPI/MachO/Architecture.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/Architecture.cpp?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/Architecture.cpp?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TextAPI/MachO/Architecture.cpp (added)<br>
+++ llvm/trunk/lib/TextAPI/MachO/Architecture.cpp Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,79 @@<br>
+//===- llvm/TextAPI/Architecture.cpp - Architecture -------------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Implements the architecture helper functions.<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#include "llvm/TextAPI/MachO/Architecture.h"<br>
+#include "llvm/ADT/StringSwitch.h"<br>
+#include "llvm/BinaryFormat/MachO.h"<br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+Architecture getArchitectureFromCpuType(uint32_t CPUType, uint32_t CPUSubType) {<br>
+#define ARCHINFO(Arch, Type, Subtype)                                          \<br>
+  if (CPUType == (Type) &&                                                     \<br>
+      (CPUSubType & ~MachO::CPU_SUBTYPE_MASK) == (Subtype))                    \<br>
+    return Architecture::Arch;<br>
+#include "llvm/TextAPI/MachO/Architecture.def"<br>
+#undef ARCHINFO<br>
+<br>
+  return Architecture::unknown;<br>
+}<br>
+<br>
+Architecture getArchitectureFromName(StringRef Name) {<br>
+  return StringSwitch<Architecture>(Name)<br>
+#define ARCHINFO(Arch, Type, Subtype) .Case(#Arch, Architecture::Arch)<br>
+#include "llvm/TextAPI/MachO/Architecture.def"<br>
+#undef ARCHINFO<br>
+      .Default(Architecture::unknown);<br>
+}<br>
+<br>
+StringRef getArchitectureName(Architecture Arch) {<br>
+  switch (Arch) {<br>
+#define ARCHINFO(Arch, Type, Subtype)                                          \<br>
+  case Architecture::Arch:                                                     \<br>
+    return #Arch;<br>
+#include "llvm/TextAPI/MachO/Architecture.def"<br>
+#undef ARCHINFO<br>
+  case Architecture::unknown:<br>
+    return "unknown";<br>
+  }<br>
+<br>
+  // Appease some compilers that cannot figure out that this is a fully covered<br>
+  // switch statement.<br>
+  return "unknown";<br>
+}<br>
+<br>
+std::pair<uint32_t, uint32_t> getCPUTypeFromArchitecture(Architecture Arch) {<br>
+  switch (Arch) {<br>
+#define ARCHINFO(Arch, Type, Subtype)                                          \<br>
+  case Architecture::Arch:                                                     \<br>
+    return std::make_pair(Type, Subtype);<br>
+#include "llvm/TextAPI/MachO/Architecture.def"<br>
+#undef ARCHINFO<br>
+  case Architecture::unknown:<br>
+    return std::make_pair(0, 0);<br>
+  }<br>
+<br>
+  // Appease some compilers that cannot figure out that this is a fully covered<br>
+  // switch statement.<br>
+  return std::make_pair(0, 0);<br>
+}<br>
+<br>
+raw_ostream &operator<<(raw_ostream &OS, Architecture Arch) {<br>
+  OS << getArchitectureName(Arch);<br>
+  return OS;<br>
+}<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
<br>
Added: llvm/trunk/lib/TextAPI/MachO/ArchitectureSet.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/ArchitectureSet.cpp?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/ArchitectureSet.cpp?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TextAPI/MachO/ArchitectureSet.cpp (added)<br>
+++ llvm/trunk/lib/TextAPI/MachO/ArchitectureSet.cpp Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,71 @@<br>
+//===- llvm/TextAPI/ArchitectureSet.cpp - Architecture Set ------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Implements the architecture set.<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#include "llvm/TextAPI/MachO/ArchitectureSet.h"<br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+ArchitectureSet::ArchitectureSet(const std::vector<Architecture> &Archs)<br>
+    : ArchitectureSet() {<br>
+  for (auto Arch : Archs) {<br>
+    if (Arch == Architecture::unknown)<br>
+      continue;<br>
+    set(Arch);<br>
+  }<br>
+}<br>
+<br>
+size_t ArchitectureSet::count() const {<br>
+  // popcnt<br>
+  size_t Cnt = 0;<br>
+  for (unsigned i = 0; i < sizeof(ArchSetType) * 8; ++i)<br>
+    if (ArchSet & (1U << i))<br>
+      ++Cnt;<br>
+  return Cnt;<br>
+}<br>
+<br>
+ArchitectureSet::operator std::string() const {<br>
+  if (empty())<br>
+    return "[(empty)]";<br>
+<br>
+  std::string result;<br>
+  auto size = count();<br>
+  for (auto arch : *this) {<br>
+    result.append(getArchitectureName(arch));<br>
+    size -= 1;<br>
+    if (size)<br>
+      result.append(" ");<br>
+  }<br>
+  return result;<br>
+}<br>
+<br>
+ArchitectureSet::operator std::vector<Architecture>() const {<br>
+  std::vector<Architecture> archs;<br>
+  for (auto arch : *this) {<br>
+    if (arch == Architecture::unknown)<br>
+      continue;<br>
+    archs.emplace_back(arch);<br>
+  }<br>
+  return archs;<br>
+}<br>
+<br>
+void ArchitectureSet::print(raw_ostream &os) const { os << std::string(*this); }<br>
+<br>
+raw_ostream &operator<<(raw_ostream &os, ArchitectureSet set) {<br>
+  set.print(os);<br>
+  return os;<br>
+}<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
<br>
Added: llvm/trunk/lib/TextAPI/MachO/InterfaceFile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/InterfaceFile.cpp?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/InterfaceFile.cpp?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TextAPI/MachO/InterfaceFile.cpp (added)<br>
+++ llvm/trunk/lib/TextAPI/MachO/InterfaceFile.cpp Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,86 @@<br>
+//===- lib/TextAPI/InterfaceFile.cpp - Interface File -----------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Implements the Interface File.<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#include "llvm/TextAPI/MachO/InterfaceFile.h"<br>
+#include <iomanip><br>
+#include <sstream><br>
+<br>
+using namespace llvm::MachO;<br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+namespace detail {<br>
+template <typename C><br>
+typename C::iterator addEntry(C &Container, StringRef InstallName) {<br>
+  auto I =<br>
+      std::lower_bound(std::begin(Container), std::end(Container), InstallName,<br>
+                       [](const InterfaceFileRef &LHS, const StringRef &RHS) {<br>
+                         return LHS.getInstallName() < RHS;<br>
+                       });<br>
+  if ((I != std::end(Container)) && !(InstallName < I->getInstallName()))<br>
+    return I;<br>
+<br>
+  return Container.emplace(I, InstallName);<br>
+}<br>
+} // end namespace detail.<br>
+<br>
+void InterfaceFile::addAllowableClient(StringRef Name,<br>
+                                       ArchitectureSet Architectures) {<br>
+  auto Client = detail::addEntry(AllowableClients, Name);<br>
+  Client->addArchitectures(Architectures);<br>
+}<br>
+<br>
+void InterfaceFile::addReexportedLibrary(StringRef InstallName,<br>
+                                         ArchitectureSet Architectures) {<br>
+  auto Lib = detail::addEntry(ReexportedLibraries, InstallName);<br>
+  Lib->addArchitectures(Architectures);<br>
+}<br>
+<br>
+void InterfaceFile::addUUID(Architecture Arch, StringRef UUID) {<br>
+  auto I = std::lower_bound(UUIDs.begin(), UUIDs.end(), Arch,<br>
+                            [](const std::pair<Architecture, std::string> &LHS,<br>
+                               Architecture RHS) { return LHS.first < RHS; });<br>
+<br>
+  if ((I != UUIDs.end()) && !(Arch < I->first)) {<br>
+    I->second = UUID;<br>
+    return;<br>
+  }<br>
+<br>
+  UUIDs.emplace(I, Arch, UUID);<br>
+  return;<br>
+}<br>
+<br>
+void InterfaceFile::addUUID(Architecture Arch, uint8_t UUID[16]) {<br>
+  std::stringstream Stream;<br>
+  for (unsigned i = 0; i < 16; ++i) {<br>
+    if (i == 4 || i == 6 || i == 8 || i == 10)<br>
+      Stream << '-';<br>
+    Stream << std::setfill('0') << std::setw(2) << std::uppercase << std::hex<br>
+           << static_cast<int>(UUID[i]);<br>
+  }<br>
+  addUUID(Arch, Stream.str());<br>
+}<br>
+<br>
+void InterfaceFile::addSymbol(SymbolKind Kind, StringRef Name,<br>
+                              ArchitectureSet Archs, SymbolFlags Flags) {<br>
+  Name = copyString(Name);<br>
+  auto result = Symbols.try_emplace(SymbolsMapKey{Kind, Name}, nullptr);<br>
+  if (result.second)<br>
+    result.first->second = new (Allocator) Symbol{Kind, Name, Archs, Flags};<br>
+  else<br>
+    result.first->second->addArchitectures(Archs);<br>
+}<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
<br>
Added: llvm/trunk/lib/TextAPI/MachO/PackedVersion.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/PackedVersion.cpp?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/PackedVersion.cpp?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TextAPI/MachO/PackedVersion.cpp (added)<br>
+++ llvm/trunk/lib/TextAPI/MachO/PackedVersion.cpp Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,115 @@<br>
+//===- llvm/TextAPI/PackedVersion.cpp - PackedVersion -----------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Implements the Mach-O packed version.<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#include "llvm/TextAPI/MachO/PackedVersion.h"<br>
+#include "llvm/ADT/SmallString.h"<br>
+#include "llvm/ADT/SmallVector.h"<br>
+#include "llvm/ADT/StringExtras.h"<br>
+#include "llvm/Support/Format.h"<br>
+#include "llvm/Support/raw_ostream.h"<br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+bool PackedVersion::parse32(StringRef Str) {<br>
+  Version = 0;<br>
+<br>
+  if (Str.empty())<br>
+    return false;<br>
+<br>
+  SmallVector<StringRef, 3> Parts;<br>
+  SplitString(Str, Parts, ".");<br>
+<br>
+  if (Parts.size() > 3)<br>
+    return false;<br>
+<br>
+  unsigned long long Num;<br>
+  if (getAsUnsignedInteger(Parts[0], 10, Num))<br>
+    return false;<br>
+<br>
+  if (Num > UINT16_MAX)<br>
+    return false;<br>
+<br>
+  Version = Num << 16;<br>
+<br>
+  for (unsigned i = 1, ShiftNum = 8; i < Parts.size(); ++i, ShiftNum -= 8) {<br>
+    if (getAsUnsignedInteger(Parts[i], 10, Num))<br>
+      return false;<br>
+<br>
+    if (Num > UINT8_MAX)<br>
+      return false;<br>
+<br>
+    Version |= (Num << ShiftNum);<br>
+  }<br>
+<br>
+  return true;<br>
+}<br>
+<br>
+std::pair<bool, bool> PackedVersion::parse64(StringRef Str) {<br>
+  bool Truncated = false;<br>
+  Version = 0;<br>
+<br>
+  if (Str.empty())<br>
+    return std::make_pair(false, Truncated);<br>
+<br>
+  SmallVector<StringRef, 5> Parts;<br>
+  SplitString(Str, Parts, ".");<br>
+<br>
+  if (Parts.size() > 5)<br>
+    return std::make_pair(false, Truncated);<br>
+<br>
+  unsigned long long Num;<br>
+  if (getAsUnsignedInteger(Parts[0], 10, Num))<br>
+    return std::make_pair(false, Truncated);<br>
+<br>
+  if (Num > 0xFFFFFFULL)<br>
+    return std::make_pair(false, Truncated);<br>
+<br>
+  if (Num > 0xFFFFULL) {<br>
+    Num = 0xFFFFULL;<br>
+    Truncated = true;<br>
+  }<br>
+  Version = Num << 16;<br>
+<br>
+  for (unsigned i = 1, ShiftNum = 8; i < Parts.size() && i < 3;<br>
+       ++i, ShiftNum -= 8) {<br>
+    if (getAsUnsignedInteger(Parts[i], 10, Num))<br>
+      return std::make_pair(false, Truncated);<br>
+<br>
+    if (Num > 0x3FFULL)<br>
+      return std::make_pair(false, Truncated);<br>
+<br>
+    if (Num > 0xFFULL) {<br>
+      Num = 0xFFULL;<br>
+      Truncated = true;<br>
+    }<br>
+    Version |= (Num << ShiftNum);<br>
+  }<br>
+<br>
+  if (Parts.size() > 3)<br>
+    Truncated = true;<br>
+<br>
+  return std::make_pair(true, Truncated);<br>
+}<br>
+<br>
+void PackedVersion::print(raw_ostream &OS) const {<br>
+  OS << format("%d", getMajor());<br>
+  if (getMinor() || getSubminor())<br>
+    OS << format(".%d", getMinor());<br>
+  if (getSubminor())<br>
+    OS << format(".%d", getSubminor());<br>
+}<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
<br>
Added: llvm/trunk/lib/TextAPI/MachO/Symbol.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/Symbol.cpp?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/Symbol.cpp?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TextAPI/MachO/Symbol.cpp (added)<br>
+++ llvm/trunk/lib/TextAPI/MachO/Symbol.cpp Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,51 @@<br>
+//===- lib/TextAPI/Symbol.cpp - Symbol --------------------------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Implements the Symbol<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#include "llvm/TextAPI/MachO/Symbol.h"<br>
+#include <string><br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)<br>
+LLVM_DUMP_METHOD void Symbol::dump(raw_ostream &OS) const {<br>
+  std::string Result;<br>
+  if (isUndefined())<br>
+    Result += "(undef) ";<br>
+  if (isWeakDefined())<br>
+    Result += "(weak-def) ";<br>
+  if (isWeakReferenced())<br>
+    Result += "(weak-ref) ";<br>
+  if (isThreadLocalValue())<br>
+    Result += "(tlv) ";<br>
+  switch (Kind) {<br>
+  case SymbolKind::GlobalSymbol:<br>
+    Result + Name.str();<br>
+    break;<br>
+  case SymbolKind::ObjectiveCClass:<br>
+    Result + "(ObjC Class) " + Name.str();<br>
+    break;<br>
+  case SymbolKind::ObjectiveCClassEHType:<br>
+    Result + "(ObjC Class EH) " + Name.str();<br>
+    break;<br>
+  case SymbolKind::ObjectiveCInstanceVariable:<br>
+    Result + "(ObjC IVar) " + Name.str();<br>
+    break;<br>
+  }<br>
+  OS << Result;<br>
+}<br>
+#endif<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
<br>
Added: llvm/trunk/lib/TextAPI/MachO/TextAPIContext.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/TextAPIContext.h?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/TextAPIContext.h?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TextAPI/MachO/TextAPIContext.h (added)<br>
+++ llvm/trunk/lib/TextAPI/MachO/TextAPIContext.h Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,35 @@<br>
+//===- llvm/TextAPI/YAMLContext.h - YAML Context ----------------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Defines the YAML Context for the TextAPI Reader/Writer<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef LLVM_TEXTAPI_MACHO_CONTEXT_H<br>
+#define LLVM_TEXTAPI_MACHO_CONTEXT_H<br>
+<br>
+#include "llvm/Support/MemoryBuffer.h"<br>
+#include <string><br>
+<br>
+namespace llvm {<br>
+namespace MachO {<br>
+<br>
+enum FileType : unsigned;<br>
+<br>
+struct TextAPIContext {<br>
+  std::string ErrorMessage;<br>
+  std::string Path;<br>
+  FileType FileKind;<br>
+};<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
+<br>
+#endif // LLVM_TEXTAPI_MACHO_CONTEXT_H<br>
<br>
Added: llvm/trunk/lib/TextAPI/MachO/TextStub.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/TextStub.cpp?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/TextStub.cpp?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TextAPI/MachO/TextStub.cpp (added)<br>
+++ llvm/trunk/lib/TextAPI/MachO/TextStub.cpp Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,660 @@<br>
+//===- llvm/TextAPI/TextStub.cpp - Text Stub --------------------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Implements the text stub file reader/writer.<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#include "TextAPIContext.h"<br>
+#include "TextStubCommon.h"<br>
+#include "llvm/ADT/BitmaskEnum.h"<br>
+#include "llvm/ADT/SmallString.h"<br>
+#include "llvm/ADT/StringRef.h"<br>
+#include "llvm/Support/Allocator.h"<br>
+#include "llvm/Support/SourceMgr.h"<br>
+#include "llvm/Support/YAMLTraits.h"<br>
+#include "llvm/Support/raw_ostream.h"<br>
+#include "llvm/TextAPI/MachO/Architecture.h"<br>
+#include "llvm/TextAPI/MachO/ArchitectureSet.h"<br>
+#include "llvm/TextAPI/MachO/InterfaceFile.h"<br>
+#include "llvm/TextAPI/MachO/PackedVersion.h"<br>
+#include "llvm/TextAPI/MachO/TextAPIReader.h"<br>
+#include "llvm/TextAPI/MachO/TextAPIWriter.h"<br>
+#include <algorithm><br>
+#include <set><br>
+<br>
+// clang-format off<br>
+/*<br>
+<br>
+ YAML Format specification.<br>
+<br>
+ The TBD v1 format only support two level address libraries and is per<br>
+ definition application extension safe.<br>
+<br>
+---                              # the tag !tapi-tbd-v1 is optional and<br>
+                                 # shouldn't be emitted to support older linker.<br>
+archs: [ armv7, armv7s, arm64 ]  # the list of architecture slices that are<br>
+                                 # supported by this file.<br>
+platform: ios                    # Specifies the platform (macosx, ios, etc)<br>
+install-name: /u/l/libfoo.dylib  #<br>
+current-version: 1.2.3           # Optional: defaults to 1.0<br>
+compatibility-version: 1.0       # Optional: defaults to 1.0<br>
+swift-version: 0                 # Optional: defaults to 0<br>
+objc-constraint: none            # Optional: defaults to none<br>
+exports:                         # List of export sections<br>
+...<br>
+<br>
+Each export section is defined as following:<br>
+<br>
+ - archs: [ arm64 ]                   # the list of architecture slices<br>
+   allowed-clients: [ client ]        # Optional: List of clients<br>
+   re-exports: [ ]                    # Optional: List of re-exports<br>
+   symbols: [ _sym ]                  # Optional: List of symbols<br>
+   objc-classes: []                   # Optional: List of Objective-C classes<br>
+   objc-ivars: []                     # Optional: List of Objective C Instance<br>
+                                      #           Variables<br>
+   weak-def-symbols: []               # Optional: List of weak defined symbols<br>
+   thread-local-symbols: []           # Optional: List of thread local symbols<br>
+*/<br>
+<br>
+/*<br>
+<br>
+ YAML Format specification.<br>
+<br>
+--- !tapi-tbd-v2<br>
+archs: [ armv7, armv7s, arm64 ]  # the list of architecture slices that are<br>
+                                 # supported by this file.<br>
+uuids: [ armv7:... ]             # Optional: List of architecture and UUID pairs.<br>
+platform: ios                    # Specifies the platform (macosx, ios, etc)<br>
+flags: []                        # Optional:<br>
+install-name: /u/l/libfoo.dylib  #<br>
+current-version: 1.2.3           # Optional: defaults to 1.0<br>
+compatibility-version: 1.0       # Optional: defaults to 1.0<br>
+swift-version: 0                 # Optional: defaults to 0<br>
+objc-constraint: retain_release  # Optional: defaults to retain_release<br>
+parent-umbrella:                 # Optional:<br>
+exports:                         # List of export sections<br>
+...<br>
+undefineds:                      # List of undefineds sections<br>
+...<br>
+<br>
+Each export section is defined as following:<br>
+<br>
+- archs: [ arm64 ]                   # the list of architecture slices<br>
+  allowed-clients: [ client ]        # Optional: List of clients<br>
+  re-exports: [ ]                    # Optional: List of re-exports<br>
+  symbols: [ _sym ]                  # Optional: List of symbols<br>
+  objc-classes: []                   # Optional: List of Objective-C classes<br>
+  objc-ivars: []                     # Optional: List of Objective C Instance<br>
+                                     #           Variables<br>
+  weak-def-symbols: []               # Optional: List of weak defined symbols<br>
+  thread-local-symbols: []           # Optional: List of thread local symbols<br>
+<br>
+Each undefineds section is defined as following:<br>
+- archs: [ arm64 ]     # the list of architecture slices<br>
+  symbols: [ _sym ]    # Optional: List of symbols<br>
+  objc-classes: []     # Optional: List of Objective-C classes<br>
+  objc-ivars: []       # Optional: List of Objective C Instance Variables<br>
+  weak-ref-symbols: [] # Optional: List of weak defined symbols<br>
+*/<br>
+<br>
+/*<br>
+<br>
+ YAML Format specification.<br>
+<br>
+--- !tapi-tbd-v3<br>
+archs: [ armv7, armv7s, arm64 ]  # the list of architecture slices that are<br>
+                                 # supported by this file.<br>
+uuids: [ armv7:... ]             # Optional: List of architecture and UUID pairs.<br>
+platform: ios                    # Specifies the platform (macosx, ios, etc)<br>
+flags: []                        # Optional:<br>
+install-name: /u/l/libfoo.dylib  #<br>
+current-version: 1.2.3           # Optional: defaults to 1.0<br>
+compatibility-version: 1.0       # Optional: defaults to 1.0<br>
+swift-abi-version: 0             # Optional: defaults to 0<br>
+objc-constraint: retain_release  # Optional: defaults to retain_release<br>
+parent-umbrella:                 # Optional:<br>
+exports:                         # List of export sections<br>
+...<br>
+undefineds:                      # List of undefineds sections<br>
+...<br>
+<br>
+Each export section is defined as following:<br>
+<br>
+- archs: [ arm64 ]                   # the list of architecture slices<br>
+  allowed-clients: [ client ]        # Optional: List of clients<br>
+  re-exports: [ ]                    # Optional: List of re-exports<br>
+  symbols: [ _sym ]                  # Optional: List of symbols<br>
+  objc-classes: []                   # Optional: List of Objective-C classes<br>
+  objc-eh-types: []                  # Optional: List of Objective-C classes<br>
+                                     #           with EH<br>
+  objc-ivars: []                     # Optional: List of Objective C Instance<br>
+                                     #           Variables<br>
+  weak-def-symbols: []               # Optional: List of weak defined symbols<br>
+  thread-local-symbols: []           # Optional: List of thread local symbols<br>
+<br>
+Each undefineds section is defined as following:<br>
+- archs: [ arm64 ]     # the list of architecture slices<br>
+  symbols: [ _sym ]    # Optional: List of symbols<br>
+  objc-classes: []     # Optional: List of Objective-C classes<br>
+  objc-eh-types: []                  # Optional: List of Objective-C classes<br>
+                                     #           with EH<br>
+  objc-ivars: []       # Optional: List of Objective C Instance Variables<br>
+  weak-ref-symbols: [] # Optional: List of weak defined symbols<br>
+*/<br>
+// clang-format on<br>
+<br>
+using namespace llvm;<br>
+using namespace llvm::yaml;<br>
+using namespace llvm::MachO;<br>
+<br>
+namespace {<br>
+struct ExportSection {<br>
+  std::vector<Architecture> Architectures;<br>
+  std::vector<FlowStringRef> AllowableClients;<br>
+  std::vector<FlowStringRef> ReexportedLibraries;<br>
+  std::vector<FlowStringRef> Symbols;<br>
+  std::vector<FlowStringRef> Classes;<br>
+  std::vector<FlowStringRef> ClassEHs;<br>
+  std::vector<FlowStringRef> IVars;<br>
+  std::vector<FlowStringRef> WeakDefSymbols;<br>
+  std::vector<FlowStringRef> TLVSymbols;<br>
+};<br>
+<br>
+struct UndefinedSection {<br>
+  std::vector<Architecture> Architectures;<br>
+  std::vector<FlowStringRef> Symbols;<br>
+  std::vector<FlowStringRef> Classes;<br>
+  std::vector<FlowStringRef> ClassEHs;<br>
+  std::vector<FlowStringRef> IVars;<br>
+  std::vector<FlowStringRef> WeakRefSymbols;<br>
+};<br>
+<br>
+// clang-format off<br>
+enum TBDFlags : unsigned {<br>
+  None                         = 0U,<br>
+  FlatNamespace                = 1U << 0,<br>
+  NotApplicationExtensionSafe  = 1U << 1,<br>
+  InstallAPI                   = 1U << 2,<br>
+  LLVM_MARK_AS_BITMASK_ENUM(/*LargestValue=*/InstallAPI),<br>
+};<br>
+// clang-format on<br>
+} // end anonymous namespace.<br>
+<br>
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(Architecture)<br>
+LLVM_YAML_IS_SEQUENCE_VECTOR(ExportSection)<br>
+LLVM_YAML_IS_SEQUENCE_VECTOR(UndefinedSection)<br>
+<br>
+namespace llvm {<br>
+namespace yaml {<br>
+<br>
+template <> struct MappingTraits<ExportSection> {<br>
+  static void mapping(IO &IO, ExportSection &Section) {<br>
+    const auto *Ctx = reinterpret_cast<TextAPIContext *>(IO.getContext());<br>
+    assert((!Ctx || (Ctx && Ctx->FileKind != FileType::Invalid)) &&<br>
+           "File type is not set in YAML context");<br>
+<br>
+    IO.mapRequired("archs", Section.Architectures);<br>
+    if (Ctx->FileKind == FileType::TBD_V1)<br>
+      IO.mapOptional("allowed-clients", Section.AllowableClients);<br>
+    else<br>
+      IO.mapOptional("allowable-clients", Section.AllowableClients);<br>
+    IO.mapOptional("re-exports", Section.ReexportedLibraries);<br>
+    IO.mapOptional("symbols", Section.Symbols);<br>
+    IO.mapOptional("objc-classes", Section.Classes);<br>
+    if (Ctx->FileKind == FileType::TBD_V3)<br>
+      IO.mapOptional("objc-eh-types", Section.ClassEHs);<br>
+    IO.mapOptional("objc-ivars", Section.IVars);<br>
+    IO.mapOptional("weak-def-symbols", Section.WeakDefSymbols);<br>
+    IO.mapOptional("thread-local-symbols", Section.TLVSymbols);<br>
+  }<br>
+};<br>
+<br>
+template <> struct MappingTraits<UndefinedSection> {<br>
+  static void mapping(IO &IO, UndefinedSection &Section) {<br>
+    const auto *Ctx = reinterpret_cast<TextAPIContext *>(IO.getContext());<br>
+    assert((!Ctx || (Ctx && Ctx->FileKind != FileType::Invalid)) &&<br>
+           "File type is not set in YAML context");<br>
+<br>
+    IO.mapRequired("archs", Section.Architectures);<br>
+    IO.mapOptional("symbols", Section.Symbols);<br>
+    IO.mapOptional("objc-classes", Section.Classes);<br>
+    if (Ctx->FileKind == FileType::TBD_V3)<br>
+      IO.mapOptional("objc-eh-types", Section.ClassEHs);<br>
+    IO.mapOptional("objc-ivars", Section.IVars);<br>
+    IO.mapOptional("weak-ref-symbols", Section.WeakRefSymbols);<br>
+  }<br>
+};<br>
+<br>
+template <> struct ScalarBitSetTraits<TBDFlags> {<br>
+  static void bitset(IO &IO, TBDFlags &Flags) {<br>
+    IO.bitSetCase(Flags, "flat_namespace", TBDFlags::FlatNamespace);<br>
+    IO.bitSetCase(Flags, "not_app_extension_safe",<br>
+                  TBDFlags::NotApplicationExtensionSafe);<br>
+    IO.bitSetCase(Flags, "installapi", TBDFlags::InstallAPI);<br>
+  }<br>
+};<br>
+<br>
+template <> struct MappingTraits<const InterfaceFile *> {<br>
+  struct NormalizedTBD {<br>
+    explicit NormalizedTBD(IO &IO) {}<br>
+    NormalizedTBD(IO &IO, const InterfaceFile *&File) {<br>
+      Architectures = File->getArchitectures();<br>
+      UUIDs = File->uuids();<br>
+      Platform = File->getPlatform();<br>
+      InstallName = File->getInstallName();<br>
+      CurrentVersion = PackedVersion(File->getCurrentVersion());<br>
+      CompatibilityVersion = PackedVersion(File->getCompatibilityVersion());<br>
+      SwiftABIVersion = File->getSwiftABIVersion();<br>
+      ObjCConstraint = File->getObjCConstraint();<br>
+<br>
+      Flags = TBDFlags::None;<br>
+      if (!File->isApplicationExtensionSafe())<br>
+        Flags |= TBDFlags::NotApplicationExtensionSafe;<br>
+<br>
+      if (!File->isTwoLevelNamespace())<br>
+        Flags |= TBDFlags::FlatNamespace;<br>
+<br>
+      if (File->isInstallAPI())<br>
+        Flags |= TBDFlags::InstallAPI;<br>
+<br>
+      ParentUmbrella = File->getParentUmbrella();<br>
+<br>
+      std::set<ArchitectureSet> ArchSet;<br>
+      for (const auto &Library : File->allowableClients())<br>
+        ArchSet.insert(Library.getArchitectures());<br>
+<br>
+      for (const auto &Library : File->reexportedLibraries())<br>
+        ArchSet.insert(Library.getArchitectures());<br>
+<br>
+      std::map<const Symbol *, ArchitectureSet> SymbolToArchSet;<br>
+      for (const auto *Symbol : File->exports()) {<br>
+        auto Architectures = Symbol->getArchitectures();<br>
+        SymbolToArchSet[Symbol] = Architectures;<br>
+        ArchSet.insert(Architectures);<br>
+      }<br>
+<br>
+      for (auto Architectures : ArchSet) {<br>
+        ExportSection Section;<br>
+        Section.Architectures = Architectures;<br>
+<br>
+        for (const auto &Library : File->allowableClients())<br>
+          if (Library.getArchitectures() == Architectures)<br>
+            Section.AllowableClients.emplace_back(Library.getInstallName());<br>
+<br>
+        for (const auto &Library : File->reexportedLibraries())<br>
+          if (Library.getArchitectures() == Architectures)<br>
+            Section.ReexportedLibraries.emplace_back(Library.getInstallName());<br>
+<br>
+        for (const auto &SymArch : SymbolToArchSet) {<br>
+          if (SymArch.second != Architectures)<br>
+            continue;<br>
+<br>
+          const auto *Symbol = SymArch.first;<br>
+          switch (Symbol->getKind()) {<br>
+          case SymbolKind::GlobalSymbol:<br>
+            if (Symbol->isWeakDefined())<br>
+              Section.WeakDefSymbols.emplace_back(Symbol->getName());<br>
+            else if (Symbol->isThreadLocalValue())<br>
+              Section.TLVSymbols.emplace_back(Symbol->getName());<br>
+            else<br>
+              Section.Symbols.emplace_back(Symbol->getName());<br>
+            break;<br>
+          case SymbolKind::ObjectiveCClass:<br>
+            if (File->getFileType() != FileType::TBD_V3)<br>
+              Section.Classes.emplace_back(<br>
+                  copyString("_" + Symbol->getName().str()));<br>
+            else<br>
+              Section.Classes.emplace_back(Symbol->getName());<br>
+            break;<br>
+          case SymbolKind::ObjectiveCClassEHType:<br>
+            if (File->getFileType() != FileType::TBD_V3)<br>
+              Section.Symbols.emplace_back(<br>
+                  copyString("_OBJC_EHTYPE_$_" + Symbol->getName().str()));<br>
+            else<br>
+              Section.ClassEHs.emplace_back(Symbol->getName());<br>
+            break;<br>
+          case SymbolKind::ObjectiveCInstanceVariable:<br>
+            if (File->getFileType() != FileType::TBD_V3)<br>
+              Section.IVars.emplace_back(<br>
+                  copyString("_" + Symbol->getName().str()));<br>
+            else<br>
+              Section.IVars.emplace_back(Symbol->getName());<br>
+            break;<br>
+          }<br>
+        }<br>
+        llvm::sort(Section.Symbols.begin(), Section.Symbols.end());<br>
+        llvm::sort(Section.Classes.begin(), Section.Classes.end());<br>
+        llvm::sort(Section.ClassEHs.begin(), Section.ClassEHs.end());<br>
+        llvm::sort(Section.IVars.begin(), Section.IVars.end());<br>
+        llvm::sort(Section.WeakDefSymbols.begin(),<br>
+                   Section.WeakDefSymbols.end());<br>
+        llvm::sort(Section.TLVSymbols.begin(), Section.TLVSymbols.end());<br>
+        Exports.emplace_back(std::move(Section));<br>
+      }<br>
+<br>
+      ArchSet.clear();<br>
+      SymbolToArchSet.clear();<br>
+<br>
+      for (const auto *Symbol : File->undefineds()) {<br>
+        auto Architectures = Symbol->getArchitectures();<br>
+        SymbolToArchSet[Symbol] = Architectures;<br>
+        ArchSet.insert(Architectures);<br>
+      }<br>
+<br>
+      for (auto Architectures : ArchSet) {<br>
+        UndefinedSection Section;<br>
+        Section.Architectures = Architectures;<br>
+<br>
+        for (const auto &SymArch : SymbolToArchSet) {<br>
+          if (SymArch.second != Architectures)<br>
+            continue;<br>
+<br>
+          const auto *Symbol = SymArch.first;<br>
+          switch (Symbol->getKind()) {<br>
+          case SymbolKind::GlobalSymbol:<br>
+            if (Symbol->isWeakReferenced())<br>
+              Section.WeakRefSymbols.emplace_back(Symbol->getName());<br>
+            else<br>
+              Section.Symbols.emplace_back(Symbol->getName());<br>
+            break;<br>
+          case SymbolKind::ObjectiveCClass:<br>
+            if (File->getFileType() != FileType::TBD_V3)<br>
+              Section.Classes.emplace_back(<br>
+                  copyString("_" + Symbol->getName().str()));<br>
+            else<br>
+              Section.Classes.emplace_back(Symbol->getName());<br>
+            break;<br>
+          case SymbolKind::ObjectiveCClassEHType:<br>
+            if (File->getFileType() != FileType::TBD_V3)<br>
+              Section.Symbols.emplace_back(<br>
+                  copyString("_OBJC_EHTYPE_$_" + Symbol->getName().str()));<br>
+            else<br>
+              Section.ClassEHs.emplace_back(Symbol->getName());<br>
+            break;<br>
+          case SymbolKind::ObjectiveCInstanceVariable:<br>
+            if (File->getFileType() != FileType::TBD_V3)<br>
+              Section.IVars.emplace_back(<br>
+                  copyString("_" + Symbol->getName().str()));<br>
+            else<br>
+              Section.IVars.emplace_back(Symbol->getName());<br>
+            break;<br>
+          }<br>
+        }<br>
+        llvm::sort(Section.Symbols.begin(), Section.Symbols.end());<br>
+        llvm::sort(Section.Classes.begin(), Section.Classes.end());<br>
+        llvm::sort(Section.ClassEHs.begin(), Section.ClassEHs.end());<br>
+        llvm::sort(Section.IVars.begin(), Section.IVars.end());<br>
+        llvm::sort(Section.WeakRefSymbols.begin(),<br>
+                   Section.WeakRefSymbols.end());<br>
+        Undefineds.emplace_back(std::move(Section));<br>
+      }<br>
+    }<br>
+<br>
+    const InterfaceFile *denormalize(IO &IO) {<br>
+      auto Ctx = reinterpret_cast<TextAPIContext *>(IO.getContext());<br>
+      assert(Ctx);<br>
+<br>
+      auto *File = new InterfaceFile;<br>
+      File->setPath(Ctx->Path);<br>
+      File->setFileType(Ctx->FileKind);<br>
+      for (auto &ID : UUIDs)<br>
+        File->addUUID(ID.first, ID.second);<br>
+      File->setPlatform(Platform);<br>
+      File->setArchitectures(Architectures);<br>
+      File->setInstallName(InstallName);<br>
+      File->setCurrentVersion(CurrentVersion);<br>
+      File->setCompatibilityVersion(CompatibilityVersion);<br>
+      File->setSwiftABIVersion(SwiftABIVersion);<br>
+      File->setObjCConstraint(ObjCConstraint);<br>
+      File->setParentUmbrella(ParentUmbrella);<br>
+<br>
+      if (Ctx->FileKind == FileType::TBD_V1) {<br>
+        File->setTwoLevelNamespace();<br>
+        File->setApplicationExtensionSafe();<br>
+      } else {<br>
+        File->setTwoLevelNamespace(!(Flags & TBDFlags::FlatNamespace));<br>
+        File->setApplicationExtensionSafe(<br>
+            !(Flags & TBDFlags::NotApplicationExtensionSafe));<br>
+        File->setInstallAPI(Flags & TBDFlags::InstallAPI);<br>
+      }<br>
+<br>
+      for (const auto &Section : Exports) {<br>
+        for (const auto &Library : Section.AllowableClients)<br>
+          File->addAllowableClient(Library, Section.Architectures);<br>
+        for (const auto &Library : Section.ReexportedLibraries)<br>
+          File->addReexportedLibrary(Library, Section.Architectures);<br>
+<br>
+        for (const auto &Symbol : Section.Symbols) {<br>
+          if (Ctx->FileKind != FileType::TBD_V3 &&<br>
+              Symbol.value.startswith("_OBJC_EHTYPE_$_"))<br>
+            File->addSymbol(SymbolKind::ObjectiveCClassEHType,<br>
+                            Symbol.value.drop_front(15), Section.Architectures);<br>
+          else<br>
+            File->addSymbol(SymbolKind::GlobalSymbol, Symbol,<br>
+                            Section.Architectures);<br>
+        }<br>
+        for (auto &Symbol : Section.Classes) {<br>
+          auto Name = Symbol.value;<br>
+          if (Ctx->FileKind != FileType::TBD_V3)<br>
+            Name = Name.drop_front();<br>
+          File->addSymbol(SymbolKind::ObjectiveCClass, Name,<br>
+                          Section.Architectures);<br>
+        }<br>
+        for (auto &Symbol : Section.ClassEHs)<br>
+          File->addSymbol(SymbolKind::ObjectiveCClassEHType, Symbol,<br>
+                          Section.Architectures);<br>
+        for (auto &Symbol : Section.IVars) {<br>
+          auto Name = Symbol.value;<br>
+          if (Ctx->FileKind != FileType::TBD_V3)<br>
+            Name = Name.drop_front();<br>
+          File->addSymbol(SymbolKind::ObjectiveCInstanceVariable, Name,<br>
+                          Section.Architectures);<br>
+        }<br>
+        for (auto &Symbol : Section.WeakDefSymbols)<br>
+          File->addSymbol(SymbolKind::GlobalSymbol, Symbol,<br>
+                          Section.Architectures, SymbolFlags::WeakDefined);<br>
+        for (auto &Symbol : Section.TLVSymbols)<br>
+          File->addSymbol(SymbolKind::GlobalSymbol, Symbol,<br>
+                          Section.Architectures, SymbolFlags::ThreadLocalValue);<br>
+      }<br>
+<br>
+      for (const auto &Section : Undefineds) {<br>
+        for (auto &Symbol : Section.Symbols) {<br>
+          if (Ctx->FileKind != FileType::TBD_V3 &&<br>
+              Symbol.value.startswith("_OBJC_EHTYPE_$_"))<br>
+            File->addSymbol(SymbolKind::ObjectiveCClassEHType,<br>
+                            Symbol.value.drop_front(15), Section.Architectures,<br>
+                            SymbolFlags::Undefined);<br>
+          else<br>
+            File->addSymbol(SymbolKind::GlobalSymbol, Symbol,<br>
+                            Section.Architectures, SymbolFlags::Undefined);<br>
+        }<br>
+        for (auto &Symbol : Section.Classes) {<br>
+          auto Name = Symbol.value;<br>
+          if (Ctx->FileKind != FileType::TBD_V3)<br>
+            Name = Name.drop_front();<br>
+          File->addSymbol(SymbolKind::ObjectiveCClass, Name,<br>
+                          Section.Architectures, SymbolFlags::Undefined);<br>
+        }<br>
+        for (auto &Symbol : Section.ClassEHs)<br>
+          File->addSymbol(SymbolKind::ObjectiveCClassEHType, Symbol,<br>
+                          Section.Architectures, SymbolFlags::Undefined);<br>
+        for (auto &Symbol : Section.IVars) {<br>
+          auto Name = Symbol.value;<br>
+          if (Ctx->FileKind != FileType::TBD_V3)<br>
+            Name = Name.drop_front();<br>
+          File->addSymbol(SymbolKind::ObjectiveCInstanceVariable, Name,<br>
+                          Section.Architectures, SymbolFlags::Undefined);<br>
+        }<br>
+        for (auto &Symbol : Section.WeakRefSymbols)<br>
+          File->addSymbol(SymbolKind::GlobalSymbol, Symbol,<br>
+                          Section.Architectures,<br>
+                          SymbolFlags::Undefined | SymbolFlags::WeakReferenced);<br>
+      }<br>
+<br>
+      return File;<br>
+    }<br>
+<br>
+    llvm::BumpPtrAllocator Allocator;<br>
+    StringRef copyString(StringRef String) {<br>
+      if (String.empty())<br>
+        return {};<br>
+<br>
+      void *Ptr = Allocator.Allocate(String.size(), 1);<br>
+      memcpy(Ptr, String.data(), String.size());<br>
+      return StringRef(reinterpret_cast<const char *>(Ptr), String.size());<br>
+    }<br>
+<br>
+    std::vector<Architecture> Architectures;<br>
+    std::vector<UUID> UUIDs;<br>
+    PlatformType Platform;<br>
+    StringRef InstallName;<br>
+    PackedVersion CurrentVersion;<br>
+    PackedVersion CompatibilityVersion;<br>
+    SwiftVersion SwiftABIVersion;<br>
+    ObjCConstraintType ObjCConstraint{ObjCConstraintType::None};<br>
+    TBDFlags Flags{TBDFlags::None};<br>
+    StringRef ParentUmbrella;<br>
+    std::vector<ExportSection> Exports;<br>
+    std::vector<UndefinedSection> Undefineds;<br>
+  };<br>
+<br>
+  static void mapping(IO &IO, const InterfaceFile *&File) {<br>
+    auto *Ctx = reinterpret_cast<TextAPIContext *>(IO.getContext());<br>
+    assert((!Ctx || !IO.outputting() ||<br>
+            (Ctx && Ctx->FileKind != FileType::Invalid)) &&<br>
+           "File type is not set in YAML context");<br>
+    MappingNormalization<NormalizedTBD, const InterfaceFile *> Keys(IO, File);<br>
+<br>
+    // prope file type when reading.<br>
+    if (!IO.outputting()) {<br>
+      if (IO.mapTag("!tapi-tbd-v2", false))<br>
+        Ctx->FileKind = FileType::TBD_V2;<br>
+      else if (IO.mapTag("!tapi-tbd-v3", false))<br>
+        Ctx->FileKind = FileType::TBD_V2;<br>
+      else if (IO.mapTag("!tapi-tbd-v1", false) ||<br>
+               IO.mapTag("tag:<a href="http://yaml.org" rel="noreferrer" target="_blank">yaml.org</a>,2002:map", false))<br>
+        Ctx->FileKind = FileType::TBD_V1;<br>
+      else {<br>
+        IO.setError("unsupported file type");<br>
+        return;<br>
+      }<br>
+    }<br>
+<br>
+    // Set file tyoe when writing.<br>
+    if (IO.outputting()) {<br>
+      switch (Ctx->FileKind) {<br>
+      default:<br>
+        llvm_unreachable("unexpected file type");<br>
+      case FileType::TBD_V1:<br>
+        // Don't write the tag into the .tbd file for TBD v1.<br>
+        break;<br>
+      case FileType::TBD_V2:<br>
+        IO.mapTag("!tapi-tbd-v2", true);<br>
+        break;<br>
+      case FileType::TBD_V3:<br>
+        IO.mapTag("!tapi-tbd-v3", true);<br>
+        break;<br>
+      }<br>
+    }<br>
+<br>
+    IO.mapRequired("archs", Keys->Architectures);<br>
+    if (Ctx->FileKind != FileType::TBD_V1)<br>
+      IO.mapOptional("uuids", Keys->UUIDs);<br>
+    IO.mapRequired("platform", Keys->Platform);<br>
+    if (Ctx->FileKind != FileType::TBD_V1)<br>
+      IO.mapOptional("flags", Keys->Flags, TBDFlags::None);<br>
+    IO.mapRequired("install-name", Keys->InstallName);<br>
+    IO.mapOptional("current-version", Keys->CurrentVersion,<br>
+                   PackedVersion(1, 0, 0));<br>
+    IO.mapOptional("compatibility-version", Keys->CompatibilityVersion,<br>
+                   PackedVersion(1, 0, 0));<br>
+    if (Ctx->FileKind != FileType::TBD_V3)<br>
+      IO.mapOptional("swift-version", Keys->SwiftABIVersion, SwiftVersion(0));<br>
+    else<br>
+      IO.mapOptional("swift-abi-version", Keys->SwiftABIVersion,<br>
+                     SwiftVersion(0));<br>
+    IO.mapOptional("objc-constraint", Keys->ObjCConstraint,<br>
+                   (Ctx->FileKind == FileType::TBD_V1)<br>
+                       ? ObjCConstraintType::None<br>
+                       : ObjCConstraintType::Retain_Release);<br>
+    if (Ctx->FileKind != FileType::TBD_V1)<br>
+      IO.mapOptional("parent-umbrella", Keys->ParentUmbrella, StringRef());<br>
+    IO.mapOptional("exports", Keys->Exports);<br>
+    if (Ctx->FileKind != FileType::TBD_V1)<br>
+      IO.mapOptional("undefineds", Keys->Undefineds);<br>
+  }<br>
+};<br>
+<br>
+template <><br>
+struct DocumentListTraits<std::vector<const MachO::InterfaceFile *>> {<br>
+  static size_t size(IO &IO, std::vector<const MachO::InterfaceFile *> &Seq) {<br>
+    return Seq.size();<br>
+  }<br>
+  static const InterfaceFile *&<br>
+  element(IO &IO, std::vector<const InterfaceFile *> &Seq, size_t Index) {<br>
+    if (Index >= Seq.size())<br>
+      Seq.resize(Index + 1);<br>
+    return Seq[Index];<br>
+  }<br>
+};<br>
+<br>
+} // end namespace yaml.<br>
+<br>
+namespace MachO {<br>
+static void DiagHandler(const SMDiagnostic &Diag, void *Context) {<br>
+  auto *File = static_cast<TextAPIContext *>(Context);<br>
+  SmallString<1024> Message;<br>
+  raw_svector_ostream S(Message);<br>
+<br>
+  SMDiagnostic NewDiag(*Diag.getSourceMgr(), Diag.getLoc(), File->Path,<br>
+                       Diag.getLineNo(), Diag.getColumnNo(), Diag.getKind(),<br>
+                       Diag.getMessage(), Diag.getLineContents(),<br>
+                       Diag.getRanges(), Diag.getFixIts());<br>
+<br>
+  NewDiag.print(nullptr, S);<br>
+  File->ErrorMessage = ("malformed file\n" + Message).str();<br>
+}<br>
+<br>
+Expected<std::unique_ptr<InterfaceFile>><br>
+TextAPIReader::get(std::unique_ptr<MemoryBuffer> InputBuffer) {<br>
+  TextAPIContext Ctx;<br>
+  Ctx.Path = InputBuffer->getBufferIdentifier();<br>
+  yaml::Input YAMLIn(InputBuffer->getBuffer(), &Ctx, DiagHandler, &Ctx);<br>
+<br>
+  // Fill vector with interface file objects created by parsing the YAML file.<br>
+  std::vector<const InterfaceFile *> Files;<br>
+  YAMLIn >> Files;<br>
+<br>
+  if (YAMLIn.error())<br>
+    return make_error<StringError>(Ctx.ErrorMessage, YAMLIn.error());<br>
+<br>
+  auto *File = const_cast<InterfaceFile *>(Files.front());<br>
+  return std::unique_ptr<InterfaceFile>(File);<br>
+}<br>
+<br>
+Error TextAPIWriter::writeToStream(raw_ostream &OS, const InterfaceFile &File) {<br>
+  TextAPIContext Ctx;<br>
+  Ctx.Path = File.getPath();<br>
+  Ctx.FileKind = File.getFileType();<br>
+  llvm::yaml::Output YAMLOut(OS, &Ctx, /*WrapColumn=*/80);<br>
+<br>
+  std::vector<const InterfaceFile *> Files;<br>
+  Files.emplace_back(&File);<br>
+<br>
+  // Stream out yaml.<br>
+  YAMLOut << Files;<br>
+<br>
+  return Error::success();<br>
+}<br>
+<br>
+} // end namespace MachO.<br>
+} // end namespace llvm.<br>
<br>
Added: llvm/trunk/lib/TextAPI/MachO/TextStubCommon.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/TextStubCommon.cpp?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/TextStubCommon.cpp?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TextAPI/MachO/TextStubCommon.cpp (added)<br>
+++ llvm/trunk/lib/TextAPI/MachO/TextStubCommon.cpp Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,179 @@<br>
+//===- lib/TextAPI/TextStubCommon.cpp - Text Stub Common --------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Implememts common Text Stub YAML mappings.<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#include "TextStubCommon.h"<br>
+#include "TextAPIContext.h"<br>
+<br>
+using namespace llvm::MachO;<br>
+<br>
+namespace llvm {<br>
+namespace yaml {<br>
+<br>
+void ScalarTraits<FlowStringRef>::output(const FlowStringRef &Value, void *Ctx,<br>
+                                         raw_ostream &OS) {<br>
+  ScalarTraits<StringRef>::output(Value, Ctx, OS);<br>
+}<br>
+StringRef ScalarTraits<FlowStringRef>::input(StringRef Value, void *Ctx,<br>
+                                             FlowStringRef &Out) {<br>
+  return ScalarTraits<StringRef>::input(Value, Ctx, Out.value);<br>
+}<br>
+QuotingType ScalarTraits<FlowStringRef>::mustQuote(StringRef Name) {<br>
+  return ScalarTraits<StringRef>::mustQuote(Name);<br>
+}<br>
+<br>
+void ScalarEnumerationTraits<ObjCConstraintType>::enumeration(<br>
+    IO &IO, ObjCConstraintType &Constraint) {<br>
+  IO.enumCase(Constraint, "none", ObjCConstraintType::None);<br>
+  IO.enumCase(Constraint, "retain_release", ObjCConstraintType::Retain_Release);<br>
+  IO.enumCase(Constraint, "retain_release_for_simulator",<br>
+              ObjCConstraintType::Retain_Release_For_Simulator);<br>
+  IO.enumCase(Constraint, "retain_release_or_gc",<br>
+              ObjCConstraintType::Retain_Release_Or_GC);<br>
+  IO.enumCase(Constraint, "gc", ObjCConstraintType::GC);<br>
+}<br>
+<br>
+void ScalarTraits<PlatformType>::output(const PlatformType &Value, void *,<br>
+                                        raw_ostream &OS) {<br>
+  switch (Value) {<br>
+  case PLATFORM_MACOS:<br>
+    OS << "macosx";<br>
+    break;<br>
+  case PLATFORM_IOS:<br>
+    OS << "ios";<br>
+    break;<br>
+  case PLATFORM_WATCHOS:<br>
+    OS << "watchos";<br>
+    break;<br>
+  case PLATFORM_TVOS:<br>
+    OS << "tvos";<br>
+    break;<br>
+  case PLATFORM_BRIDGEOS:<br>
+    OS << "bridgeos";<br>
+    break;<br>
+  }<br>
+}<br>
+StringRef ScalarTraits<PlatformType>::input(StringRef Scalar, void *,<br>
+                                            PlatformType &Value) {<br>
+  int Result = StringSwitch<unsigned>(Scalar)<br>
+                   .Case("macosx", PLATFORM_MACOS)<br>
+                   .Case("ios", PLATFORM_IOS)<br>
+                   .Case("watchos", PLATFORM_WATCHOS)<br>
+                   .Case("tvos", PLATFORM_TVOS)<br>
+                   .Case("bridgeos", PLATFORM_BRIDGEOS)<br>
+                   .Default(0);<br>
+<br>
+  if (!Result)<br>
+    return "unknown platform";<br>
+<br>
+  Value = static_cast<PlatformType>(Result);<br>
+  return {};<br>
+}<br>
+QuotingType ScalarTraits<PlatformType>::mustQuote(StringRef) {<br>
+  return QuotingType::None;<br>
+}<br>
+<br>
+void ScalarBitSetTraits<ArchitectureSet>::bitset(IO &IO,<br>
+                                                 ArchitectureSet &Archs) {<br>
+#define ARCHINFO(arch, type, subtype)                                          \<br>
+  IO.bitSetCase(Archs, #arch, 1U << static_cast<int>(Architecture::arch));<br>
+#include "llvm/TextAPI/MachO/Architecture.def"<br>
+#undef ARCHINFO<br>
+}<br>
+<br>
+void ScalarTraits<Architecture>::output(const Architecture &Value, void *,<br>
+                                        raw_ostream &OS) {<br>
+  OS << Value;<br>
+}<br>
+StringRef ScalarTraits<Architecture>::input(StringRef Scalar, void *,<br>
+                                            Architecture &Value) {<br>
+  Value = getArchitectureFromName(Scalar);<br>
+  return {};<br>
+}<br>
+QuotingType ScalarTraits<Architecture>::mustQuote(StringRef) {<br>
+  return QuotingType::None;<br>
+}<br>
+<br>
+void ScalarTraits<PackedVersion>::output(const PackedVersion &Value, void *,<br>
+                                         raw_ostream &OS) {<br>
+  OS << Value;<br>
+}<br>
+StringRef ScalarTraits<PackedVersion>::input(StringRef Scalar, void *,<br>
+                                             PackedVersion &Value) {<br>
+  if (!Value.parse32(Scalar))<br>
+    return "invalid packed version string.";<br>
+  return {};<br>
+}<br>
+QuotingType ScalarTraits<PackedVersion>::mustQuote(StringRef) {<br>
+  return QuotingType::None;<br>
+}<br>
+<br>
+void ScalarTraits<SwiftVersion>::output(const SwiftVersion &Value, void *,<br>
+                                        raw_ostream &OS) {<br>
+  switch (Value) {<br>
+  case 1:<br>
+    OS << "1.0";<br>
+    break;<br>
+  case 2:<br>
+    OS << "1.1";<br>
+    break;<br>
+  case 3:<br>
+    OS << "2.0";<br>
+    break;<br>
+  case 4:<br>
+    OS << "3.0";<br>
+    break;<br>
+  default:<br>
+    OS << (unsigned)Value;<br>
+    break;<br>
+  }<br>
+}<br>
+StringRef ScalarTraits<SwiftVersion>::input(StringRef Scalar, void *,<br>
+                                            SwiftVersion &Value) {<br>
+  Value = StringSwitch<SwiftVersion>(Scalar)<br>
+              .Case("1.0", 1)<br>
+              .Case("1.1", 2)<br>
+              .Case("2.0", 3)<br>
+              .Case("3.0", 4)<br>
+              .Default(0);<br>
+  if (Value != SwiftVersion(0))<br>
+    return {};<br>
+<br>
+  if (Scalar.getAsInteger(10, Value))<br>
+    return "invalid Swift ABI version.";<br>
+<br>
+  return StringRef();<br>
+}<br>
+QuotingType ScalarTraits<SwiftVersion>::mustQuote(StringRef) {<br>
+  return QuotingType::None;<br>
+}<br>
+<br>
+void ScalarTraits<UUID>::output(const UUID &Value, void *, raw_ostream &OS) {<br>
+  OS << Value.first << ": " << Value.second;<br>
+}<br>
+StringRef ScalarTraits<UUID>::input(StringRef Scalar, void *, UUID &Value) {<br>
+  auto Split = Scalar.split(':');<br>
+  auto Arch = Split.first.trim();<br>
+  auto UUID = Split.second.trim();<br>
+  if (UUID.empty())<br>
+    return "invalid uuid string pair";<br>
+  Value.first = getArchitectureFromName(Arch);<br>
+  Value.second = UUID;<br>
+  return {};<br>
+}<br>
+QuotingType ScalarTraits<UUID>::mustQuote(StringRef) {<br>
+  return QuotingType::Single;<br>
+}<br>
+<br>
+} // end namespace yaml.<br>
+} // end namespace llvm.<br>
<br>
Added: llvm/trunk/lib/TextAPI/MachO/TextStubCommon.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/TextStubCommon.h?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TextAPI/MachO/TextStubCommon.h?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/lib/TextAPI/MachO/TextStubCommon.h (added)<br>
+++ llvm/trunk/lib/TextAPI/MachO/TextStubCommon.h Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,83 @@<br>
+//===- llvm/TextAPI/TextStubCommon.h - Text Stub Common ---------*- C++ -*-===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Defines common Text Stub YAML mappings.<br>
+///<br>
+//===----------------------------------------------------------------------===//<br>
+<br>
+#ifndef LLVM_TEXTAPI_TEXT_STUB_COMMON_H<br>
+#define LLVM_TEXTAPI_TEXT_STUB_COMMON_H<br>
+<br>
+#include "llvm/ADT/StringRef.h"<br>
+#include "llvm/ADT/StringSwitch.h"<br>
+#include "llvm/Support/YAMLTraits.h"<br>
+#include "llvm/TextAPI/MachO/Architecture.h"<br>
+#include "llvm/TextAPI/MachO/ArchitectureSet.h"<br>
+#include "llvm/TextAPI/MachO/InterfaceFile.h"<br>
+#include "llvm/TextAPI/MachO/PackedVersion.h"<br>
+<br>
+using UUID = std::pair<llvm::MachO::Architecture, std::string>;<br>
+<br>
+LLVM_YAML_STRONG_TYPEDEF(llvm::StringRef, FlowStringRef)<br>
+LLVM_YAML_STRONG_TYPEDEF(uint8_t, SwiftVersion)<br>
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(UUID)<br>
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(FlowStringRef)<br>
+<br>
+namespace llvm {<br>
+namespace yaml {<br>
+<br>
+template <> struct ScalarTraits<FlowStringRef> {<br>
+  static void output(const FlowStringRef &, void *, raw_ostream &);<br>
+  static StringRef input(StringRef, void *, FlowStringRef &);<br>
+  static QuotingType mustQuote(StringRef);<br>
+};<br>
+<br>
+template <> struct ScalarEnumerationTraits<MachO::ObjCConstraintType> {<br>
+  static void enumeration(IO &, MachO::ObjCConstraintType &);<br>
+};<br>
+<br>
+template <> struct ScalarTraits<MachO::PlatformType> {<br>
+  static void output(const MachO::PlatformType &, void *, raw_ostream &);<br>
+  static StringRef input(StringRef, void *, MachO::PlatformType &);<br>
+  static QuotingType mustQuote(StringRef);<br>
+};<br>
+<br>
+template <> struct ScalarBitSetTraits<MachO::ArchitectureSet> {<br>
+  static void bitset(IO &, MachO::ArchitectureSet &);<br>
+};<br>
+<br>
+template <> struct ScalarTraits<MachO::Architecture> {<br>
+  static void output(const MachO::Architecture &, void *, raw_ostream &);<br>
+  static StringRef input(StringRef, void *, MachO::Architecture &);<br>
+  static QuotingType mustQuote(StringRef);<br>
+};<br>
+<br>
+template <> struct ScalarTraits<MachO::PackedVersion> {<br>
+  static void output(const MachO::PackedVersion &, void *, raw_ostream &);<br>
+  static StringRef input(StringRef, void *, MachO::PackedVersion &);<br>
+  static QuotingType mustQuote(StringRef);<br>
+};<br>
+<br>
+template <> struct ScalarTraits<SwiftVersion> {<br>
+  static void output(const SwiftVersion &, void *, raw_ostream &);<br>
+  static StringRef input(StringRef, void *, SwiftVersion &);<br>
+  static QuotingType mustQuote(StringRef);<br>
+};<br>
+<br>
+template <> struct ScalarTraits<UUID> {<br>
+  static void output(const UUID &, void *, raw_ostream &);<br>
+  static StringRef input(StringRef, void *, UUID &);<br>
+  static QuotingType mustQuote(StringRef);<br>
+};<br>
+<br>
+} // end namespace yaml.<br>
+} // end namespace llvm.<br>
+<br>
+#endif // LLVM_TEXTAPI_TEXT_STUB_COMMON_H<br>
<br>
Modified: llvm/trunk/unittests/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/CMakeLists.txt?rev=347823&r1=347822&r2=347823&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/CMakeLists.txt?rev=347823&r1=347822&r2=347823&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/CMakeLists.txt (original)<br>
+++ llvm/trunk/unittests/CMakeLists.txt Wed Nov 28 17:20:46 2018<br>
@@ -31,6 +31,7 @@ add_subdirectory(Passes)<br>
 add_subdirectory(ProfileData)<br>
 add_subdirectory(Support)<br>
 add_subdirectory(Target)<br>
+add_subdirectory(TextAPI)<br>
 add_subdirectory(Transforms)<br>
 add_subdirectory(XRay)<br>
 add_subdirectory(tools)<br>
<br>
Added: llvm/trunk/unittests/TextAPI/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TextAPI/CMakeLists.txt?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TextAPI/CMakeLists.txt?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/TextAPI/CMakeLists.txt (added)<br>
+++ llvm/trunk/unittests/TextAPI/CMakeLists.txt Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,8 @@<br>
+set(LLVM_LINK_COMPONENTS<br>
+  TextAPI<br>
+)<br>
+<br>
+add_llvm_unittest(TextAPITests<br>
+  TextStubV1Tests.cpp<br>
+  TextStubV2Tests.cpp<br>
+)<br>
<br>
Added: llvm/trunk/unittests/TextAPI/TextStubV1Tests.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TextAPI/TextStubV1Tests.cpp?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TextAPI/TextStubV1Tests.cpp?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/TextAPI/TextStubV1Tests.cpp (added)<br>
+++ llvm/trunk/unittests/TextAPI/TextStubV1Tests.cpp Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,444 @@<br>
+//===-- TextStubV1Tests.cpp - TBD V1 File Test ----------------------------===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+#include "llvm/TextAPI/MachO/InterfaceFile.h"<br>
+#include "llvm/TextAPI/MachO/TextAPIReader.h"<br>
+#include "llvm/TextAPI/MachO/TextAPIWriter.h"<br>
+#include "gtest/gtest.h"<br>
+#include <string><br>
+#include <vector><br>
+<br>
+using namespace llvm;<br>
+using namespace llvm::MachO;<br>
+<br>
+using ExportedSymbol = std::tuple<SymbolKind, std::string, bool, bool>;<br>
+using ExportedSymbolSeq = std::vector<ExportedSymbol>;<br>
+<br>
+inline bool operator<(const ExportedSymbol &lhs, const ExportedSymbol &rhs) {<br>
+  return std::get<1>(lhs) < std::get<1>(rhs);<br>
+}<br>
+<br>
+static ExportedSymbolSeq TBDv1Symbols({<br>
+    {SymbolKind::GlobalSymbol, "$ld$hide$os9.0$_sym1", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_sym1", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_sym2", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_sym3", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_sym4", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_sym5", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_tlv1", false, true},<br>
+    {SymbolKind::GlobalSymbol, "_tlv2", false, true},<br>
+    {SymbolKind::GlobalSymbol, "_tlv3", false, true},<br>
+    {SymbolKind::GlobalSymbol, "_weak1", true, false},<br>
+    {SymbolKind::GlobalSymbol, "_weak2", true, false},<br>
+    {SymbolKind::GlobalSymbol, "_weak3", true, false},<br>
+    {SymbolKind::ObjectiveCClass, "class1", false, false},<br>
+    {SymbolKind::ObjectiveCClass, "class2", false, false},<br>
+    {SymbolKind::ObjectiveCClass, "class3", false, false},<br>
+    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar1", false, false},<br>
+    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar2", false, false},<br>
+    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar3", false, false},<br>
+});<br>
+<br>
+namespace TBDv1 {<br>
+<br>
+TEST(TBDv1, ReadFile) {<br>
+  static const char tbd_v1_file1[] =<br>
+      "---\n"<br>
+      "archs: [ armv7, armv7s, armv7k, arm64 ]\n"<br>
+      "platform: ios\n"<br>
+      "install-name: Test.dylib\n"<br>
+      "current-version: 2.3.4\n"<br>
+      "compatibility-version: 1.0\n"<br>
+      "swift-version: 1.1\n"<br>
+      "exports:\n"<br>
+      "  - archs: [ armv7, armv7s, armv7k, arm64 ]\n"<br>
+      "    allowed-clients: [ clientA ]\n"<br>
+      "    re-exports: [ /usr/lib/libfoo.dylib ]\n"<br>
+      "    symbols: [ _sym1, _sym2, _sym3, _sym4, $ld$hide$os9.0$_sym1 ]\n"<br>
+      "    objc-classes: [ _class1, _class2 ]\n"<br>
+      "    objc-ivars: [ _class1._ivar1, _class1._ivar2 ]\n"<br>
+      "    weak-def-symbols: [ _weak1, _weak2 ]\n"<br>
+      "    thread-local-symbols: [ _tlv1, _tlv2 ]\n"<br>
+      "  - archs: [ armv7, armv7s, armv7k ]\n"<br>
+      "    symbols: [ _sym5 ]\n"<br>
+      "    objc-classes: [ _class3 ]\n"<br>
+      "    objc-ivars: [ _class1._ivar3 ]\n"<br>
+      "    weak-def-symbols: [ _weak3 ]\n"<br>
+      "    thread-local-symbols: [ _tlv3 ]\n"<br>
+      "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_file1, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  auto Archs = Architecture::armv7 | Architecture::armv7s |<br>
+               Architecture::armv7k | Architecture::arm64;<br>
+  EXPECT_EQ(Archs, File->getArchitectures());<br>
+  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());<br>
+  EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());<br>
+  EXPECT_EQ(PackedVersion(2, 3, 4), File->getCurrentVersion());<br>
+  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());<br>
+  EXPECT_EQ(2U, File->getSwiftABIVersion());<br>
+  EXPECT_EQ(ObjCConstraintType::None, File->getObjCConstraint());<br>
+  EXPECT_TRUE(File->isTwoLevelNamespace());<br>
+  EXPECT_TRUE(File->isApplicationExtensionSafe());<br>
+  EXPECT_FALSE(File->isInstallAPI());<br>
+  InterfaceFileRef client("clientA", Archs);<br>
+  InterfaceFileRef reexport("/usr/lib/libfoo.dylib", Archs);<br>
+  EXPECT_EQ(1U, File->allowableClients().size());<br>
+  EXPECT_EQ(client, File->allowableClients().front());<br>
+  EXPECT_EQ(1U, File->reexportedLibraries().size());<br>
+  EXPECT_EQ(reexport, File->reexportedLibraries().front());<br>
+<br>
+  ExportedSymbolSeq Exports;<br>
+  for (const auto *Sym : File->symbols()) {<br>
+    EXPECT_FALSE(Sym->isWeakReferenced());<br>
+    EXPECT_FALSE(Sym->isUndefined());<br>
+    Exports.emplace_back(Sym->getKind(), Sym->getName(), Sym->isWeakDefined(),<br>
+                         Sym->isThreadLocalValue());<br>
+  }<br>
+  llvm::sort(Exports.begin(), Exports.end());<br>
+<br>
+  EXPECT_EQ(TBDv1Symbols.size(), Exports.size());<br>
+  EXPECT_TRUE(std::equal(Exports.begin(), Exports.end(), TBDv1Symbols.begin()));<br>
+}<br>
+<br>
+TEST(TBDv1, ReadFile2) {<br>
+  static const char tbd_v1_file2[] = "--- !tapi-tbd-v1\n"<br>
+                                     "archs: [ armv7, armv7s, armv7k, arm64 ]\n"<br>
+                                     "platform: ios\n"<br>
+                                     "install-name: Test.dylib\n"<br>
+                                     "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_file2, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  auto Archs = Architecture::armv7 | Architecture::armv7s |<br>
+               Architecture::armv7k | Architecture::arm64;<br>
+  EXPECT_EQ(Archs, File->getArchitectures());<br>
+  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());<br>
+  EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());<br>
+  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCurrentVersion());<br>
+  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());<br>
+  EXPECT_EQ(0U, File->getSwiftABIVersion());<br>
+  EXPECT_EQ(ObjCConstraintType::None, File->getObjCConstraint());<br>
+  EXPECT_TRUE(File->isTwoLevelNamespace());<br>
+  EXPECT_TRUE(File->isApplicationExtensionSafe());<br>
+  EXPECT_FALSE(File->isInstallAPI());<br>
+  EXPECT_EQ(0U, File->allowableClients().size());<br>
+  EXPECT_EQ(0U, File->reexportedLibraries().size());<br>
+}<br>
+<br>
+TEST(TBDv1, WriteFile) {<br>
+  static const char tbd_v1_file3[] =<br>
+      "---\n"<br>
+      "archs:           [ i386, x86_64 ]\n"<br>
+      "platform:        macosx\n"<br>
+      "install-name:    '/usr/lib/libfoo.dylib'\n"<br>
+      "current-version: 1.2.3\n"<br>
+      "compatibility-version: 0\n"<br>
+      "swift-version:   5\n"<br>
+      "objc-constraint: retain_release\n"<br>
+      "exports:         \n"<br>
+      "  - archs:           [ i386 ]\n"<br>
+      "    symbols:         [ _sym1 ]\n"<br>
+      "    weak-def-symbols: [ _sym2 ]\n"<br>
+      "    thread-local-symbols: [ _sym3 ]\n"<br>
+      "  - archs:           [ x86_64 ]\n"<br>
+      "    allowed-clients: [ clientA ]\n"<br>
+      "    re-exports:      [ '/usr/lib/libfoo.dylib' ]\n"<br>
+      "    symbols:         [ '_OBJC_EHTYPE_$_Class1' ]\n"<br>
+      "    objc-classes:    [ _Class1 ]\n"<br>
+      "    objc-ivars:      [ _Class1._ivar1 ]\n"<br>
+      "...\n";<br>
+<br>
+  InterfaceFile File;<br>
+  File.setPath("libfoo.dylib");<br>
+  File.setInstallName("/usr/lib/libfoo.dylib");<br>
+  File.setFileType(FileType::TBD_V1);<br>
+  File.setArchitectures(Architecture::i386 | Architecture::x86_64);<br>
+  File.setPlatform(PLATFORM_MACOS);<br>
+  File.setCurrentVersion(PackedVersion(1, 2, 3));<br>
+  File.setSwiftABIVersion(5);<br>
+  File.setObjCConstraint(ObjCConstraintType::Retain_Release);<br>
+  File.addAllowableClient("clientA", Architecture::x86_64);<br>
+  File.addReexportedLibrary("/usr/lib/libfoo.dylib", Architecture::x86_64);<br>
+  File.addSymbol(SymbolKind::GlobalSymbol, "_sym1", Architecture::i386);<br>
+  File.addSymbol(SymbolKind::GlobalSymbol, "_sym2", Architecture::i386,<br>
+                 SymbolFlags::WeakDefined);<br>
+  File.addSymbol(SymbolKind::GlobalSymbol, "_sym3", Architecture::i386,<br>
+                 SymbolFlags::ThreadLocalValue);<br>
+  File.addSymbol(SymbolKind::ObjectiveCClass, "Class1", Architecture::x86_64);<br>
+  File.addSymbol(SymbolKind::ObjectiveCClassEHType, "Class1",<br>
+                 Architecture::x86_64);<br>
+  File.addSymbol(SymbolKind::ObjectiveCInstanceVariable, "Class1._ivar1",<br>
+                 Architecture::x86_64);<br>
+<br>
+  SmallString<4096> Buffer;<br>
+  raw_svector_ostream OS(Buffer);<br>
+  auto Result = TextAPIWriter::writeToStream(OS, File);<br>
+  EXPECT_FALSE(Result);<br>
+  EXPECT_STREQ(tbd_v1_file3, Buffer.c_str());<br>
+}<br>
+<br>
+TEST(TBDv1, Platform_macOS) {<br>
+  static const char tbd_v1_platform_macos[] = "---\n"<br>
+                                              "archs: [ x86_64 ]\n"<br>
+                                              "platform: macosx\n"<br>
+                                              "install-name: Test.dylib\n"<br>
+                                              "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_macos, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  EXPECT_EQ(PLATFORM_MACOS, File->getPlatform());<br>
+}<br>
+<br>
+TEST(TBDv1, Platform_iOS) {<br>
+  static const char tbd_v1_platform_ios[] = "---\n"<br>
+                                            "archs: [ arm64 ]\n"<br>
+                                            "platform: ios\n"<br>
+                                            "install-name: Test.dylib\n"<br>
+                                            "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_ios, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());<br>
+}<br>
+<br>
+TEST(TBDv1, Platform_watchOS) {<br>
+  static const char tbd_v1_platform_watchos[] = "---\n"<br>
+                                                "archs: [ armv7k ]\n"<br>
+                                                "platform: watchos\n"<br>
+                                                "install-name: Test.dylib\n"<br>
+                                                "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_watchos, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  EXPECT_EQ(PLATFORM_WATCHOS, File->getPlatform());<br>
+}<br>
+<br>
+TEST(TBDv1, Platform_tvOS) {<br>
+  static const char tbd_v1_platform_tvos[] = "---\n"<br>
+                                             "archs: [ arm64 ]\n"<br>
+                                             "platform: tvos\n"<br>
+                                             "install-name: Test.dylib\n"<br>
+                                             "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_tvos, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  EXPECT_EQ(PLATFORM_TVOS, File->getPlatform());<br>
+}<br>
+<br>
+TEST(TBDv1, Platform_bridgeOS) {<br>
+  static const char tbd_v1_platform_bridgeos[] = "---\n"<br>
+                                                 "archs: [ armv7k ]\n"<br>
+                                                 "platform: bridgeos\n"<br>
+                                                 "install-name: Test.dylib\n"<br>
+                                                 "...\n";<br>
+<br>
+  auto Buffer =<br>
+      MemoryBuffer::getMemBuffer(tbd_v1_platform_bridgeos, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  EXPECT_EQ(PLATFORM_BRIDGEOS, File->getPlatform());<br>
+}<br>
+<br>
+TEST(TBDv1, Swift_1_0) {<br>
+  static const char tbd_v1_swift_1_0[] = "---\n"<br>
+                                         "archs: [ arm64 ]\n"<br>
+                                         "platform: ios\n"<br>
+                                         "install-name: Test.dylib\n"<br>
+                                         "swift-version: 1.0\n"<br>
+                                         "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_1_0, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  EXPECT_EQ(1U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv1, Swift_1_1) {<br>
+  static const char tbd_v1_swift_1_1[] = "---\n"<br>
+                                         "archs: [ arm64 ]\n"<br>
+                                         "platform: ios\n"<br>
+                                         "install-name: Test.dylib\n"<br>
+                                         "swift-version: 1.1\n"<br>
+                                         "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_1_1, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  EXPECT_EQ(2U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv1, Swift_2_0) {<br>
+  static const char tbd_v1_swift_2_0[] = "---\n"<br>
+                                         "archs: [ arm64 ]\n"<br>
+                                         "platform: ios\n"<br>
+                                         "install-name: Test.dylib\n"<br>
+                                         "swift-version: 2.0\n"<br>
+                                         "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_2_0, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  EXPECT_EQ(3U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv1, Swift_3_0) {<br>
+  static const char tbd_v1_swift_3_0[] = "---\n"<br>
+                                         "archs: [ arm64 ]\n"<br>
+                                         "platform: ios\n"<br>
+                                         "install-name: Test.dylib\n"<br>
+                                         "swift-version: 3.0\n"<br>
+                                         "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_3_0, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  EXPECT_EQ(4U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv1, Swift_4_0) {<br>
+  static const char tbd_v1_swift_4_0[] = "---\n"<br>
+                                         "archs: [ arm64 ]\n"<br>
+                                         "platform: ios\n"<br>
+                                         "install-name: Test.dylib\n"<br>
+                                         "swift-version: 4.0\n"<br>
+                                         "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_4_0, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_FALSE(!!Result);<br>
+  auto errorMessage = toString(Result.takeError());<br>
+  EXPECT_EQ("malformed file\nTest.tbd:5:16: error: invalid Swift ABI "<br>
+            "version.\nswift-version: 4.0\n               ^~~\n",<br>
+            errorMessage);<br>
+}<br>
+<br>
+TEST(TBDv1, Swift_5) {<br>
+  static const char tbd_v1_swift_5[] = "---\n"<br>
+                                       "archs: [ arm64 ]\n"<br>
+                                       "platform: ios\n"<br>
+                                       "install-name: Test.dylib\n"<br>
+                                       "swift-version: 5\n"<br>
+                                       "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_5, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  EXPECT_EQ(5U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv1, Swift_99) {<br>
+  static const char tbd_v1_swift_99[] = "---\n"<br>
+                                        "archs: [ arm64 ]\n"<br>
+                                        "platform: ios\n"<br>
+                                        "install-name: Test.dylib\n"<br>
+                                        "swift-version: 99\n"<br>
+                                        "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_99, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V1, File->getFileType());<br>
+  EXPECT_EQ(99U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv1, UnknownArchitecture) {<br>
+  static const char tbd_v1_file_unknown_architecture[] =<br>
+      "---\n"<br>
+      "archs: [ foo ]\n"<br>
+      "platform: macosx\n"<br>
+      "install-name: Test.dylib\n"<br>
+      "...\n";<br>
+<br>
+  auto Buffer =<br>
+      MemoryBuffer::getMemBuffer(tbd_v1_file_unknown_architecture, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+}<br>
+<br>
+TEST(TBDv1, UnknownPlatform) {<br>
+  static const char tbd_v1_file_unknown_platform[] = "---\n"<br>
+                                                     "archs: [ i386 ]\n"<br>
+                                                     "platform: newOS\n"<br>
+                                                     "...\n";<br>
+<br>
+  auto Buffer =<br>
+      MemoryBuffer::getMemBuffer(tbd_v1_file_unknown_platform, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_FALSE(!!Result);<br>
+  auto errorMessage = toString(Result.takeError());<br>
+  EXPECT_EQ("malformed file\nTest.tbd:3:11: error: unknown platform\nplatform: "<br>
+            "newOS\n          ^~~~~\n",<br>
+            errorMessage);<br>
+}<br>
+<br>
+TEST(TBDv1, MalformedFile1) {<br>
+  static const char malformed_file1[] = "---\n"<br>
+                                        "archs: [ arm64 ]\n"<br>
+                                        "foobar: \"Unsupported key\"\n"<br>
+                                        "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(malformed_file1, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_FALSE(!!Result);<br>
+  auto errorMessage = toString(Result.takeError());<br>
+  ASSERT_EQ("malformed file\nTest.tbd:2:1: error: missing required key "<br>
+            "'platform'\narchs: [ arm64 ]\n^\n",<br>
+            errorMessage);<br>
+}<br>
+<br>
+TEST(TBDv1, MalformedFile2) {<br>
+  static const char malformed_file2[] = "---\n"<br>
+                                        "archs: [ arm64 ]\n"<br>
+                                        "platform: ios\n"<br>
+                                        "install-name: Test.dylib\n"<br>
+                                        "foobar: \"Unsupported key\"\n"<br>
+                                        "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(malformed_file2, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_FALSE(!!Result);<br>
+  auto errorMessage = toString(Result.takeError());<br>
+  ASSERT_EQ(<br>
+      "malformed file\nTest.tbd:5:9: error: unknown key 'foobar'\nfoobar: "<br>
+      "\"Unsupported key\"\n        ^~~~~~~~~~~~~~~~~\n",<br>
+      errorMessage);<br>
+}<br>
+<br>
+} // end namespace TBDv1.<br>
<br>
Added: llvm/trunk/unittests/TextAPI/TextStubV2Tests.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TextAPI/TextStubV2Tests.cpp?rev=347823&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TextAPI/TextStubV2Tests.cpp?rev=347823&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/TextAPI/TextStubV2Tests.cpp (added)<br>
+++ llvm/trunk/unittests/TextAPI/TextStubV2Tests.cpp Wed Nov 28 17:20:46 2018<br>
@@ -0,0 +1,469 @@<br>
+//===-- TextStubV2Tests.cpp - TBD V2 File Test ----------------------------===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===----------------------------------------------------------------------===//<br>
+#include "llvm/TextAPI/MachO/InterfaceFile.h"<br>
+#include "llvm/TextAPI/MachO/TextAPIReader.h"<br>
+#include "llvm/TextAPI/MachO/TextAPIWriter.h"<br>
+#include "gtest/gtest.h"<br>
+#include <string><br>
+#include <vector><br>
+<br>
+using namespace llvm;<br>
+using namespace llvm::MachO;<br>
+<br>
+using ExportedSymbol = std::tuple<SymbolKind, std::string, bool, bool>;<br>
+using ExportedSymbolSeq = std::vector<ExportedSymbol>;<br>
+<br>
+inline bool operator<(const ExportedSymbol &lhs, const ExportedSymbol &rhs) {<br>
+  return std::get<1>(lhs) < std::get<1>(rhs);<br>
+}<br>
+<br>
+static ExportedSymbolSeq TBDv2Symbols({<br>
+    {SymbolKind::GlobalSymbol, "$ld$hide$os9.0$_sym1", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_sym1", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_sym2", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_sym3", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_sym4", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_sym5", false, false},<br>
+    {SymbolKind::GlobalSymbol, "_tlv1", false, true},<br>
+    {SymbolKind::GlobalSymbol, "_tlv2", false, true},<br>
+    {SymbolKind::GlobalSymbol, "_tlv3", false, true},<br>
+    {SymbolKind::GlobalSymbol, "_weak1", true, false},<br>
+    {SymbolKind::GlobalSymbol, "_weak2", true, false},<br>
+    {SymbolKind::GlobalSymbol, "_weak3", true, false},<br>
+    {SymbolKind::ObjectiveCClass, "class1", false, false},<br>
+    {SymbolKind::ObjectiveCClass, "class2", false, false},<br>
+    {SymbolKind::ObjectiveCClass, "class3", false, false},<br>
+    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar1", false, false},<br>
+    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar2", false, false},<br>
+    {SymbolKind::ObjectiveCInstanceVariable, "class1._ivar3", false, false},<br>
+});<br>
+<br>
+namespace TBDv2 {<br>
+<br>
+TEST(TBDv2, ReadFile) {<br>
+  static const char tbd_v2_file1[] =<br>
+      "--- !tapi-tbd-v2\n"<br>
+      "archs: [ armv7, armv7s, armv7k, arm64 ]\n"<br>
+      "platform: ios\n"<br>
+      "flags: [ installapi ]\n"<br>
+      "install-name: Test.dylib\n"<br>
+      "current-version: 2.3.4\n"<br>
+      "compatibility-version: 1.0\n"<br>
+      "swift-version: 1.1\n"<br>
+      "parent-umbrella: Umbrella.dylib\n"<br>
+      "exports:\n"<br>
+      "  - archs: [ armv7, armv7s, armv7k, arm64 ]\n"<br>
+      "    allowable-clients: [ clientA ]\n"<br>
+      "    re-exports: [ /usr/lib/libfoo.dylib ]\n"<br>
+      "    symbols: [ _sym1, _sym2, _sym3, _sym4, $ld$hide$os9.0$_sym1 ]\n"<br>
+      "    objc-classes: [ _class1, _class2 ]\n"<br>
+      "    objc-ivars: [ _class1._ivar1, _class1._ivar2 ]\n"<br>
+      "    weak-def-symbols: [ _weak1, _weak2 ]\n"<br>
+      "    thread-local-symbols: [ _tlv1, _tlv2 ]\n"<br>
+      "  - archs: [ armv7, armv7s, armv7k ]\n"<br>
+      "    symbols: [ _sym5 ]\n"<br>
+      "    objc-classes: [ _class3 ]\n"<br>
+      "    objc-ivars: [ _class1._ivar3 ]\n"<br>
+      "    weak-def-symbols: [ _weak3 ]\n"<br>
+      "    thread-local-symbols: [ _tlv3 ]\n"<br>
+      "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v2_file1, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  auto Archs = Architecture::armv7 | Architecture::armv7s |<br>
+               Architecture::armv7k | Architecture::arm64;<br>
+  EXPECT_EQ(Archs, File->getArchitectures());<br>
+  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());<br>
+  EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());<br>
+  EXPECT_EQ(PackedVersion(2, 3, 4), File->getCurrentVersion());<br>
+  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());<br>
+  EXPECT_EQ(2U, File->getSwiftABIVersion());<br>
+  EXPECT_EQ(ObjCConstraintType::Retain_Release, File->getObjCConstraint());<br>
+  EXPECT_TRUE(File->isTwoLevelNamespace());<br>
+  EXPECT_TRUE(File->isApplicationExtensionSafe());<br>
+  EXPECT_TRUE(File->isInstallAPI());<br>
+  InterfaceFileRef client("clientA", Archs);<br>
+  InterfaceFileRef reexport("/usr/lib/libfoo.dylib", Archs);<br>
+  EXPECT_EQ(1U, File->allowableClients().size());<br>
+  EXPECT_EQ(client, File->allowableClients().front());<br>
+  EXPECT_EQ(1U, File->reexportedLibraries().size());<br>
+  EXPECT_EQ(reexport, File->reexportedLibraries().front());<br>
+<br>
+  ExportedSymbolSeq Exports;<br>
+  for (const auto *Sym : File->symbols()) {<br>
+    EXPECT_FALSE(Sym->isWeakReferenced());<br>
+    EXPECT_FALSE(Sym->isUndefined());<br>
+    Exports.emplace_back(Sym->getKind(), Sym->getName(), Sym->isWeakDefined(),<br>
+                         Sym->isThreadLocalValue());<br>
+  }<br>
+  llvm::sort(Exports.begin(), Exports.end());<br>
+<br>
+  EXPECT_EQ(TBDv2Symbols.size(), Exports.size());<br>
+  EXPECT_TRUE(std::equal(Exports.begin(), Exports.end(), TBDv2Symbols.begin()));<br>
+}<br>
+<br>
+TEST(TBDv2, ReadFile2) {<br>
+  static const char tbd_v2_file2[] =<br>
+      "--- !tapi-tbd-v2\n"<br>
+      "archs: [ armv7, armv7s, armv7k, arm64 ]\n"<br>
+      "platform: ios\n"<br>
+      "flags: [ flat_namespace, not_app_extension_safe ]\n"<br>
+      "install-name: Test.dylib\n"<br>
+      "swift-version: 1.1\n"<br>
+      "exports:\n"<br>
+      "  - archs: [ armv7, armv7s, armv7k, arm64 ]\n"<br>
+      "    symbols: [ _sym1, _sym2, _sym3, _sym4, $ld$hide$os9.0$_sym1 ]\n"<br>
+      "    objc-classes: [ _class1, _class2 ]\n"<br>
+      "    objc-ivars: [ _class1._ivar1, _class1._ivar2 ]\n"<br>
+      "    weak-def-symbols: [ _weak1, _weak2 ]\n"<br>
+      "    thread-local-symbols: [ _tlv1, _tlv2 ]\n"<br>
+      "  - archs: [ armv7, armv7s, armv7k ]\n"<br>
+      "    symbols: [ _sym5 ]\n"<br>
+      "    objc-classes: [ _class3 ]\n"<br>
+      "    objc-ivars: [ _class1._ivar3 ]\n"<br>
+      "    weak-def-symbols: [ _weak3 ]\n"<br>
+      "    thread-local-symbols: [ _tlv3 ]\n"<br>
+      "undefineds:\n"<br>
+      "  - archs: [ armv7, armv7s, armv7k, arm64 ]\n"<br>
+      "    symbols: [ _undefSym1, _undefSym2, _undefSym3 ]\n"<br>
+      "    objc-classes: [ _undefClass1, _undefClass2 ]\n"<br>
+      "    objc-ivars: [ _undefClass1._ivar1, _undefClass1._ivar2 ]\n"<br>
+      "    weak-ref-symbols: [ _undefWeak1, _undefWeak2 ]\n"<br>
+      "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v2_file2, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  auto Archs = Architecture::armv7 | Architecture::armv7s |<br>
+               Architecture::armv7k | Architecture::arm64;<br>
+  EXPECT_EQ(Archs, File->getArchitectures());<br>
+  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());<br>
+  EXPECT_EQ(std::string("Test.dylib"), File->getInstallName());<br>
+  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCurrentVersion());<br>
+  EXPECT_EQ(PackedVersion(1, 0, 0), File->getCompatibilityVersion());<br>
+  EXPECT_EQ(2U, File->getSwiftABIVersion());<br>
+  EXPECT_EQ(ObjCConstraintType::Retain_Release, File->getObjCConstraint());<br>
+  EXPECT_FALSE(File->isTwoLevelNamespace());<br>
+  EXPECT_FALSE(File->isApplicationExtensionSafe());<br>
+  EXPECT_FALSE(File->isInstallAPI());<br>
+  EXPECT_EQ(0U, File->allowableClients().size());<br>
+  EXPECT_EQ(0U, File->reexportedLibraries().size());<br>
+}<br>
+<br>
+TEST(TBDv2, WriteFile) {<br>
+  static const char tbd_v2_file3[] =<br>
+      "--- !tapi-tbd-v2\n"<br>
+      "archs:           [ i386, x86_64 ]\n"<br>
+      "platform:        macosx\n"<br>
+      "install-name:    '/usr/lib/libfoo.dylib'\n"<br>
+      "current-version: 1.2.3\n"<br>
+      "compatibility-version: 0\n"<br>
+      "swift-version:   5\n"<br>
+      "exports:         \n"<br>
+      "  - archs:           [ i386 ]\n"<br>
+      "    symbols:         [ _sym1 ]\n"<br>
+      "    weak-def-symbols: [ _sym2 ]\n"<br>
+      "    thread-local-symbols: [ _sym3 ]\n"<br>
+      "  - archs:           [ x86_64 ]\n"<br>
+      "    allowable-clients: [ clientA ]\n"<br>
+      "    re-exports:      [ '/usr/lib/libfoo.dylib' ]\n"<br>
+      "    symbols:         [ '_OBJC_EHTYPE_$_Class1' ]\n"<br>
+      "    objc-classes:    [ _Class1 ]\n"<br>
+      "    objc-ivars:      [ _Class1._ivar1 ]\n"<br>
+      "...\n";<br>
+<br>
+  InterfaceFile File;<br>
+  File.setPath("libfoo.dylib");<br>
+  File.setInstallName("/usr/lib/libfoo.dylib");<br>
+  File.setFileType(FileType::TBD_V2);<br>
+  File.setArchitectures(Architecture::i386 | Architecture::x86_64);<br>
+  File.setPlatform(PLATFORM_MACOS);<br>
+  File.setCurrentVersion(PackedVersion(1, 2, 3));<br>
+  File.setTwoLevelNamespace();<br>
+  File.setApplicationExtensionSafe();<br>
+  File.setSwiftABIVersion(5);<br>
+  File.setObjCConstraint(ObjCConstraintType::Retain_Release);<br>
+  File.addAllowableClient("clientA", Architecture::x86_64);<br>
+  File.addReexportedLibrary("/usr/lib/libfoo.dylib", Architecture::x86_64);<br>
+  File.addSymbol(SymbolKind::GlobalSymbol, "_sym1", Architecture::i386);<br>
+  File.addSymbol(SymbolKind::GlobalSymbol, "_sym2", Architecture::i386,<br>
+                 SymbolFlags::WeakDefined);<br>
+  File.addSymbol(SymbolKind::GlobalSymbol, "_sym3", Architecture::i386,<br>
+                 SymbolFlags::ThreadLocalValue);<br>
+  File.addSymbol(SymbolKind::ObjectiveCClass, "Class1", Architecture::x86_64);<br>
+  File.addSymbol(SymbolKind::ObjectiveCClassEHType, "Class1",<br>
+                 Architecture::x86_64);<br>
+  File.addSymbol(SymbolKind::ObjectiveCInstanceVariable, "Class1._ivar1",<br>
+                 Architecture::x86_64);<br>
+<br>
+  SmallString<4096> Buffer;<br>
+  raw_svector_ostream OS(Buffer);<br>
+  auto Result = TextAPIWriter::writeToStream(OS, File);<br>
+  EXPECT_FALSE(Result);<br>
+  EXPECT_STREQ(tbd_v2_file3, Buffer.c_str());<br>
+}<br>
+<br>
+TEST(TBDv2, Platform_macOS) {<br>
+  static const char tbd_v1_platform_macos[] = "--- !tapi-tbd-v2\n"<br>
+                                              "archs: [ x86_64 ]\n"<br>
+                                              "platform: macosx\n"<br>
+                                              "install-name: Test.dylib\n"<br>
+                                              "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_macos, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  EXPECT_EQ(PLATFORM_MACOS, File->getPlatform());<br>
+}<br>
+<br>
+TEST(TBDv2, Platform_iOS) {<br>
+  static const char tbd_v1_platform_ios[] = "--- !tapi-tbd-v2\n"<br>
+                                            "archs: [ arm64 ]\n"<br>
+                                            "platform: ios\n"<br>
+                                            "install-name: Test.dylib\n"<br>
+                                            "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_ios, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  EXPECT_EQ(PLATFORM_IOS, File->getPlatform());<br>
+}<br>
+<br>
+TEST(TBDv2, Platform_watchOS) {<br>
+  static const char tbd_v1_platform_watchos[] = "--- !tapi-tbd-v2\n"<br>
+                                                "archs: [ armv7k ]\n"<br>
+                                                "platform: watchos\n"<br>
+                                                "install-name: Test.dylib\n"<br>
+                                                "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_watchos, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  EXPECT_EQ(PLATFORM_WATCHOS, File->getPlatform());<br>
+}<br>
+<br>
+TEST(TBDv2, Platform_tvOS) {<br>
+  static const char tbd_v1_platform_tvos[] = "--- !tapi-tbd-v2\n"<br>
+                                             "archs: [ arm64 ]\n"<br>
+                                             "platform: tvos\n"<br>
+                                             "install-name: Test.dylib\n"<br>
+                                             "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_platform_tvos, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  EXPECT_EQ(PLATFORM_TVOS, File->getPlatform());<br>
+}<br>
+<br>
+TEST(TBDv2, Platform_bridgeOS) {<br>
+  static const char tbd_v1_platform_bridgeos[] = "--- !tapi-tbd-v2\n"<br>
+                                                 "archs: [ armv7k ]\n"<br>
+                                                 "platform: bridgeos\n"<br>
+                                                 "install-name: Test.dylib\n"<br>
+                                                 "...\n";<br>
+<br>
+  auto Buffer =<br>
+      MemoryBuffer::getMemBuffer(tbd_v1_platform_bridgeos, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  EXPECT_EQ(PLATFORM_BRIDGEOS, File->getPlatform());<br>
+}<br>
+<br>
+TEST(TBDv2, Swift_1_0) {<br>
+  static const char tbd_v1_swift_1_0[] = "--- !tapi-tbd-v2\n"<br>
+                                         "archs: [ arm64 ]\n"<br>
+                                         "platform: ios\n"<br>
+                                         "install-name: Test.dylib\n"<br>
+                                         "swift-version: 1.0\n"<br>
+                                         "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_1_0, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  EXPECT_EQ(1U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv2, Swift_1_1) {<br>
+  static const char tbd_v1_swift_1_1[] = "--- !tapi-tbd-v2\n"<br>
+                                         "archs: [ arm64 ]\n"<br>
+                                         "platform: ios\n"<br>
+                                         "install-name: Test.dylib\n"<br>
+                                         "swift-version: 1.1\n"<br>
+                                         "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_1_1, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  EXPECT_EQ(2U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv2, Swift_2_0) {<br>
+  static const char tbd_v1_swift_2_0[] = "--- !tapi-tbd-v2\n"<br>
+                                         "archs: [ arm64 ]\n"<br>
+                                         "platform: ios\n"<br>
+                                         "install-name: Test.dylib\n"<br>
+                                         "swift-version: 2.0\n"<br>
+                                         "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_2_0, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  EXPECT_EQ(3U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv2, Swift_3_0) {<br>
+  static const char tbd_v1_swift_3_0[] = "--- !tapi-tbd-v2\n"<br>
+                                         "archs: [ arm64 ]\n"<br>
+                                         "platform: ios\n"<br>
+                                         "install-name: Test.dylib\n"<br>
+                                         "swift-version: 3.0\n"<br>
+                                         "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_3_0, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  EXPECT_EQ(4U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv2, Swift_4_0) {<br>
+  static const char tbd_v1_swift_4_0[] = "--- !tapi-tbd-v2\n"<br>
+                                         "archs: [ arm64 ]\n"<br>
+                                         "platform: ios\n"<br>
+                                         "install-name: Test.dylib\n"<br>
+                                         "swift-version: 4.0\n"<br>
+                                         "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_4_0, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_FALSE(!!Result);<br>
+  auto errorMessage = toString(Result.takeError());<br>
+  EXPECT_EQ("malformed file\nTest.tbd:5:16: error: invalid Swift ABI "<br>
+            "version.\nswift-version: 4.0\n               ^~~\n",<br>
+            errorMessage);<br>
+}<br>
+<br>
+TEST(TBDv2, Swift_5) {<br>
+  static const char tbd_v1_swift_5[] = "--- !tapi-tbd-v2\n"<br>
+                                       "archs: [ arm64 ]\n"<br>
+                                       "platform: ios\n"<br>
+                                       "install-name: Test.dylib\n"<br>
+                                       "swift-version: 5\n"<br>
+                                       "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_5, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  EXPECT_EQ(5U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv2, Swift_99) {<br>
+  static const char tbd_v1_swift_99[] = "--- !tapi-tbd-v2\n"<br>
+                                        "archs: [ arm64 ]\n"<br>
+                                        "platform: ios\n"<br>
+                                        "install-name: Test.dylib\n"<br>
+                                        "swift-version: 99\n"<br>
+                                        "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(tbd_v1_swift_99, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+  auto File = std::move(Result.get());<br>
+  EXPECT_EQ(FileType::TBD_V2, File->getFileType());<br>
+  EXPECT_EQ(99U, File->getSwiftABIVersion());<br>
+}<br>
+<br>
+TEST(TBDv2, UnknownArchitecture) {<br>
+  static const char tbd_v2_file_unknown_architecture[] =<br>
+      "--- !tapi-tbd-v2\n"<br>
+      "archs: [ foo ]\n"<br>
+      "platform: macosx\n"<br>
+      "install-name: Test.dylib\n"<br>
+      "...\n";<br>
+<br>
+  auto Buffer =<br>
+      MemoryBuffer::getMemBuffer(tbd_v2_file_unknown_architecture, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_TRUE(!!Result);<br>
+}<br>
+<br>
+TEST(TBDv2, UnknownPlatform) {<br>
+  static const char tbd_v2_file_unknown_platform[] = "--- !tapi-tbd-v2\n"<br>
+                                                     "archs: [ i386 ]\n"<br>
+                                                     "platform: newOS\n"<br>
+                                                     "...\n";<br>
+<br>
+  auto Buffer =<br>
+      MemoryBuffer::getMemBuffer(tbd_v2_file_unknown_platform, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_FALSE(!!Result);<br>
+  auto errorMessage = toString(Result.takeError());<br>
+  EXPECT_EQ("malformed file\nTest.tbd:3:11: error: unknown platform\nplatform: "<br>
+            "newOS\n          ^~~~~\n",<br>
+            errorMessage);<br>
+}<br>
+<br>
+TEST(TBDv2, MalformedFile1) {<br>
+  static const char malformed_file1[] = "--- !tapi-tbd-v2\n"<br>
+                                        "archs: [ arm64 ]\n"<br>
+                                        "foobar: \"Unsupported key\"\n"<br>
+                                        "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(malformed_file1, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_FALSE(!!Result);<br>
+  auto errorMessage = toString(Result.takeError());<br>
+  ASSERT_EQ("malformed file\nTest.tbd:2:1: error: missing required key "<br>
+            "'platform'\narchs: [ arm64 ]\n^\n",<br>
+            errorMessage);<br>
+}<br>
+<br>
+TEST(TBDv2, MalformedFile2) {<br>
+  static const char malformed_file2[] = "--- !tapi-tbd-v2\n"<br>
+                                        "archs: [ arm64 ]\n"<br>
+                                        "platform: ios\n"<br>
+                                        "install-name: Test.dylib\n"<br>
+                                        "foobar: \"Unsupported key\"\n"<br>
+                                        "...\n";<br>
+<br>
+  auto Buffer = MemoryBuffer::getMemBuffer(malformed_file2, "Test.tbd");<br>
+  auto Result = TextAPIReader::get(std::move(Buffer));<br>
+  EXPECT_FALSE(!!Result);<br>
+  auto errorMessage = toString(Result.takeError());<br>
+  ASSERT_EQ(<br>
+      "malformed file\nTest.tbd:5:9: error: unknown key 'foobar'\nfoobar: "<br>
+      "\"Unsupported key\"\n        ^~~~~~~~~~~~~~~~~\n",<br>
+      errorMessage);<br>
+}<br>
+<br>
+} // namespace TBDv2<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>