Unrevert r195599 with testcase fix.

I'm not sure how it was checking for the wrong values...
PR18023.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195670 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2013-11-25 18:05:22 +00:00
parent bb0cd33b84
commit 5df09f0367
2 changed files with 36 additions and 0 deletions

View File

@ -8692,6 +8692,11 @@ bool DAGCombiner::MergeConsecutiveStores(StoreSDNode* St) {
Index = STn; Index = STn;
break; break;
} else if (LoadSDNode *Ldn = dyn_cast<LoadSDNode>(NextInChain)) { } else if (LoadSDNode *Ldn = dyn_cast<LoadSDNode>(NextInChain)) {
if (Ldn->isVolatile()) {
Index = NULL;
break;
}
// Save the load node for later. Continue the scan. // Save the load node for later. Continue the scan.
AliasLoadNodes.push_back(Ldn); AliasLoadNodes.push_back(Ldn);
NextInChain = Ldn->getChain().getNode(); NextInChain = Ldn->getChain().getNode();

View File

@ -0,0 +1,31 @@
; RUN: llc < %s -mtriple x86_64-apple-macosx10.9.0 | FileCheck %s
; PR18023
; CHECK: movabsq $4294967296, %rcx
; CHECK: movq %rcx, (%rax)
; CHECK: movl $1, 4(%rax)
; CHECK: movl $0, 4(%rax)
; CHECK: movq $1, 4(%rax)
@c = common global i32 0, align 4
@a = common global [3 x i32] zeroinitializer, align 4
@b = common global i32 0, align 4
@.str = private unnamed_addr constant [4 x i8] c"%d\0A\00", align 1
define void @func() {
store i32 1, i32* getelementptr inbounds ([3 x i32]* @a, i64 0, i64 1), align 4
store i32 0, i32* getelementptr inbounds ([3 x i32]* @a, i64 0, i64 0), align 4
%1 = load volatile i32* @b, align 4
store i32 1, i32* getelementptr inbounds ([3 x i32]* @a, i64 0, i64 1), align 4
store i32 0, i32* getelementptr inbounds ([3 x i32]* @a, i64 0, i64 1), align 4
%2 = load volatile i32* @b, align 4
store i32 1, i32* getelementptr inbounds ([3 x i32]* @a, i64 0, i64 1), align 4
store i32 0, i32* getelementptr inbounds ([3 x i32]* @a, i64 0, i64 2), align 4
%3 = load volatile i32* @b, align 4
store i32 3, i32* @c, align 4
%4 = load i32* getelementptr inbounds ([3 x i32]* @a, i64 0, i64 1), align 4
%call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([4 x i8]* @.str, i64 0, i64 0), i32 %4)
ret void
}
declare i32 @printf(i8*, ...)