diff options
| -rw-r--r-- | lib/Transforms/Scalar/GVN.cpp | 1 | ||||
| -rw-r--r-- | test/Transforms/GVN/2007-07-26-InterlockingLoops.ll | 4 | ||||
| -rw-r--r-- | test/Transforms/GVN/2007-07-26-PhiErasure.ll | 2 | ||||
| -rw-r--r-- | test/Transforms/GVN/2007-07-31-NoDomInherit.ll | 2 | ||||
| -rw-r--r-- | test/Transforms/GVN/nonlocal.ll | 2 | ||||
| -rw-r--r-- | test/Transforms/GVN/rle-must-alias.ll | 2 | ||||
| -rw-r--r-- | test/Transforms/GVN/semidominated.ll | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp index 2081811f0d..cb2b06b7a6 100644 --- a/lib/Transforms/Scalar/GVN.cpp +++ b/lib/Transforms/Scalar/GVN.cpp @@ -1034,6 +1034,7 @@ bool GVN::processNonLocalLoad(LoadInst *LI, // Perform PHI construction. Value* v = GetValueForBlock(LI->getParent(), LI, BlockReplValues, true); LI->replaceAllUsesWith(v); + v->takeName(LI); if (isa<PointerType>(v->getType())) MD->invalidateCachedPointerInfo(v); toErase.push_back(LI); diff --git a/test/Transforms/GVN/2007-07-26-InterlockingLoops.ll b/test/Transforms/GVN/2007-07-26-InterlockingLoops.ll index 1dd1479b48..a9656352dd 100644 --- a/test/Transforms/GVN/2007-07-26-InterlockingLoops.ll +++ b/test/Transforms/GVN/2007-07-26-InterlockingLoops.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep {tmp17625 =} -; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep {tmp17631 =} +; RUN: llvm-as < %s | opt -gvn | llvm-dis | grep {tmp17625.* = phi i32. } +; RUN: llvm-as < %s | opt -gvn | llvm-dis | grep {tmp17631 = phi i32. } @last = external global [65 x i32*] ; <[65 x i32*]*> [#uses=1] diff --git a/test/Transforms/GVN/2007-07-26-PhiErasure.ll b/test/Transforms/GVN/2007-07-26-PhiErasure.ll index 52c5b8e7ec..4925df786d 100644 --- a/test/Transforms/GVN/2007-07-26-PhiErasure.ll +++ b/test/Transforms/GVN/2007-07-26-PhiErasure.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep {tmp298316 =} +; RUN: llvm-as < %s | opt -gvn | llvm-dis | grep {tmp298316 = phi i32 } %struct..0anon = type { i32 } %struct.FILE = type { i8*, i32, i32, i16, i16, %struct.__sbuf, i32, i8*, i32 (i8*)*, i32 (i8*, i8*, i32)*, i64 (i8*, i64, i32)*, i32 (i8*, i8*, i32)*, %struct.__sbuf, %struct.__sFILEX*, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 } diff --git a/test/Transforms/GVN/2007-07-31-NoDomInherit.ll b/test/Transforms/GVN/2007-07-31-NoDomInherit.ll index 5dbd34c0cd..6cb7785fcd 100644 --- a/test/Transforms/GVN/2007-07-31-NoDomInherit.ll +++ b/test/Transforms/GVN/2007-07-31-NoDomInherit.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -gvn | llvm-dis | grep tmp51.rle +; RUN: llvm-as < %s | opt -gvn | llvm-dis | grep {tmp47 = phi i32 } %struct.anon = type { i32 (i32, i32, i32)*, i32, i32, [3 x i32], i8*, i8*, i8* } @debug = external constant i32 ; <i32*> [#uses=0] diff --git a/test/Transforms/GVN/nonlocal.ll b/test/Transforms/GVN/nonlocal.ll index 1618d05efb..d93223131d 100644 --- a/test/Transforms/GVN/nonlocal.ll +++ b/test/Transforms/GVN/nonlocal.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep {DEAD =} +; RUN: llvm-as < %s | opt -gvn | llvm-dis | grep {%DEAD = phi i32. } define i32 @main(i32** %p) { block1: diff --git a/test/Transforms/GVN/rle-must-alias.ll b/test/Transforms/GVN/rle-must-alias.ll index e507556fe1..d23623e460 100644 --- a/test/Transforms/GVN/rle-must-alias.ll +++ b/test/Transforms/GVN/rle-must-alias.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -gvn | llvm-dis | grep {DEAD.rle = phi i32} +; RUN: llvm-as < %s | opt -gvn | llvm-dis | grep {DEAD = phi i32 } ; The %7 and %4 loads combine to make %DEAD unneeded. 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" target triple = "i386-apple-darwin7" diff --git a/test/Transforms/GVN/semidominated.ll b/test/Transforms/GVN/semidominated.ll index 95ee56a39c..5c11b06e73 100644 --- a/test/Transforms/GVN/semidominated.ll +++ b/test/Transforms/GVN/semidominated.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -gvn | llvm-dis | not grep {DEAD =} +; RUN: llvm-as < %s | opt -gvn | llvm-dis | grep {DEAD = phi i32 } define i32 @main(i32* %p) { block1: |