[llvm-branch-commits] [llvm-branch] r128579 - in /llvm/branches/release_29: ./ lib/Transforms/Scalar/DeadStoreElimination.cpp test/Transforms/DeadStoreElimination/2011-03-25-DSEMiscompile.ll

[Bill Wendling]

Author: void
Date: Wed Mar 30 16:44:24 2011
New Revision: 128579

URL: http://llvm.org/viewvc/llvm-project?rev=128579&view=rev
Log:
Merging r128577

Added:
    llvm/branches/release_29/test/Transforms/DeadStoreElimination/2011-03-25-DSEMiscompile.ll
Modified:
    llvm/branches/release_29/   (props changed)
    llvm/branches/release_29/lib/Transforms/Scalar/DeadStoreElimination.cpp

Propchange: llvm/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 30 16:44:24 2011
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Pertwee:110850,110961
-/llvm/trunk:127239-127241,127263-127264,127298,127325,127328,127350-127351,127441,127464,127723,127726,127730-127734,127775,127780,127800,127858,127871-127872,127981,128041,128100,128194-128197,128203,128212,128217
+/llvm/trunk:127239-127241,127263-127264,127298,127325,127328,127350-127351,127441,127464,127723,127726,127730-127734,127775,127780,127800,127858,127871-127872,127981,128041,128100,128194-128197,128203,128212,128217,128577

Modified: llvm/branches/release_29/lib/Transforms/Scalar/DeadStoreElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/lib/Transforms/Scalar/DeadStoreElimination.cpp?rev=128579&r1=128578&r2=128579&view=diff
==============================================================================
--- llvm/branches/release_29/lib/Transforms/Scalar/DeadStoreElimination.cpp (original)
+++ llvm/branches/release_29/lib/Transforms/Scalar/DeadStoreElimination.cpp Wed Mar 30 16:44:24 2011
@@ -361,8 +361,10 @@
   //
   //        |--earlier--|
   //    |-----  later  ------|
+  //
+  // We have to be careful here as *Off is signed while *.Size is unsigned.
   if (EarlierOff >= LaterOff &&
-      EarlierOff + Earlier.Size <= LaterOff + Later.Size)
+      uint64_t(EarlierOff - LaterOff) + Earlier.Size <= Later.Size)
     return true;
 
   // Otherwise, they don't completely overlap.

Added: llvm/branches/release_29/test/Transforms/DeadStoreElimination/2011-03-25-DSEMiscompile.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/test/Transforms/DeadStoreElimination/2011-03-25-DSEMiscompile.ll?rev=128579&view=auto
==============================================================================
--- llvm/branches/release_29/test/Transforms/DeadStoreElimination/2011-03-25-DSEMiscompile.ll (added)
+++ llvm/branches/release_29/test/Transforms/DeadStoreElimination/2011-03-25-DSEMiscompile.ll Wed Mar 30 16:44:24 2011
@@ -0,0 +1,23 @@
+; RUN: opt < %s -basicaa -dse -S | FileCheck %s
+; PR9561
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32"
+target triple = "i386-apple-darwin9.8"
+
+ at A = external global [0 x i32]
+
+declare cc10 void @Func2(i32*, i32*, i32*, i32)
+
+define cc10 void @Func1(i32* noalias %Arg1, i32* noalias %Arg2, i32* %Arg3, i32 %Arg4) {
+entry:
+  store i32 add (i32 ptrtoint ([0 x i32]* @A to i32), i32 1), i32* %Arg2
+; CHECK: store i32 add (i32 ptrtoint ([0 x i32]* @A to i32), i32 1), i32* %Arg2
+  %ln2gz = getelementptr i32* %Arg1, i32 14
+  %ln2gA = bitcast i32* %ln2gz to double*
+  %ln2gB = load double* %ln2gA
+  %ln2gD = getelementptr i32* %Arg2, i32 -3
+  %ln2gE = bitcast i32* %ln2gD to double*
+  store double %ln2gB, double* %ln2gE
+; CHECK: store double %ln2gB, double* %ln2gE
+  tail call cc10 void @Func2(i32* %Arg1, i32* %Arg2, i32* %Arg3, i32 %Arg4) nounwind
+  ret void
+}