diff options
| author | Dan Gohman <dan433584@gmail.com> | 2016-01-20 23:16:59 +0000 |
|---|---|---|
| committer | Dan Gohman <dan433584@gmail.com> | 2016-01-20 23:16:59 +0000 |
| commit | 760bef5e508c985bf9216d81adfc20a657d77611 (patch) | |
| tree | 3e2b0d38f819e7f1b5ad416b249034203f07697c /llvm/lib/CodeGen/SelectionDAG | |
| parent | 10badfc924871e020981a12705dcec9544912278 (diff) | |
| download | bcm5719-llvm-760bef5e508c985bf9216d81adfc20a657d77611.tar.gz bcm5719-llvm-760bef5e508c985bf9216d81adfc20a657d77611.zip | |
[SelectionDAG] Fix constant offset folding to avoid commuting non-commutative operators.
This fixes a miscompile in MultiSource/Benchmarks/MiBench/consumer-lame
introduced in r258296.
llvm-svn: 258366
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 33863f41732..1cd5cd8ac23 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -3312,8 +3312,9 @@ SDValue SelectionDAG::FoldConstantArithmetic(unsigned Opcode, SDLoc DL, EVT VT, // fold (add Sym, c) -> Sym+c if (GlobalAddressSDNode *GA = dyn_cast<GlobalAddressSDNode>(Cst1)) return FoldSymbolOffset(Opcode, VT, GA, Cst2); - if (GlobalAddressSDNode *GA = dyn_cast<GlobalAddressSDNode>(Cst2)) - return FoldSymbolOffset(Opcode, VT, GA, Cst1); + if (isCommutativeBinOp(Opcode)) + if (GlobalAddressSDNode *GA = dyn_cast<GlobalAddressSDNode>(Cst2)) + return FoldSymbolOffset(Opcode, VT, GA, Cst1); // For vectors extract each constant element into Inputs so we can constant // fold them individually. |
