[llvm] r195636 - Revert r195599 as it broke the builds.

[Bill Wendling]

Sorry about that! I fixed it in 195670.


On Mon, Nov 25, 2013 at 3:24 AM, Amara Emerson <amara.emerson at arm.com>wrote:

> Author: aemerson
> Date: Mon Nov 25 05:24:18 2013
> New Revision: 195636
>
> URL: http://llvm.org/viewvc/llvm-project?rev=195636&view=rev
> Log:
> Revert r195599 as it broke the builds.
>
> Removed:
>     llvm/trunk/test/CodeGen/X86/pr18023.ll
> Modified:
>     llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=195636&r1=195635&r2=195636&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Mon Nov 25
> 05:24:18 2013
> @@ -8692,11 +8692,6 @@ bool DAGCombiner::MergeConsecutiveStores
>          Index = STn;
>          break;
>        } else if (LoadSDNode *Ldn = dyn_cast<LoadSDNode>(NextInChain)) {
> -        if (Ldn->isVolatile()) {
> -          Index = NULL;
> -          break;
> -        }
> -
>          // Save the load node for later. Continue the scan.
>          AliasLoadNodes.push_back(Ldn);
>          NextInChain = Ldn->getChain().getNode();
>
> Removed: llvm/trunk/test/CodeGen/X86/pr18023.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr18023.ll?rev=195635&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/pr18023.ll (original)
> +++ llvm/trunk/test/CodeGen/X86/pr18023.ll (removed)
> @@ -1,29 +0,0 @@
> -; RUN: llc < %s -mtriple x86_64-apple-macosx10.9.0 | FileCheck %s
> -; PR18023
> -
> -; CHECK: movl $1, 4(%rax)
> -; CHECK: movl $1, 4(%rax)
> -; CHECK: movl $1, 4(%rax)
> -
> - at c = common global i32 0, align 4
> - at a = common global [3 x i32] zeroinitializer, align 4
> - at b = common global i32 0, align 4
> - at .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*, ...)
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20131125/e9c9f227/attachment.html>