<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Jul 2, 2014 at 7:01 PM, Rafael Espindola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: rafael<br>
Date: Wed Jul  2 21:01:39 2014<br>
New Revision: 212248<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=212248&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=212248&view=rev</a><br>
Log:<br>
Invert the MC -> Object dependency.<br></blockquote><div><br></div><div>This dependency inversion wasn't entirely successful (and has broken the modules build): MC still depends on Object. In particular:</div><div>
<br></div><div><div>$ rgrep '#include "llvm/Object' MC</div><div>MC/MCObjectSymbolizer.h:#include "llvm/Object/ObjectFile.h"</div></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">

Now that we have a lib/MC/MCAnalysis, the dependency was there just because<br>
of two helper classes. Move the two over to MC.<br>
<br>
This will allow IRObjectFile to parse inline assembly.<br>
<br>
Added:<br>
    llvm/trunk/include/llvm/MC/StringTableBuilder.h<br>
      - copied, changed from r212245, llvm/trunk/include/llvm/Object/StringTableBuilder.h<br>
    llvm/trunk/include/llvm/MC/YAML.h<br>
      - copied, changed from r212245, llvm/trunk/include/llvm/Object/YAML.h<br>
    llvm/trunk/lib/MC/StringTableBuilder.cpp<br>
      - copied, changed from r212245, llvm/trunk/lib/Object/StringTableBuilder.cpp<br>
    llvm/trunk/lib/MC/YAML.cpp<br>
      - copied, changed from r212245, llvm/trunk/lib/Object/YAML.cpp<br>
    llvm/trunk/unittests/MC/StringTableBuilderTest.cpp<br>
      - copied, changed from r212245, llvm/trunk/unittests/Object/StringTableBuilderTest.cpp<br>
    llvm/trunk/unittests/MC/YAMLTest.cpp<br>
      - copied, changed from r212245, llvm/trunk/unittests/Object/YAMLTest.cpp<br>
Removed:<br>
    llvm/trunk/include/llvm/Object/StringTableBuilder.h<br>
    llvm/trunk/include/llvm/Object/YAML.h<br>
    llvm/trunk/lib/Object/StringTableBuilder.cpp<br>
    llvm/trunk/lib/Object/YAML.cpp<br>
    llvm/trunk/unittests/Object/CMakeLists.txt<br>
    llvm/trunk/unittests/Object/Makefile<br>
    llvm/trunk/unittests/Object/StringTableBuilderTest.cpp<br>
    llvm/trunk/unittests/Object/YAMLTest.cpp<br>
Modified:<br>
    llvm/trunk/include/llvm/Object/COFFYAML.h<br>
    llvm/trunk/include/llvm/Object/ELFYAML.h<br>
    llvm/trunk/lib/MC/CMakeLists.txt<br>
    llvm/trunk/lib/MC/ELFObjectWriter.cpp<br>
    llvm/trunk/lib/MC/LLVMBuild.txt<br>
    llvm/trunk/lib/MC/MCAnalysis/MCModuleYAML.cpp<br>
    llvm/trunk/lib/Object/CMakeLists.txt<br>
    llvm/trunk/lib/Object/LLVMBuild.txt<br>
    llvm/trunk/tools/obj2yaml/coff2yaml.cpp<br>
    llvm/trunk/tools/obj2yaml/elf2yaml.cpp<br>
    llvm/trunk/tools/yaml2obj/yaml2elf.cpp<br>
    llvm/trunk/unittests/CMakeLists.txt<br>
    llvm/trunk/unittests/MC/CMakeLists.txt<br>
    llvm/trunk/unittests/Makefile<br>
<br>
Copied: llvm/trunk/include/llvm/MC/StringTableBuilder.h (from r212245, llvm/trunk/include/llvm/Object/StringTableBuilder.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/StringTableBuilder.h?p2=llvm/trunk/include/llvm/MC/StringTableBuilder.h&p1=llvm/trunk/include/llvm/Object/StringTableBuilder.h&r1=212245&r2=212248&rev=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/StringTableBuilder.h?p2=llvm/trunk/include/llvm/MC/StringTableBuilder.h&p1=llvm/trunk/include/llvm/Object/StringTableBuilder.h&r1=212245&r2=212248&rev=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/include/llvm/Object/StringTableBuilder.h (original)<br>
+++ llvm/trunk/include/llvm/MC/StringTableBuilder.h Wed Jul  2 21:01:39 2014<br>
@@ -7,8 +7,8 @@<br>
 //<br>
 //===----------------------------------------------------------------------===//<br>
<br>
-#ifndef LLVM_OBJECT_STRINGTABLE_BUILDER_H<br>
-#define LLVM_OBJECT_STRINGTABLE_BUILDER_H<br>
+#ifndef LLVM_MC_STRINGTABLE_BUILDER_H<br>
+#define LLVM_MC_STRINGTABLE_BUILDER_H<br>
<br>
 #include "llvm/ADT/SmallString.h"<br>
 #include "llvm/ADT/StringMap.h"<br>
<br>
Copied: llvm/trunk/include/llvm/MC/YAML.h (from r212245, llvm/trunk/include/llvm/Object/YAML.h)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/YAML.h?p2=llvm/trunk/include/llvm/MC/YAML.h&p1=llvm/trunk/include/llvm/Object/YAML.h&r1=212245&r2=212248&rev=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/YAML.h?p2=llvm/trunk/include/llvm/MC/YAML.h&p1=llvm/trunk/include/llvm/Object/YAML.h&r1=212245&r2=212248&rev=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/include/llvm/Object/YAML.h (original)<br>
+++ llvm/trunk/include/llvm/MC/YAML.h Wed Jul  2 21:01:39 2014<br>
@@ -1,26 +1,10 @@<br>
-//===- YAML.h - YAMLIO utilities for object files ---------------*- 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>
-// This file declares utility classes for handling the YAML representation of<br>
-// object files.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#ifndef LLVM_OBJECT_YAML_H<br>
-#define LLVM_OBJECT_YAML_H<br>
+#ifndef LLVM_MC_YAML_H<br>
+#define LLVM_MC_YAML_H<br>
<br>
 #include "llvm/Support/YAMLTraits.h"<br>
<br>
 namespace llvm {<br>
-namespace object {<br>
 namespace yaml {<br>
-<br>
 /// \brief Specialized YAMLIO scalar type for representing a binary blob.<br>
 ///<br>
 /// A typical use case would be to represent the content of a section in a<br>
@@ -100,18 +84,11 @@ inline bool operator==(const BinaryRef &<br>
   return LHS.DataIsHexString == RHS.DataIsHexString && LHS.Data == RHS.Data;<br>
 }<br>
<br>
-}<br>
-}<br>
-<br>
-namespace yaml {<br>
-template <> struct ScalarTraits<object::yaml::BinaryRef> {<br>
-  static void output(const object::yaml::BinaryRef &, void *,<br>
-                     llvm::raw_ostream &);<br>
-  static StringRef input(StringRef, void *, object::yaml::BinaryRef &);<br>
+template <> struct ScalarTraits<BinaryRef> {<br>
+  static void output(const BinaryRef &, void *, llvm::raw_ostream &);<br>
+  static StringRef input(StringRef, void *, BinaryRef &);<br>
   static bool mustQuote(StringRef S) { return needsQuotes(S); }<br>
 };<br>
 }<br>
-<br>
 }<br>
-<br>
 #endif<br>
<br>
Modified: llvm/trunk/include/llvm/Object/COFFYAML.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFFYAML.h?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFFYAML.h?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/include/llvm/Object/COFFYAML.h (original)<br>
+++ llvm/trunk/include/llvm/Object/COFFYAML.h Wed Jul  2 21:01:39 2014<br>
@@ -15,7 +15,7 @@<br>
 #define LLVM_OBJECT_COFFYAML_H<br>
<br>
 #include "llvm/ADT/Optional.h"<br>
-#include "llvm/Object/YAML.h"<br>
+#include "llvm/MC/YAML.h"<br>
 #include "llvm/Support/COFF.h"<br>
<br>
 namespace llvm {<br>
@@ -49,7 +49,7 @@ namespace COFFYAML {<br>
   struct Section {<br>
     COFF::section Header;<br>
     unsigned Alignment;<br>
-    object::yaml::BinaryRef SectionData;<br>
+    yaml::BinaryRef SectionData;<br>
     std::vector<Relocation> Relocations;<br>
     StringRef Name;<br>
     Section();<br>
<br>
Modified: llvm/trunk/include/llvm/Object/ELFYAML.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELFYAML.h?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELFYAML.h?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/include/llvm/Object/ELFYAML.h (original)<br>
+++ llvm/trunk/include/llvm/Object/ELFYAML.h Wed Jul  2 21:01:39 2014<br>
@@ -16,7 +16,7 @@<br>
 #ifndef LLVM_OBJECT_ELFYAML_H<br>
 #define LLVM_OBJECT_ELFYAML_H<br>
<br>
-#include "llvm/Object/YAML.h"<br>
+#include "llvm/MC/YAML.h"<br>
 #include "llvm/Support/ELF.h"<br>
<br>
 namespace llvm {<br>
@@ -83,7 +83,7 @@ struct Section {<br>
   virtual ~Section();<br>
 };<br>
 struct RawContentSection : Section {<br>
-  object::yaml::BinaryRef Content;<br>
+  yaml::BinaryRef Content;<br>
   llvm::yaml::Hex64 Size;<br>
   RawContentSection() : Section(SectionKind::RawContent) {}<br>
   static bool classof(const Section *S) {<br>
<br>
Removed: llvm/trunk/include/llvm/Object/StringTableBuilder.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/StringTableBuilder.h?rev=212247&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/StringTableBuilder.h?rev=212247&view=auto</a><br>

==============================================================================<br>
--- llvm/trunk/include/llvm/Object/StringTableBuilder.h (original)<br>
+++ llvm/trunk/include/llvm/Object/StringTableBuilder.h (removed)<br>
@@ -1,59 +0,0 @@<br>
-//===-- StringTableBuilder.h - String table building utility ------*- 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_OBJECT_STRINGTABLE_BUILDER_H<br>
-#define LLVM_OBJECT_STRINGTABLE_BUILDER_H<br>
-<br>
-#include "llvm/ADT/SmallString.h"<br>
-#include "llvm/ADT/StringMap.h"<br>
-#include <cassert><br>
-<br>
-namespace llvm {<br>
-<br>
-/// \brief Utility for building string tables with deduplicated suffixes.<br>
-class StringTableBuilder {<br>
-  SmallString<256> StringTable;<br>
-  StringMap<size_t> StringIndexMap;<br>
-<br>
-public:<br>
-  /// \brief Add a string to the builder. Returns a StringRef to the internal<br>
-  /// copy of s. Can only be used before the table is finalized.<br>
-  StringRef add(StringRef s) {<br>
-    assert(!isFinalized());<br>
-    return StringIndexMap.GetOrCreateValue(s, 0).getKey();<br>
-  }<br>
-<br>
-  /// \brief Analyze the strings and build the final table. No more strings can<br>
-  /// be added after this point.<br>
-  void finalize();<br>
-<br>
-  /// \brief Retrieve the string table data. Can only be used after the table<br>
-  /// is finalized.<br>
-  StringRef data() {<br>
-    assert(isFinalized());<br>
-    return StringTable;<br>
-  }<br>
-<br>
-  /// \brief Get the offest of a string in the string table. Can only be used<br>
-  /// after the table is finalized.<br>
-  size_t getOffset(StringRef s) {<br>
-    assert(isFinalized());<br>
-    assert(StringIndexMap.count(s) && "String is not in table!");<br>
-    return StringIndexMap[s];<br>
-  }<br>
-<br>
-private:<br>
-  bool isFinalized() {<br>
-    return !StringTable.empty();<br>
-  }<br>
-};<br>
-<br>
-} // end llvm namespace<br>
-<br>
-#endif<br>
<br>
Removed: llvm/trunk/include/llvm/Object/YAML.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/YAML.h?rev=212247&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/YAML.h?rev=212247&view=auto</a><br>

==============================================================================<br>
--- llvm/trunk/include/llvm/Object/YAML.h (original)<br>
+++ llvm/trunk/include/llvm/Object/YAML.h (removed)<br>
@@ -1,117 +0,0 @@<br>
-//===- YAML.h - YAMLIO utilities for object files ---------------*- 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>
-// This file declares utility classes for handling the YAML representation of<br>
-// object files.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#ifndef LLVM_OBJECT_YAML_H<br>
-#define LLVM_OBJECT_YAML_H<br>
-<br>
-#include "llvm/Support/YAMLTraits.h"<br>
-<br>
-namespace llvm {<br>
-namespace object {<br>
-namespace yaml {<br>
-<br>
-/// \brief Specialized YAMLIO scalar type for representing a binary blob.<br>
-///<br>
-/// A typical use case would be to represent the content of a section in a<br>
-/// binary file.<br>
-/// This class has custom YAMLIO traits for convenient reading and writing.<br>
-/// It renders as a string of hex digits in a YAML file.<br>
-/// For example, it might render as `DEADBEEFCAFEBABE` (YAML does not<br>
-/// require the quotation marks, so for simplicity when outputting they are<br>
-/// omitted).<br>
-/// When reading, any string whose content is an even number of hex digits<br>
-/// will be accepted.<br>
-/// For example, all of the following are acceptable:<br>
-/// `DEADBEEF`, `"DeADbEeF"`, `"\x44EADBEEF"` (Note: '\x44' == 'D')<br>
-///<br>
-/// A significant advantage of using this class is that it never allocates<br>
-/// temporary strings or buffers for any of its functionality.<br>
-///<br>
-/// Example:<br>
-///<br>
-/// The YAML mapping:<br>
-/// \code<br>
-/// Foo: DEADBEEFCAFEBABE<br>
-/// \endcode<br>
-///<br>
-/// Could be modeled in YAMLIO by the struct:<br>
-/// \code<br>
-/// struct FooHolder {<br>
-///   BinaryRef Foo;<br>
-/// };<br>
-/// namespace llvm {<br>
-/// namespace yaml {<br>
-/// template <><br>
-/// struct MappingTraits<FooHolder> {<br>
-///   static void mapping(IO &IO, FooHolder &FH) {<br>
-///     IO.mapRequired("Foo", FH.Foo);<br>
-///   }<br>
-/// };<br>
-/// } // end namespace yaml<br>
-/// } // end namespace llvm<br>
-/// \endcode<br>
-class BinaryRef {<br>
-  friend bool operator==(const BinaryRef &LHS, const BinaryRef &RHS);<br>
-  /// \brief Either raw binary data, or a string of hex bytes (must always<br>
-  /// be an even number of characters).<br>
-  ArrayRef<uint8_t> Data;<br>
-  /// \brief Discriminator between the two states of the `Data` member.<br>
-  bool DataIsHexString;<br>
-<br>
-public:<br>
-  BinaryRef(ArrayRef<uint8_t> Data) : Data(Data), DataIsHexString(false) {}<br>
-  BinaryRef(StringRef Data)<br>
-      : Data(reinterpret_cast<const uint8_t *>(Data.data()), Data.size()),<br>
-        DataIsHexString(true) {}<br>
-  BinaryRef() : DataIsHexString(true) {}<br>
-  /// \brief The number of bytes that are represented by this BinaryRef.<br>
-  /// This is the number of bytes that writeAsBinary() will write.<br>
-  ArrayRef<uint8_t>::size_type binary_size() const {<br>
-    if (DataIsHexString)<br>
-      return Data.size() / 2;<br>
-    return Data.size();<br>
-  }<br>
-  /// \brief Write the contents (regardless of whether it is binary or a<br>
-  /// hex string) as binary to the given raw_ostream.<br>
-  void writeAsBinary(raw_ostream &OS) const;<br>
-  /// \brief Write the contents (regardless of whether it is binary or a<br>
-  /// hex string) as hex to the given raw_ostream.<br>
-  ///<br>
-  /// For example, a possible output could be `DEADBEEFCAFEBABE`.<br>
-  void writeAsHex(raw_ostream &OS) const;<br>
-};<br>
-<br>
-inline bool operator==(const BinaryRef &LHS, const BinaryRef &RHS) {<br>
-  // Special case for default constructed BinaryRef.<br>
-  if (LHS.Data.empty() && RHS.Data.empty())<br>
-    return true;<br>
-<br>
-  return LHS.DataIsHexString == RHS.DataIsHexString && LHS.Data == RHS.Data;<br>
-}<br>
-<br>
-}<br>
-}<br>
-<br>
-namespace yaml {<br>
-template <> struct ScalarTraits<object::yaml::BinaryRef> {<br>
-  static void output(const object::yaml::BinaryRef &, void *,<br>
-                     llvm::raw_ostream &);<br>
-  static StringRef input(StringRef, void *, object::yaml::BinaryRef &);<br>
-  static bool mustQuote(StringRef S) { return needsQuotes(S); }<br>
-};<br>
-}<br>
-<br>
-}<br>
-<br>
-#endif<br>
<br>
Modified: llvm/trunk/lib/MC/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/CMakeLists.txt?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/CMakeLists.txt?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/MC/CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/MC/CMakeLists.txt Wed Jul  2 21:01:39 2014<br>
@@ -43,9 +43,11 @@ add_llvm_library(LLVMMC<br>
   MCValue.cpp<br>
   MCWin64EH.cpp<br>
   MachObjectWriter.cpp<br>
+  StringTableBuilder.cpp<br>
   SubtargetFeature.cpp<br>
   WinCOFFObjectWriter.cpp<br>
   WinCOFFStreamer.cpp<br>
+  YAML.cpp<br>
   )<br>
<br>
 add_subdirectory(MCAnalysis)<br>
<br>
Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)<br>
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Wed Jul  2 21:01:39 2014<br>
@@ -28,7 +28,7 @@<br>
 #include "llvm/MC/MCObjectWriter.h"<br>
 #include "llvm/MC/MCSectionELF.h"<br>
 #include "llvm/MC/MCValue.h"<br>
-#include "llvm/Object/StringTableBuilder.h"<br>
+#include "llvm/MC/StringTableBuilder.h"<br>
 #include "llvm/Support/Compression.h"<br>
 #include "llvm/Support/Debug.h"<br>
 #include "llvm/Support/Endian.h"<br>
<br>
Modified: llvm/trunk/lib/MC/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/LLVMBuild.txt?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/LLVMBuild.txt?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/MC/LLVMBuild.txt (original)<br>
+++ llvm/trunk/lib/MC/LLVMBuild.txt Wed Jul  2 21:01:39 2014<br>
@@ -22,4 +22,4 @@ subdirectories = MCAnalysis MCDisassembl<br>
 type = Library<br>
 name = MC<br>
 parent = Libraries<br>
-required_libraries = Object Support<br>
+required_libraries = Support<br>
<br>
Modified: llvm/trunk/lib/MC/MCAnalysis/MCModuleYAML.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAnalysis/MCModuleYAML.cpp?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAnalysis/MCModuleYAML.cpp?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/MC/MCAnalysis/MCModuleYAML.cpp (original)<br>
+++ llvm/trunk/lib/MC/MCAnalysis/MCModuleYAML.cpp Wed Jul  2 21:01:39 2014<br>
@@ -17,7 +17,7 @@<br>
 #include "llvm/MC/MCAnalysis/MCFunction.h"<br>
 #include "llvm/MC/MCInstrInfo.h"<br>
 #include "llvm/MC/MCRegisterInfo.h"<br>
-#include "llvm/Object/YAML.h"<br>
+#include "llvm/MC/YAML.h"<br>
 #include "llvm/Support/Allocator.h"<br>
 #include "llvm/Support/Casting.h"<br>
 #include "llvm/Support/MathExtras.h"<br>
@@ -102,7 +102,7 @@ struct Atom {<br>
   uint64_t Size;<br>
<br>
   std::vector<Inst> Insts;<br>
-  object::yaml::BinaryRef Data;<br>
+  yaml::BinaryRef Data;<br>
 };<br>
<br>
 struct BasicBlock {<br>
<br>
Copied: llvm/trunk/lib/MC/StringTableBuilder.cpp (from r212245, llvm/trunk/lib/Object/StringTableBuilder.cpp)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/StringTableBuilder.cpp?p2=llvm/trunk/lib/MC/StringTableBuilder.cpp&p1=llvm/trunk/lib/Object/StringTableBuilder.cpp&r1=212245&r2=212248&rev=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/StringTableBuilder.cpp?p2=llvm/trunk/lib/MC/StringTableBuilder.cpp&p1=llvm/trunk/lib/Object/StringTableBuilder.cpp&r1=212245&r2=212248&rev=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Object/StringTableBuilder.cpp (original)<br>
+++ llvm/trunk/lib/MC/StringTableBuilder.cpp Wed Jul  2 21:01:39 2014<br>
@@ -7,8 +7,8 @@<br>
 //<br>
 //===----------------------------------------------------------------------===//<br>
<br>
+#include "llvm/MC/StringTableBuilder.h"<br>
 #include "llvm/ADT/SmallVector.h"<br>
-#include "llvm/Object/StringTableBuilder.h"<br>
<br>
 using namespace llvm;<br>
<br>
<br>
Copied: llvm/trunk/lib/MC/YAML.cpp (from r212245, llvm/trunk/lib/Object/YAML.cpp)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/YAML.cpp?p2=llvm/trunk/lib/MC/YAML.cpp&p1=llvm/trunk/lib/Object/YAML.cpp&r1=212245&r2=212248&rev=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/YAML.cpp?p2=llvm/trunk/lib/MC/YAML.cpp&p1=llvm/trunk/lib/Object/YAML.cpp&r1=212245&r2=212248&rev=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Object/YAML.cpp (original)<br>
+++ llvm/trunk/lib/MC/YAML.cpp Wed Jul  2 21:01:39 2014<br>
@@ -12,21 +12,20 @@<br>
 //<br>
 //===----------------------------------------------------------------------===//<br>
<br>
-#include "llvm/Object/YAML.h"<br>
+#include "llvm/MC/YAML.h"<br>
 #include "llvm/ADT/StringExtras.h"<br>
 #include "llvm/Support/raw_ostream.h"<br>
 #include <cctype><br>
<br>
 using namespace llvm;<br>
-using namespace object::yaml;<br>
<br>
-void yaml::ScalarTraits<object::yaml::BinaryRef>::output(<br>
-    const object::yaml::BinaryRef &Val, void *, llvm::raw_ostream &Out) {<br>
+void yaml::ScalarTraits<yaml::BinaryRef>::output(<br>
+    const yaml::BinaryRef &Val, void *, llvm::raw_ostream &Out) {<br>
   Val.writeAsHex(Out);<br>
 }<br>
<br>
-StringRef yaml::ScalarTraits<object::yaml::BinaryRef>::input(<br>
-    StringRef Scalar, void *, object::yaml::BinaryRef &Val) {<br>
+StringRef yaml::ScalarTraits<yaml::BinaryRef>::input(StringRef Scalar, void *,<br>
+                                                     yaml::BinaryRef &Val) {<br>
   if (Scalar.size() % 2 != 0)<br>
     return "BinaryRef hex string must contain an even number of nybbles.";<br>
   // TODO: Can we improve YAMLIO to permit a more accurate diagnostic here?<br>
@@ -34,11 +33,11 @@ StringRef yaml::ScalarTraits<object::yam<br>
   for (unsigned I = 0, N = Scalar.size(); I != N; ++I)<br>
     if (!isxdigit(Scalar[I]))<br>
       return "BinaryRef hex string must contain only hex digits.";<br>
-  Val = object::yaml::BinaryRef(Scalar);<br>
+  Val = yaml::BinaryRef(Scalar);<br>
   return StringRef();<br>
 }<br>
<br>
-void BinaryRef::writeAsBinary(raw_ostream &OS) const {<br>
+void yaml::BinaryRef::writeAsBinary(raw_ostream &OS) const {<br>
   if (!DataIsHexString) {<br>
     OS.write((const char *)Data.data(), Data.size());<br>
     return;<br>
@@ -50,7 +49,7 @@ void BinaryRef::writeAsBinary(raw_ostrea<br>
   }<br>
 }<br>
<br>
-void BinaryRef::writeAsHex(raw_ostream &OS) const {<br>
+void yaml::BinaryRef::writeAsHex(raw_ostream &OS) const {<br>
   if (binary_size() == 0)<br>
     return;<br>
   if (DataIsHexString) {<br>
<br>
Modified: llvm/trunk/lib/Object/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/CMakeLists.txt?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/CMakeLists.txt?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Object/CMakeLists.txt (original)<br>
+++ llvm/trunk/lib/Object/CMakeLists.txt Wed Jul  2 21:01:39 2014<br>
@@ -12,7 +12,5 @@ add_llvm_library(LLVMObject<br>
   MachOUniversal.cpp<br>
   Object.cpp<br>
   ObjectFile.cpp<br>
-  StringTableBuilder.cpp<br>
   SymbolicFile.cpp<br>
-  YAML.cpp<br>
   )<br>
<br>
Modified: llvm/trunk/lib/Object/LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/LLVMBuild.txt?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/LLVMBuild.txt?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Object/LLVMBuild.txt (original)<br>
+++ llvm/trunk/lib/Object/LLVMBuild.txt Wed Jul  2 21:01:39 2014<br>
@@ -19,4 +19,4 @@<br>
 type = Library<br>
 name = Object<br>
 parent = Libraries<br>
-required_libraries = BitReader Core Support<br>
+required_libraries = BitReader Core Support MC<br>
<br>
Removed: llvm/trunk/lib/Object/StringTableBuilder.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/StringTableBuilder.cpp?rev=212247&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/StringTableBuilder.cpp?rev=212247&view=auto</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Object/StringTableBuilder.cpp (original)<br>
+++ llvm/trunk/lib/Object/StringTableBuilder.cpp (removed)<br>
@@ -1,51 +0,0 @@<br>
-//===-- StringTableBuilder.cpp - String table building utility ------------===//<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>
-#include "llvm/ADT/SmallVector.h"<br>
-#include "llvm/Object/StringTableBuilder.h"<br>
-<br>
-using namespace llvm;<br>
-<br>
-static bool compareBySuffix(StringRef a, StringRef b) {<br>
-  size_t sizeA = a.size();<br>
-  size_t sizeB = b.size();<br>
-  size_t len = std::min(sizeA, sizeB);<br>
-  for (size_t i = 0; i < len; ++i) {<br>
-    char ca = a[sizeA - i - 1];<br>
-    char cb = b[sizeB - i - 1];<br>
-    if (ca != cb)<br>
-      return ca > cb;<br>
-  }<br>
-  return sizeA > sizeB;<br>
-}<br>
-<br>
-void StringTableBuilder::finalize() {<br>
-  SmallVector<StringRef, 8> Strings;<br>
-  for (auto i = StringIndexMap.begin(), e = StringIndexMap.end(); i != e; ++i)<br>
-    Strings.push_back(i->getKey());<br>
-<br>
-  std::sort(Strings.begin(), Strings.end(), compareBySuffix);<br>
-<br>
-  // FIXME: Starting with a null byte is ELF specific. Generalize this so we<br>
-  // can use the class with other object formats.<br>
-  StringTable += '\x00';<br>
-<br>
-  StringRef Previous;<br>
-  for (StringRef s : Strings) {<br>
-    if (Previous.endswith(s)) {<br>
-      StringIndexMap[s] = StringTable.size() - 1 - s.size();<br>
-      continue;<br>
-    }<br>
-<br>
-    StringIndexMap[s] = StringTable.size();<br>
-    StringTable += s;<br>
-    StringTable += '\x00';<br>
-    Previous = s;<br>
-  }<br>
-}<br>
<br>
Removed: llvm/trunk/lib/Object/YAML.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/YAML.cpp?rev=212247&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/YAML.cpp?rev=212247&view=auto</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Object/YAML.cpp (original)<br>
+++ llvm/trunk/lib/Object/YAML.cpp (removed)<br>
@@ -1,66 +0,0 @@<br>
-//===- YAML.cpp - YAMLIO utilities for object files -----------------------===//<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 file defines utility classes for handling the YAML representation of<br>
-// object files.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#include "llvm/Object/YAML.h"<br>
-#include "llvm/ADT/StringExtras.h"<br>
-#include "llvm/Support/raw_ostream.h"<br>
-#include <cctype><br>
-<br>
-using namespace llvm;<br>
-using namespace object::yaml;<br>
-<br>
-void yaml::ScalarTraits<object::yaml::BinaryRef>::output(<br>
-    const object::yaml::BinaryRef &Val, void *, llvm::raw_ostream &Out) {<br>
-  Val.writeAsHex(Out);<br>
-}<br>
-<br>
-StringRef yaml::ScalarTraits<object::yaml::BinaryRef>::input(<br>
-    StringRef Scalar, void *, object::yaml::BinaryRef &Val) {<br>
-  if (Scalar.size() % 2 != 0)<br>
-    return "BinaryRef hex string must contain an even number of nybbles.";<br>
-  // TODO: Can we improve YAMLIO to permit a more accurate diagnostic here?<br>
-  // (e.g. a caret pointing to the offending character).<br>
-  for (unsigned I = 0, N = Scalar.size(); I != N; ++I)<br>
-    if (!isxdigit(Scalar[I]))<br>
-      return "BinaryRef hex string must contain only hex digits.";<br>
-  Val = object::yaml::BinaryRef(Scalar);<br>
-  return StringRef();<br>
-}<br>
-<br>
-void BinaryRef::writeAsBinary(raw_ostream &OS) const {<br>
-  if (!DataIsHexString) {<br>
-    OS.write((const char *)Data.data(), Data.size());<br>
-    return;<br>
-  }<br>
-  for (unsigned I = 0, N = Data.size(); I != N; I += 2) {<br>
-    uint8_t Byte;<br>
-    StringRef((const char *)&Data[I],  2).getAsInteger(16, Byte);<br>
-    OS.write(Byte);<br>
-  }<br>
-}<br>
-<br>
-void BinaryRef::writeAsHex(raw_ostream &OS) const {<br>
-  if (binary_size() == 0)<br>
-    return;<br>
-  if (DataIsHexString) {<br>
-    OS.write((const char *)Data.data(), Data.size());<br>
-    return;<br>
-  }<br>
-  for (ArrayRef<uint8_t>::iterator I = Data.begin(), E = Data.end(); I != E;<br>
-       ++I) {<br>
-    uint8_t Byte = *I;<br>
-    OS << hexdigit(Byte >> 4);<br>
-    OS << hexdigit(Byte & 0xf);<br>
-  }<br>
-}<br>
<br>
Modified: llvm/trunk/tools/obj2yaml/coff2yaml.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/coff2yaml.cpp?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/coff2yaml.cpp?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/tools/obj2yaml/coff2yaml.cpp (original)<br>
+++ llvm/trunk/tools/obj2yaml/coff2yaml.cpp Wed Jul  2 21:01:39 2014<br>
@@ -61,7 +61,7 @@ void COFFDumper::dumpSections(unsigned N<br>
<br>
     ArrayRef<uint8_t> sectionData;<br>
     Obj.getSectionContents(Sect, sectionData);<br>
-    Sec.SectionData = object::yaml::BinaryRef(sectionData);<br>
+    Sec.SectionData = yaml::BinaryRef(sectionData);<br>
<br>
     std::vector<COFFYAML::Relocation> Relocations;<br>
     for (const auto &Reloc : Section.relocations()) {<br>
<br>
Modified: llvm/trunk/tools/obj2yaml/elf2yaml.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/elf2yaml.cpp?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/elf2yaml.cpp?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/tools/obj2yaml/elf2yaml.cpp (original)<br>
+++ llvm/trunk/tools/obj2yaml/elf2yaml.cpp Wed Jul  2 21:01:39 2014<br>
@@ -268,7 +268,7 @@ ELFDumper<ELFT>::dumpContentSection(cons<br>
   ErrorOr<ArrayRef<uint8_t>> ContentOrErr = Obj.getSectionContents(Shdr);<br>
   if (std::error_code EC = ContentOrErr.getError())<br>
     return EC;<br>
-  S->Content = object::yaml::BinaryRef(ContentOrErr.get());<br>
+  S->Content = yaml::BinaryRef(ContentOrErr.get());<br>
   S->Size = S->Content.binary_size();<br>
<br>
   return S.release();<br>
<br>
Modified: llvm/trunk/tools/yaml2obj/yaml2elf.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/yaml2obj/yaml2elf.cpp?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/yaml2obj/yaml2elf.cpp?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/tools/yaml2obj/yaml2elf.cpp (original)<br>
+++ llvm/trunk/tools/yaml2obj/yaml2elf.cpp Wed Jul  2 21:01:39 2014<br>
@@ -14,9 +14,9 @@<br>
<br>
 #include "yaml2obj.h"<br>
 #include "llvm/ADT/ArrayRef.h"<br>
+#include "llvm/MC/StringTableBuilder.h"<br>
 #include "llvm/Object/ELFObjectFile.h"<br>
 #include "llvm/Object/ELFYAML.h"<br>
-#include "llvm/Object/StringTableBuilder.h"<br>
 #include "llvm/Support/ELF.h"<br>
 #include "llvm/Support/MemoryBuffer.h"<br>
 #include "llvm/Support/YAMLTraits.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=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/CMakeLists.txt?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/unittests/CMakeLists.txt (original)<br>
+++ llvm/trunk/unittests/CMakeLists.txt Wed Jul  2 21:01:39 2014<br>
@@ -21,7 +21,6 @@ add_subdirectory(IR)<br>
 add_subdirectory(LineEditor)<br>
 add_subdirectory(Linker)<br>
 add_subdirectory(MC)<br>
-add_subdirectory(Object)<br>
 add_subdirectory(Option)<br>
 add_subdirectory(Support)<br>
 add_subdirectory(Transforms)<br>
<br>
Modified: llvm/trunk/unittests/MC/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MC/CMakeLists.txt?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MC/CMakeLists.txt?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/unittests/MC/CMakeLists.txt (original)<br>
+++ llvm/trunk/unittests/MC/CMakeLists.txt Wed Jul  2 21:01:39 2014<br>
@@ -4,4 +4,6 @@ set(LLVM_LINK_COMPONENTS<br>
<br>
 add_llvm_unittest(MCTests<br>
   MCAtomTest.cpp<br>
+  StringTableBuilderTest.cpp<br>
+  YAMLTest.cpp<br>
   )<br>
<br>
Copied: llvm/trunk/unittests/MC/StringTableBuilderTest.cpp (from r212245, llvm/trunk/unittests/Object/StringTableBuilderTest.cpp)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MC/StringTableBuilderTest.cpp?p2=llvm/trunk/unittests/MC/StringTableBuilderTest.cpp&p1=llvm/trunk/unittests/Object/StringTableBuilderTest.cpp&r1=212245&r2=212248&rev=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MC/StringTableBuilderTest.cpp?p2=llvm/trunk/unittests/MC/StringTableBuilderTest.cpp&p1=llvm/trunk/unittests/Object/StringTableBuilderTest.cpp&r1=212245&r2=212248&rev=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/unittests/Object/StringTableBuilderTest.cpp (original)<br>
+++ llvm/trunk/unittests/MC/StringTableBuilderTest.cpp Wed Jul  2 21:01:39 2014<br>
@@ -7,8 +7,8 @@<br>
 //<br>
 //===----------------------------------------------------------------------===//<br>
<br>
+#include "llvm/MC/StringTableBuilder.h"<br>
 #include "gtest/gtest.h"<br>
-#include "llvm/Object/StringTableBuilder.h"<br>
 #include <string><br>
<br>
 using namespace llvm;<br>
<br>
Copied: llvm/trunk/unittests/MC/YAMLTest.cpp (from r212245, llvm/trunk/unittests/Object/YAMLTest.cpp)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MC/YAMLTest.cpp?p2=llvm/trunk/unittests/MC/YAMLTest.cpp&p1=llvm/trunk/unittests/Object/YAMLTest.cpp&r1=212245&r2=212248&rev=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MC/YAMLTest.cpp?p2=llvm/trunk/unittests/MC/YAMLTest.cpp&p1=llvm/trunk/unittests/Object/YAMLTest.cpp&r1=212245&r2=212248&rev=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/unittests/Object/YAMLTest.cpp (original)<br>
+++ llvm/trunk/unittests/MC/YAMLTest.cpp Wed Jul  2 21:01:39 2014<br>
@@ -7,14 +7,14 @@<br>
 //<br>
 //===----------------------------------------------------------------------===//<br>
<br>
-#include "llvm/Object/YAML.h"<br>
+#include "llvm/MC/YAML.h"<br>
 #include "llvm/Support/YAMLTraits.h"<br>
 #include "gtest/gtest.h"<br>
<br>
 using namespace llvm;<br>
<br>
 struct BinaryHolder {<br>
-  object::yaml::BinaryRef Binary;<br>
+  yaml::BinaryRef Binary;<br>
 };<br>
<br>
 namespace llvm {<br>
<br>
Modified: llvm/trunk/unittests/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Makefile?rev=212248&r1=212247&r2=212248&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Makefile?rev=212248&r1=212247&r2=212248&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/unittests/Makefile (original)<br>
+++ llvm/trunk/unittests/Makefile Wed Jul  2 21:01:39 2014<br>
@@ -10,7 +10,7 @@<br>
 LEVEL = ..<br>
<br>
 PARALLEL_DIRS = ADT Analysis Bitcode CodeGen DebugInfo ExecutionEngine IR \<br>
-               LineEditor Linker MC Object Option Support Transforms<br>
+               LineEditor Linker MC Option Support Transforms<br>
<br>
 include $(LEVEL)/Makefile.config<br>
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest<br>
<br>
Removed: llvm/trunk/unittests/Object/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/CMakeLists.txt?rev=212247&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/CMakeLists.txt?rev=212247&view=auto</a><br>

==============================================================================<br>
--- llvm/trunk/unittests/Object/CMakeLists.txt (original)<br>
+++ llvm/trunk/unittests/Object/CMakeLists.txt (removed)<br>
@@ -1,9 +0,0 @@<br>
-set(LLVM_LINK_COMPONENTS<br>
-  Object<br>
-  Support<br>
-  )<br>
-<br>
-add_llvm_unittest(ObjectTests<br>
-  StringTableBuilderTest.cpp<br>
-  YAMLTest.cpp<br>
-  )<br>
<br>
Removed: llvm/trunk/unittests/Object/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/Makefile?rev=212247&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/Makefile?rev=212247&view=auto</a><br>

==============================================================================<br>
--- llvm/trunk/unittests/Object/Makefile (original)<br>
+++ llvm/trunk/unittests/Object/Makefile (removed)<br>
@@ -1,15 +0,0 @@<br>
-##===- unittests/Object/Makefile ---------------------------*- Makefile -*-===##<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>
-LEVEL = ../..<br>
-TESTNAME = Object<br>
-LINK_COMPONENTS := object<br>
-<br>
-include $(LEVEL)/Makefile.config<br>
-include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest<br>
<br>
Removed: llvm/trunk/unittests/Object/StringTableBuilderTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/StringTableBuilderTest.cpp?rev=212247&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/StringTableBuilderTest.cpp?rev=212247&view=auto</a><br>

==============================================================================<br>
--- llvm/trunk/unittests/Object/StringTableBuilderTest.cpp (original)<br>
+++ llvm/trunk/unittests/Object/StringTableBuilderTest.cpp (removed)<br>
@@ -1,40 +0,0 @@<br>
-//===----------- StringTableBuilderTest.cpp -------------------------------===//<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>
-#include "gtest/gtest.h"<br>
-#include "llvm/Object/StringTableBuilder.h"<br>
-#include <string><br>
-<br>
-using namespace llvm;<br>
-<br>
-namespace {<br>
-<br>
-TEST(StringTableBuilderTest, Basic) {<br>
-  StringTableBuilder B;<br>
-<br>
-  B.add("foo");<br>
-  B.add("bar");<br>
-  B.add("foobar");<br>
-<br>
-  B.finalize();<br>
-<br>
-  std::string Expected;<br>
-  Expected += '\x00';<br>
-  Expected += "foobar";<br>
-  Expected += '\x00';<br>
-  Expected += "foo";<br>
-  Expected += '\x00';<br>
-<br>
-  EXPECT_EQ(Expected, B.data());<br>
-  EXPECT_EQ(1U, B.getOffset("foobar"));<br>
-  EXPECT_EQ(4U, B.getOffset("bar"));<br>
-  EXPECT_EQ(8U, B.getOffset("foo"));<br>
-}<br>
-<br>
-}<br>
<br>
Removed: llvm/trunk/unittests/Object/YAMLTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/YAMLTest.cpp?rev=212247&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/YAMLTest.cpp?rev=212247&view=auto</a><br>

==============================================================================<br>
--- llvm/trunk/unittests/Object/YAMLTest.cpp (original)<br>
+++ llvm/trunk/unittests/Object/YAMLTest.cpp (removed)<br>
@@ -1,38 +0,0 @@<br>
-//===- llvm/unittest/Object/YAMLTest.cpp - Tests for Object YAML ----------===//<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>
-#include "llvm/Object/YAML.h"<br>
-#include "llvm/Support/YAMLTraits.h"<br>
-#include "gtest/gtest.h"<br>
-<br>
-using namespace llvm;<br>
-<br>
-struct BinaryHolder {<br>
-  object::yaml::BinaryRef Binary;<br>
-};<br>
-<br>
-namespace llvm {<br>
-namespace yaml {<br>
-template <><br>
-struct MappingTraits<BinaryHolder> {<br>
-  static void mapping(IO &IO, BinaryHolder &BH) {<br>
-    IO.mapRequired("Binary", BH.Binary);<br>
-  }<br>
-};<br>
-} // end namespace yaml<br>
-} // end namespace llvm<br>
-<br>
-TEST(ObjectYAML, BinaryRef) {<br>
-  BinaryHolder BH;<br>
-  SmallVector<char, 32> Buf;<br>
-  llvm::raw_svector_ostream OS(Buf);<br>
-  yaml::Output YOut(OS);<br>
-  YOut << BH;<br>
-  EXPECT_NE(OS.str().find("''"), StringRef::npos);<br>
-}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>