From 6a5028f9c6831d06e908c8cd6dd11eb81044fc59 Mon Sep 17 00:00:00 2001
From: George Rimar <grimar@accesssoftek.com>
Date: Thu, 5 Sep 2019 08:39:44 +0000
Subject: [PATCH] Revert r371023 "[lib/ObjectYAML] - Stop calling error(1) when
 mapping the st_other field of a symbol." (2)

Forgot to revert the cpp file.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@371025 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/ObjectYAML/ELFYAML.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/ObjectYAML/ELFYAML.cpp b/lib/ObjectYAML/ELFYAML.cpp
index 068f3453d57..a81d27eed6b 100644
--- a/lib/ObjectYAML/ELFYAML.cpp
+++ b/lib/ObjectYAML/ELFYAML.cpp
@@ -894,8 +894,10 @@ struct NormalizedOther {
     if (to_integer(Name, Val))
       return Val;
 
-    YamlIO.setError("an unknown value is used for symbol's 'Other' field: " +
-                    Name);
+    llvm::WithColor::error()
+        << "an unknown value is used for symbol's 'Other' field: " << Name
+        << ".\n";
+    exit(1);
   }
 
   Optional<uint8_t> denormalize(IO &) {
@@ -940,7 +942,7 @@ struct NormalizedOther {
     return Map;
   }
 
-  IO &YamlIO;
+  const IO &YamlIO;
   Optional<std::vector<StOtherPiece>> Other;
   std::string UnknownFlagsHolder;
 };
-- 
2.50.1