diff options
| author | Mitch Phillips <31459023+hctim@users.noreply.github.com> | 2020-06-24 13:55:28 -0700 |
|---|---|---|
| committer | Mitch Phillips <31459023+hctim@users.noreply.github.com> | 2020-06-24 14:40:45 -0700 |
| commit | 10045cbe01928d9281723c640c03984d540f9012 (patch) | |
| tree | 9fffcf5544f33de24fd3e5d97344c8ebce5ffdcd /llvm/lib/Bitcode/Reader/BitcodeReader.cpp | |
| parent | b7d41a11cd31388e8b542b2d881f5c9d7130b95e (diff) | |
| download | llvm-10045cbe01928d9281723c640c03984d540f9012.zip llvm-10045cbe01928d9281723c640c03984d540f9012.tar.gz llvm-10045cbe01928d9281723c640c03984d540f9012.tar.bz2 | |
Revert "[BitcodeReader] Fix DelayedShuffle handling for ConstantExpr shuffles."
Patch has a memory leak bug that broke the ASan buildbots. More info
available at: https://reviews.llvm.org/D80330
This reverts commit b5740105d270a2d76da8812cafb63e4b799ada73.
Diffstat (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp')
| -rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 1ee9f7b..a428416 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -2337,7 +2337,6 @@ Error BitcodeReader::parseConstants() { uint64_t Op0Idx; uint64_t Op1Idx; uint64_t Op2Idx; - unsigned CstNo; }; std::vector<DelayedShufTy> DelayedShuffles; while (true) { @@ -2351,6 +2350,9 @@ Error BitcodeReader::parseConstants() { case BitstreamEntry::Error: return error("Malformed block"); case BitstreamEntry::EndBlock: + if (NextCstNo != ValueList.size()) + return error("Invalid constant reference"); + // Once all the constants have been read, go through and resolve forward // references. // @@ -2363,7 +2365,6 @@ Error BitcodeReader::parseConstants() { uint64_t Op0Idx = DelayedShuffle.Op0Idx; uint64_t Op1Idx = DelayedShuffle.Op1Idx; uint64_t Op2Idx = DelayedShuffle.Op2Idx; - uint64_t CstNo = DelayedShuffle.CstNo; Constant *Op0 = ValueList.getConstantFwdRef(Op0Idx, OpTy); Constant *Op1 = ValueList.getConstantFwdRef(Op1Idx, OpTy); Type *ShufTy = @@ -2374,12 +2375,9 @@ Error BitcodeReader::parseConstants() { SmallVector<int, 16> Mask; ShuffleVectorInst::getShuffleMask(Op2, Mask); Value *V = ConstantExpr::getShuffleVector(Op0, Op1, Mask); - ValueList.assignValue(V, CstNo, DelayedShuffle.CurFullTy); + ValueList.assignValue(V, NextCstNo, DelayedShuffle.CurFullTy); + ++NextCstNo; } - - if (NextCstNo != ValueList.size()) - return error("Invalid constant reference"); - ValueList.resolveConstantForwardRefs(); return Error::success(); case BitstreamEntry::Record: @@ -2735,8 +2733,7 @@ Error BitcodeReader::parseConstants() { if (Record.size() < 3 || !OpTy) return error("Invalid record"); DelayedShuffles.push_back( - {OpTy, OpTy, CurFullTy, Record[0], Record[1], Record[2], NextCstNo}); - ++NextCstNo; + {OpTy, OpTy, CurFullTy, Record[0], Record[1], Record[2]}); continue; } case bitc::CST_CODE_CE_SHUFVEC_EX: { // [opty, opval, opval, opval] @@ -2746,8 +2743,7 @@ Error BitcodeReader::parseConstants() { if (Record.size() < 4 || !RTy || !OpTy) return error("Invalid record"); DelayedShuffles.push_back( - {OpTy, RTy, CurFullTy, Record[1], Record[2], Record[3], NextCstNo}); - ++NextCstNo; + {OpTy, RTy, CurFullTy, Record[1], Record[2], Record[3]}); continue; } case bitc::CST_CODE_CE_CMP: { // CE_CMP: [opty, opval, opval, pred] |