summaryrefslogtreecommitdiffstats
path: root/llvm/lib/ObjectYAML
diff options
context:
space:
mode:
authorGeorge Rimar <grimar@accesssoftek.com>2019-09-05 08:39:44 +0000
committerGeorge Rimar <grimar@accesssoftek.com>2019-09-05 08:39:44 +0000
commitfaa2a089875c0b5db9e8ad07654fe16b8aefafb1 (patch)
tree48d0520423b549faefb6c360d5ce1c192cd91299 /llvm/lib/ObjectYAML
parent7f1f50de413fa58ba1016b5fb8e96475db736c5a (diff)
downloadbcm5719-llvm-faa2a089875c0b5db9e8ad07654fe16b8aefafb1.tar.gz
bcm5719-llvm-faa2a089875c0b5db9e8ad07654fe16b8aefafb1.zip
Revert r371023 "[lib/ObjectYAML] - Stop calling error(1) when mapping the st_other field of a symbol." (2)
Forgot to revert the cpp file. llvm-svn: 371025
Diffstat (limited to 'llvm/lib/ObjectYAML')
-rw-r--r--llvm/lib/ObjectYAML/ELFYAML.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/llvm/lib/ObjectYAML/ELFYAML.cpp b/llvm/lib/ObjectYAML/ELFYAML.cpp
index 068f3453d57..a81d27eed6b 100644
--- a/llvm/lib/ObjectYAML/ELFYAML.cpp
+++ b/llvm/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;
};
OpenPOWER on IntegriCloud