<div dir="ltr">LGTM. Thank you for doing this!</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Jul 9, 2013 at 9:54 AM, Sean Silva <span dir="ltr"><<a href="mailto:silvas@purdue.edu" target="_blank">silvas@purdue.edu</a>></span> wrote:<br>

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: silvas<br>
Date: Mon Jul  8 19:54:46 2013<br>
New Revision: 185894<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=185894&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=185894&view=rev</a><br>
Log:<br>
Make BinaryRef output correctly in case of empty data.<br>
<br>
Previously, it would simply output nothing, but it should output an<br>
empty string `""`.<br>
<br>
Added:<br>
    llvm/trunk/unittests/Object/<br>
    llvm/trunk/unittests/Object/CMakeLists.txt<br>
    llvm/trunk/unittests/Object/Makefile<br>
      - copied, changed from r185888, llvm/trunk/unittests/Makefile<br>
    llvm/trunk/unittests/Object/YAMLTest.cpp<br>
Modified:<br>
    llvm/trunk/lib/Object/YAML.cpp<br>
    llvm/trunk/unittests/CMakeLists.txt<br>
    llvm/trunk/unittests/Makefile<br>
<br>
Modified: llvm/trunk/lib/Object/YAML.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/YAML.cpp?rev=185894&r1=185893&r2=185894&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/YAML.cpp?rev=185894&r1=185893&r2=185894&view=diff</a><br>


==============================================================================<br>
--- llvm/trunk/lib/Object/YAML.cpp (original)<br>
+++ llvm/trunk/lib/Object/YAML.cpp Mon Jul  8 19:54:46 2013<br>
@@ -49,6 +49,10 @@ void BinaryRef::writeAsBinary(raw_ostrea<br>
 }<br>
<br>
 void BinaryRef::writeAsHex(raw_ostream &OS) const {<br>
+  if (binary_size() == 0) {<br>
+    OS << "\"\"";<br>
+    return;<br>
+  }<br>
   if (DataIsHexString) {<br>
     OS.write((const char *)Data.data(), Data.size());<br>
     return;<br>
<br>
Modified: llvm/trunk/unittests/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/CMakeLists.txt?rev=185894&r1=185893&r2=185894&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/CMakeLists.txt?rev=185894&r1=185893&r2=185894&view=diff</a><br>


==============================================================================<br>
--- llvm/trunk/unittests/CMakeLists.txt (original)<br>
+++ llvm/trunk/unittests/CMakeLists.txt Mon Jul  8 19:54:46 2013<br>
@@ -14,3 +14,4 @@ add_subdirectory(Support)<br>
 add_subdirectory(Transforms)<br>
 add_subdirectory(IR)<br>
 add_subdirectory(DebugInfo)<br>
+add_subdirectory(Object)<br>
<br>
Modified: llvm/trunk/unittests/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Makefile?rev=185894&r1=185893&r2=185894&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Makefile?rev=185894&r1=185893&r2=185894&view=diff</a><br>


==============================================================================<br>
--- llvm/trunk/unittests/Makefile (original)<br>
+++ llvm/trunk/unittests/Makefile Mon Jul  8 19:54:46 2013<br>
@@ -10,7 +10,7 @@<br>
 LEVEL = ..<br>
<br>
 PARALLEL_DIRS = ADT ExecutionEngine Support Transforms IR Analysis Bitcode \<br>
-                                                               DebugInfo<br>
+               DebugInfo Object<br>
<br>
 include $(LEVEL)/Makefile.common<br>
<br>
<br>
Added: llvm/trunk/unittests/Object/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/CMakeLists.txt?rev=185894&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/CMakeLists.txt?rev=185894&view=auto</a><br>


==============================================================================<br>
--- llvm/trunk/unittests/Object/CMakeLists.txt (added)<br>
+++ llvm/trunk/unittests/Object/CMakeLists.txt Mon Jul  8 19:54:46 2013<br>
@@ -0,0 +1,7 @@<br>
+set(LLVM_LINK_COMPONENTS<br>
+  object<br>
+  )<br>
+<br>
+add_llvm_unittest(ObjectTests<br>
+  YAMLTest.cpp<br>
+  )<br>
<br>
Copied: llvm/trunk/unittests/Object/Makefile (from r185888, llvm/trunk/unittests/Makefile)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/Makefile?p2=llvm/trunk/unittests/Object/Makefile&p1=llvm/trunk/unittests/Makefile&r1=185888&r2=185894&rev=185894&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/Makefile?p2=llvm/trunk/unittests/Object/Makefile&p1=llvm/trunk/unittests/Makefile&r1=185888&r2=185894&rev=185894&view=diff</a><br>


==============================================================================<br>
--- llvm/trunk/unittests/Makefile (original)<br>
+++ llvm/trunk/unittests/Object/Makefile Mon Jul  8 19:54:46 2013<br>
@@ -1,4 +1,4 @@<br>
-##===- unittests/Makefile ----------------------------------*- Makefile -*-===##<br>
+##===- unittests/IR/Makefile -------------------------------*- Makefile -*-===##<br>
 #<br>
 #                     The LLVM Compiler Infrastructure<br>
 #<br>
@@ -7,12 +7,9 @@<br>
 #<br>
 ##===----------------------------------------------------------------------===##<br>
<br>
-LEVEL = ..<br>
+LEVEL = ../..<br>
+TESTNAME = Object<br>
+LINK_COMPONENTS := object<br>
<br>
-PARALLEL_DIRS = ADT ExecutionEngine Support Transforms IR Analysis Bitcode \<br>
-                                                               DebugInfo<br>
-<br>
-include $(LEVEL)/Makefile.common<br>
-<br>
-clean::<br>
-       $(Verb) $(RM) -f *Tests<br>
+include $(LEVEL)/Makefile.config<br>
+include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest<br>
<br>
Added: llvm/trunk/unittests/Object/YAMLTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/YAMLTest.cpp?rev=185894&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Object/YAMLTest.cpp?rev=185894&view=auto</a><br>


==============================================================================<br>
--- llvm/trunk/unittests/Object/YAMLTest.cpp (added)<br>
+++ llvm/trunk/unittests/Object/YAMLTest.cpp Mon Jul  8 19:54:46 2013<br>
@@ -0,0 +1,40 @@<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>
+namespace {<br>
+struct BinaryHolder {<br>
+  object::yaml::BinaryRef Binary;<br>
+};<br>
+} // end anonymous namespace<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>