diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2012-12-22 20:16:21 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2012-12-22 20:16:21 +0000 |
| commit | d1ff5f1ee2d0222c80f14a813efb8c71ee25bef4 (patch) | |
| tree | b12c63a4639709d47abe1752f841539870fdef80 | |
| parent | d482e1f4a6117a5e9322232f79d8e8cb045382fb (diff) | |
| download | src-d1ff5f1ee2d0222c80f14a813efb8c71ee25bef4.tar.gz src-d1ff5f1ee2d0222c80f14a813efb8c71ee25bef4.zip | |
Pull in r170353 from upstream llvm trunk:
Fix another SROA crasher, PR14601.
This was a silly oversight, we weren't pruning allocas which were used
by variable-length memory intrinsics from the set that could be widened
and promoted as integers. Fix that.
This should fix the following assertion failure:
Assertion failed: (CanSROA), function visitUsers, file
/usr/src/lib/clang/libllvmscalaropts/../../../contrib/llvm/lib/Transforms/Scalar/SROA.cpp,
line 2395.
Reported by: gerald
Notes
Notes:
svn path=/head/; revision=244598
| -rw-r--r-- | contrib/llvm/lib/Transforms/Scalar/SROA.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/lib/Transforms/Scalar/SROA.cpp b/contrib/llvm/lib/Transforms/Scalar/SROA.cpp index ccc2f7a77b3c..959b4e74c165 100644 --- a/contrib/llvm/lib/Transforms/Scalar/SROA.cpp +++ b/contrib/llvm/lib/Transforms/Scalar/SROA.cpp @@ -2224,7 +2224,7 @@ static bool isIntegerWideningViable(const DataLayout &TD, !canConvertValue(TD, ValueTy, AllocaTy)) return false; } else if (MemIntrinsic *MI = dyn_cast<MemIntrinsic>(I->U->getUser())) { - if (MI->isVolatile()) + if (MI->isVolatile() || !isa<Constant>(MI->getLength())) return false; if (MemTransferInst *MTI = dyn_cast<MemTransferInst>(I->U->getUser())) { const AllocaPartitioning::MemTransferOffsets &MTO |