summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorGeorge Rimar <grimar@accesssoftek.com>2019-09-05 08:52:26 +0000
committerGeorge Rimar <grimar@accesssoftek.com>2019-09-05 08:52:26 +0000
commite7b4d209987ab94f3ec8f88256257d02dff898a4 (patch)
treec4e49de78bc9c000841863afa16665bdc19245af /llvm/lib
parentcbce3cef52b134f83061f6f4c8f0bb8f916838bf (diff)
downloadbcm5719-llvm-e7b4d209987ab94f3ec8f88256257d02dff898a4.tar.gz
bcm5719-llvm-e7b4d209987ab94f3ec8f88256257d02dff898a4.zip
Recommit r371023 "[lib/ObjectYAML] - Stop calling error(1) when mapping the st_other field of a symbol."
Fix: added missing return "return 0;" Original commit message: This eliminates one of the error(1) call in this lib. It is different from the others because happens on a fields mapping stage and can be easily fixed. Differential revision: https://reviews.llvm.org/D67150 llvm-svn: 371030
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/ObjectYAML/ELFYAML.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/llvm/lib/ObjectYAML/ELFYAML.cpp b/llvm/lib/ObjectYAML/ELFYAML.cpp
index a81d27eed6b..30d4c0505a9 100644
--- a/llvm/lib/ObjectYAML/ELFYAML.cpp
+++ b/llvm/lib/ObjectYAML/ELFYAML.cpp
@@ -894,10 +894,9 @@ struct NormalizedOther {
if (to_integer(Name, Val))
return Val;
- llvm::WithColor::error()
- << "an unknown value is used for symbol's 'Other' field: " << Name
- << ".\n";
- exit(1);
+ YamlIO.setError("an unknown value is used for symbol's 'Other' field: " +
+ Name);
+ return 0;
}
Optional<uint8_t> denormalize(IO &) {
@@ -942,7 +941,7 @@ struct NormalizedOther {
return Map;
}
- const IO &YamlIO;
+ IO &YamlIO;
Optional<std::vector<StOtherPiece>> Other;
std::string UnknownFlagsHolder;
};
OpenPOWER on IntegriCloud