wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DAGCombine: clamp hi bit in APInt::getBitsSet to avoid assertion 

rdar://12838504

llvm-svn: 169951
This commit is contained in:
Manman Ren 2012-12-12 01:13:50 +00:00
parent aeb17df802
commit 82751a105c
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
View File

@ -7433,7 +7433,8 @@ SDValue DAGCombiner::ReduceLoadOpStoreWidth(SDNode *N) {
// start at the previous one. // start at the previous one.
if (ShAmt % NewBW) if (ShAmt % NewBW)
ShAmt = (((ShAmt + NewBW - 1) / NewBW) * NewBW) - NewBW; ShAmt = (((ShAmt + NewBW - 1) / NewBW) * NewBW) - NewBW;
APInt Mask = APInt::getBitsSet(BitWidth, ShAmt, ShAmt + NewBW); APInt Mask = APInt::getBitsSet(BitWidth, ShAmt,
std::min(BitWidth, ShAmt + NewBW));
if ((Imm & Mask) == Imm) { if ((Imm & Mask) == Imm) {
APInt NewImm = (Imm & Mask).lshr(ShAmt).trunc(NewBW); APInt NewImm = (Imm & Mask).lshr(ShAmt).trunc(NewBW);
if (Opc == ISD::AND) if (Opc == ISD::AND)

19
llvm/test/CodeGen/X86/store_op_load_fold.ll
View File

@ -1,13 +1,30 @@
; RUN: llc < %s -march=x86 | not grep mov ; RUN: llc < %s -march=x86 | FileCheck %s
; ;
; Test the add and load are folded into the store instruction. ; Test the add and load are folded into the store instruction.
@X = internal global i16 0 ; <i16*> [#uses=2] @X = internal global i16 0 ; <i16*> [#uses=2]
define void @foo() nounwind { define void @foo() nounwind {
; CHECK: foo:
; CHECK-NOT: mov
; CHECK: add
; CHECK_NEXT: ret
%tmp.0 = load i16* @X ; <i16> [#uses=1] %tmp.0 = load i16* @X ; <i16> [#uses=1]
%tmp.3 = add i16 %tmp.0, 329 ; <i16> [#uses=1] %tmp.3 = add i16 %tmp.0, 329 ; <i16> [#uses=1]
store i16 %tmp.3, i16* @X store i16 %tmp.3, i16* @X
ret void ret void
} }
; rdar://12838504
%struct.S2 = type { i64, i16, [2 x i8], i8, [3 x i8], [7 x i8], i8, [8 x i8] }
@s2 = external global %struct.S2, align 16
define void @test2() nounwind uwtable ssp {
; CHECK: test2:
; CHECK: mov
; CHECK-NEXT: and
; CHECK-NEXT: ret
%bf.load35 = load i56* bitcast ([7 x i8]* getelementptr inbounds (%struct.S2* @s2, i32 0, i32 5) to i56*), align 16
%bf.clear36 = and i56 %bf.load35, -1125895611875329
store i56 %bf.clear36, i56* bitcast ([7 x i8]* getelementptr inbounds (%struct.S2* @s2, i32 0, i32 5) to i56*), align 16
ret void
}