revert an accidental commit, this fixes the regression on test/CodeGen/X86/isel-sink.ll

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@59976 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Scalar/CodeGenPrepare.cpp b/lib/Transforms/Scalar/CodeGenPrepare.cpp
index b8664b0d4a1ca4c0ddc1a473ec6d4327945d81b3..5edaf2ee44a374b120f664055951b12637592458 100644 (file)
--- a/lib/Transforms/Scalar/CodeGenPrepare.cpp
+++ b/lib/Transforms/Scalar/CodeGenPrepare.cpp
@@ -208,7 +208,7 @@ void CodeGenPrepare::EliminateMostlyEmptyBlock(BasicBlock *BB) {
     while (PHINode *PN = dyn_cast<PHINode>(DestBB->begin())) {
       Value *NewVal = PN->getIncomingValue(0);
       // Replace self referencing PHI with undef, it must be dead.
-      if (NewVal == PN) NewVal = UndefValue::get(PN->getType());
+      //if (NewVal == PN) NewVal = UndefValue::get(PN->getType());
       PN->replaceAllUsesWith(NewVal);
       PN->eraseFromParent();
     }
@@ -572,9 +572,6 @@ static bool FindMaximalLegalAddressingMode(Value *Addr, const Type *AccessTy,
   if (Instruction *I = dyn_cast_or_null<Instruction>(AddrInst))
     AddrModeInsts.push_back(I);
 
-  if (AddrInst && !AddrInst->hasOneUse())
-    ;
-  else
   switch (Opcode) {
   case Instruction::PtrToInt:
     // PtrToInt is always a noop, as we know that the int type is pointer sized.