diff options
| author | Rui Ueyama <ruiu@google.com> | 2017-02-02 00:47:10 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2017-02-02 00:47:10 +0000 |
| commit | a9b29615fb01dff81231e7f8ff5df3bffd790b2d (patch) | |
| tree | 59ac179e38a646e8e5388a5cc14362cd1ae49653 /llvm/tools/llvm-readobj/COFFDumper.cpp | |
| parent | cb68f371845e8eda1a3f06570fa7604d123b5820 (diff) | |
| download | bcm5719-llvm-a9b29615fb01dff81231e7f8ff5df3bffd790b2d.tar.gz bcm5719-llvm-a9b29615fb01dff81231e7f8ff5df3bffd790b2d.zip | |
Re-submit r293820: Return Error instead of bool from mergeTypeStreams().
llvm-svn: 293847
Diffstat (limited to 'llvm/tools/llvm-readobj/COFFDumper.cpp')
| -rw-r--r-- | llvm/tools/llvm-readobj/COFFDumper.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/tools/llvm-readobj/COFFDumper.cpp b/llvm/tools/llvm-readobj/COFFDumper.cpp index c83655fe4d2..3d4ebc8a735 100644 --- a/llvm/tools/llvm-readobj/COFFDumper.cpp +++ b/llvm/tools/llvm-readobj/COFFDumper.cpp @@ -1086,8 +1086,10 @@ void COFFDumper::mergeCodeViewTypes(TypeTableBuilder &CVTypes) { error(object_error::parse_failed); } - if (!mergeTypeStreams(CVTypes, Types)) + if (auto EC = mergeTypeStreams(CVTypes, Types)) { + consumeError(std::move(EC)); return error(object_error::parse_failed); + } } } } |
