diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-01-18 20:35:00 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-01-18 20:35:00 +0000 |
| commit | 753bbc96f851827237308e7bbc38ef7e720c749d (patch) | |
| tree | 9f8aa3d5d2b2c9957164dbea8f4cb05310957d55 /lib/Transforms/Scalar/CodeGenPrepare.cpp | |
| parent | 5ad046568e2dd0b8079c871577950810a9d62d0a (diff) | |
| download | external_llvm-753bbc96f851827237308e7bbc38ef7e720c749d.zip external_llvm-753bbc96f851827237308e7bbc38ef7e720c749d.tar.gz external_llvm-753bbc96f851827237308e7bbc38ef7e720c749d.tar.bz2 | |
Fix rdar://6505632, an llc crash on 483.xalancbmk
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62470 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Scalar/CodeGenPrepare.cpp')
| -rw-r--r-- | lib/Transforms/Scalar/CodeGenPrepare.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Transforms/Scalar/CodeGenPrepare.cpp b/lib/Transforms/Scalar/CodeGenPrepare.cpp index be7ed9c..59c6586 100644 --- a/lib/Transforms/Scalar/CodeGenPrepare.cpp +++ b/lib/Transforms/Scalar/CodeGenPrepare.cpp @@ -688,7 +688,8 @@ bool AddressingModeMatcher::MatchScaledValue(Value *ScaleReg, int64_t Scale, // to see if ScaleReg is actually X+C. If so, we can turn this into adding // X*Scale + C*Scale to addr mode. ConstantInt *CI; Value *AddLHS; - if (match(ScaleReg, m_Add(m_Value(AddLHS), m_ConstantInt(CI)))) { + if (isa<Instruction>(ScaleReg) && // not a constant expr. + match(ScaleReg, m_Add(m_Value(AddLHS), m_ConstantInt(CI)))) { TestAddrMode.ScaledReg = AddLHS; TestAddrMode.BaseOffs += CI->getSExtValue()*TestAddrMode.Scale; |