summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-cov/TestingSupport.cpp
diff options
context:
space:
mode:
authorFangrui Song <maskray@google.com>2019-05-16 11:33:48 +0000
committerFangrui Song <maskray@google.com>2019-05-16 11:33:48 +0000
commita076ec54bee20c423cf710ea2818d01df84e28b0 (patch)
tree9349552e719590d0d902eb3e688645141e47d9e3 /llvm/tools/llvm-cov/TestingSupport.cpp
parent671fc5f3f44986f7d20c3fcf2126cfad39b1adaf (diff)
downloadbcm5719-llvm-a076ec54bee20c423cf710ea2818d01df84e28b0.tar.gz
bcm5719-llvm-a076ec54bee20c423cf710ea2818d01df84e28b0.zip
[Object] Change object::SectionRef::getContents() to return Expected<StringRef>
Expected<ArrayRef<uint8_t>> may be better but use Expected<StringRef> for now. Follow-up of D61781. llvm-svn: 360876
Diffstat (limited to 'llvm/tools/llvm-cov/TestingSupport.cpp')
-rw-r--r--llvm/tools/llvm-cov/TestingSupport.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/llvm/tools/llvm-cov/TestingSupport.cpp b/llvm/tools/llvm-cov/TestingSupport.cpp
index e2b86c0b79c..3ee318c9c64 100644
--- a/llvm/tools/llvm-cov/TestingSupport.cpp
+++ b/llvm/tools/llvm-cov/TestingSupport.cpp
@@ -69,9 +69,18 @@ int convertForTestingMain(int argc, const char *argv[]) {
uint64_t ProfileNamesAddress = ProfileNames.getAddress();
StringRef CoverageMappingData;
StringRef ProfileNamesData;
- if (CoverageMapping.getContents(CoverageMappingData) ||
- ProfileNames.getContents(ProfileNamesData))
+ if (Expected<StringRef> E = CoverageMapping.getContents())
+ CoverageMappingData = *E;
+ else {
+ consumeError(E.takeError());
return 1;
+ }
+ if (Expected<StringRef> E = ProfileNames.getContents())
+ ProfileNamesData = *E;
+ else {
+ consumeError(E.takeError());
+ return 1;
+ }
int FD;
if (auto Err = sys::fs::openFileForWrite(OutputFilename, FD)) {
OpenPOWER on IntegriCloud