Make BinaryRef output correctly in case of empty data.

Previously, it would simply output nothing, but it should output an
empty string `""`.

llvm-svn: 185894
This commit is contained in:
Sean Silva 2013-07-09 00:54:46 +00:00
parent 8e8424eb17
commit 2f672d610e
6 changed files with 68 additions and 1 deletions

View File

@ -49,6 +49,10 @@ void BinaryRef::writeAsBinary(raw_ostream &OS) const {
}
void BinaryRef::writeAsHex(raw_ostream &OS) const {
if (binary_size() == 0) {
OS << "\"\"";
return;
}
if (DataIsHexString) {
OS.write((const char *)Data.data(), Data.size());
return;

View File

@ -14,3 +14,4 @@ add_subdirectory(Support)
add_subdirectory(Transforms)
add_subdirectory(IR)
add_subdirectory(DebugInfo)
add_subdirectory(Object)

View File

@ -10,7 +10,7 @@
LEVEL = ..
PARALLEL_DIRS = ADT ExecutionEngine Support Transforms IR Analysis Bitcode \
DebugInfo
DebugInfo Object
include $(LEVEL)/Makefile.common

View File

@ -0,0 +1,7 @@
set(LLVM_LINK_COMPONENTS
object
)
add_llvm_unittest(ObjectTests
YAMLTest.cpp
)

View File

@ -0,0 +1,15 @@
##===- unittests/IR/Makefile -------------------------------*- Makefile -*-===##
#
# The LLVM Compiler Infrastructure
#
# This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
LEVEL = ../..
TESTNAME = Object
LINK_COMPONENTS := object
include $(LEVEL)/Makefile.config
include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest

View File

@ -0,0 +1,40 @@
//===- llvm/unittest/Object/YAMLTest.cpp - Tests for Object YAML ----------===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
#include "llvm/Object/YAML.h"
#include "llvm/Support/YAMLTraits.h"
#include "gtest/gtest.h"
using namespace llvm;
namespace {
struct BinaryHolder {
object::yaml::BinaryRef Binary;
};
} // end anonymous namespace
namespace llvm {
namespace yaml {
template <>
struct MappingTraits<BinaryHolder> {
static void mapping(IO &IO, BinaryHolder &BH) {
IO.mapRequired("Binary", BH.Binary);
}
};
} // end namespace yaml
} // end namespace llvm
TEST(ObjectYAML, BinaryRef) {
BinaryHolder BH;
SmallVector<char, 32> Buf;
llvm::raw_svector_ostream OS(Buf);
yaml::Output YOut(OS);
YOut << BH;
EXPECT_NE(OS.str().find("\"\""), StringRef::npos);
}