R600/SI: Add pattern for the AMDGPU.barrier.local intrinsic

[oota-llvm.git] / lib / Object / YAML.cpp

diff --git a/lib/Object/YAML.cpp b/lib/Object/YAML.cpp
index e63bd5df27ccabd030b84ec495544b1af78cc491..5b665032bb3449680070e0ac5f6f583255216dea 100644 (file)
--- a/lib/Object/YAML.cpp
+++ b/lib/Object/YAML.cpp
@@ -23,14 +23,6 @@ void yaml::ScalarTraits<object::yaml::BinaryRef>::output(
   Val.writeAsHex(Out);
 }
 
-// Can't find this anywhere else in the codebase (clang has one, but it has
-// some baggage). Deduplicate as required.
-static bool isHexDigit(uint8_t C) {
-  return ('0' <= C && C <= '9') ||
-         ('A' <= C && C <= 'F') ||
-         ('a' <= C && C <= 'f');
-}
-
 StringRef yaml::ScalarTraits<object::yaml::BinaryRef>::input(
     StringRef Scalar, void *, object::yaml::BinaryRef &Val) {
   if (Scalar.size() % 2 != 0)
@@ -38,7 +30,7 @@ StringRef yaml::ScalarTraits<object::yaml::BinaryRef>::input(
   // TODO: Can we improve YAMLIO to permit a more accurate diagnostic here?
   // (e.g. a caret pointing to the offending character).
   for (unsigned I = 0, N = Scalar.size(); I != N; ++I)
-    if (!isHexDigit(Scalar[I]))
+    if (!isxdigit(Scalar[I]))
       return "BinaryRef hex string must contain only hex digits.";
   Val = object::yaml::BinaryRef(Scalar);
   return StringRef();
@@ -57,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;