summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorFilipe Cabecinhas <me@filcab.net>2015-04-29 02:36:08 +0000
committerFilipe Cabecinhas <me@filcab.net>2015-04-29 02:36:08 +0000
commit6fe8aabd453fa0f791c78e772a602f91ae153ce2 (patch)
tree36cd7146280743776221e5bf126819cb59577cbd /llvm/lib
parentd8a1bcd0ade5f9d077383bd9ac7e146886439fb2 (diff)
downloadbcm5719-llvm-6fe8aabd453fa0f791c78e772a602f91ae153ce2.tar.gz
bcm5719-llvm-6fe8aabd453fa0f791c78e772a602f91ae153ce2.zip
Use an "early return" idiom for the error case. NFC
llvm-svn: 236080
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Bitcode/Reader/BitcodeReader.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index f11eba51e6c..b76b134b760 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -1475,20 +1475,18 @@ std::error_code BitcodeReader::ParseTypeTableBody() {
case bitc::TYPE_CODE_ARRAY: // ARRAY: [numelts, eltty]
if (Record.size() < 2)
return Error("Invalid record");
- if ((ResultTy = getTypeByID(Record[1])) &&
- ArrayType::isValidElementType(ResultTy))
- ResultTy = ArrayType::get(ResultTy, Record[0]);
- else
+ ResultTy = getTypeByID(Record[1]);
+ if (!ResultTy || !ArrayType::isValidElementType(ResultTy))
return Error("Invalid type");
+ ResultTy = ArrayType::get(ResultTy, Record[0]);
break;
case bitc::TYPE_CODE_VECTOR: // VECTOR: [numelts, eltty]
if (Record.size() < 2)
return Error("Invalid record");
- if ((ResultTy = getTypeByID(Record[1])) &&
- StructType::isValidElementType(ResultTy))
- ResultTy = VectorType::get(ResultTy, Record[0]);
- else
+ ResultTy = getTypeByID(Record[1]);
+ if (!ResultTy || !StructType::isValidElementType(ResultTy))
return Error("Invalid type");
+ ResultTy = VectorType::get(ResultTy, Record[0]);
break;
}
OpenPOWER on IntegriCloud