1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00

[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
This commit is contained in:
Dan Gohman 2016-01-20 23:16:59 +00:00
parent 0c74edaf2c
commit 2536ce124f
2 changed files with 21 additions and 2 deletions

View File

@ -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.

View File

@ -0,0 +1,18 @@
; RUN: llc < %s -asm-verbose=false | FileCheck %s
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
; Test that a constant consisting of a global symbol with a negative offset
; is properly folded and isel'd.
; CHECK-LABEL: negative_offset:
; CHECK: movl $G, %eax
; CHECK: notq %rax
; CHECK: addq %rdi, %rax
; CHECK: retq
@G = external global [8 x i32]
define i8* @negative_offset(i8* %a) {
%t = getelementptr i8, i8* %a, i64 sub (i64 -1, i64 ptrtoint ([8 x i32]* @G to i64))
ret i8* %t
}