diff options
| author | Chris Lattner <sabre@nondot.org> | 2011-01-12 01:52:23 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2011-01-12 01:52:23 +0000 |
| commit | d2e905027b3774bbc29562a5e3f64ad46bf6b0b8 (patch) | |
| tree | 0d46b68d656c87ab0d3fb251e3caf2b1d2c3aca7 | |
| parent | 2d5c0cd197454408531cd53e4dd65a431e07ba6f (diff) | |
revert r123146 which disabled code that wasn't the root cause
of the bootstrap miscompare issue.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123299 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Transforms/Scalar/MemCpyOptimizer.cpp | 2 | ||||
| -rw-r--r-- | test/Transforms/MemCpyOpt/form-memset.ll | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/lib/Transforms/Scalar/MemCpyOptimizer.cpp b/lib/Transforms/Scalar/MemCpyOptimizer.cpp index 3327b760a4..41e10ba858 100644 --- a/lib/Transforms/Scalar/MemCpyOptimizer.cpp +++ b/lib/Transforms/Scalar/MemCpyOptimizer.cpp @@ -391,8 +391,6 @@ Instruction *MemCpyOpt::tryMergingIntoMemset(Instruction *StartInst, Ranges.addStore(Offset, NextStore); } else { - break; - MemSetInst *MSI = cast<MemSetInst>(BI); if (MSI->isVolatile() || ByteVal != MSI->getValue() || diff --git a/test/Transforms/MemCpyOpt/form-memset.ll b/test/Transforms/MemCpyOpt/form-memset.ll index abb18cccdf..86fe6c4abd 100644 --- a/test/Transforms/MemCpyOpt/form-memset.ll +++ b/test/Transforms/MemCpyOpt/form-memset.ll @@ -173,24 +173,22 @@ entry: %0 = bitcast i32* %add.ptr to i8* tail call void @llvm.memset.p0i8.i64(i8* %0, i8 0, i64 11, i32 1, i1 false) ret void - ;; DISABLED ; CHECK: @test3 -; HECK-NOT: store -; CHECK-NOT: call void @llvm.memset.p0i8.i64(i8* %1, i8 0, i64 15, i32 4, i1 false) +; CHECK-NOT: store +; CHECK: call void @llvm.memset.p0i8.i64(i8* %1, i8 0, i64 15, i32 4, i1 false) } ; store followed by memset, different offset scenario define void @test4(i32* nocapture %P) nounwind ssp { entry: - ;; DISABLED store i32 0, i32* %P, align 4 %add.ptr = getelementptr inbounds i32* %P, i64 1 %0 = bitcast i32* %add.ptr to i8* tail call void @llvm.memset.p0i8.i64(i8* %0, i8 0, i64 11, i32 1, i1 false) ret void ; CHECK: @test4 -; HECK-NOT: store -; CHECK-NOT: call void @llvm.memset.p0i8.i64(i8* %1, i8 0, i64 15, i32 4, i1 false) +; CHECK-NOT: store +; CHECK: call void @llvm.memset.p0i8.i64(i8* %1, i8 0, i64 15, i32 4, i1 false) } declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i32, i1) nounwind |