From 03005d3f03811a7f5a4d1da143d876167215d910 Mon Sep 17 00:00:00 2001
From: Guozhi Wei <carrot@google.com>
Date: Fri, 25 May 2018 20:30:26 +0000
Subject: [CodeGenPrepare] Revert r331783

The patch r331783 caused regression in one of our internal application. So revert it now, will investigate it further.

llvm-svn: 333305
---
 llvm/lib/CodeGen/CodeGenPrepare.cpp | 41 -------------------------------------
 1 file changed, 41 deletions(-)

(limited to 'llvm/lib/CodeGen')

diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index cafcd37c339..0a8a054976a 100644
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -3390,47 +3390,6 @@ bool TypePromotionHelper::canGetThrough(const Instruction *Inst,
        (IsSExt && BinOp->hasNoSignedWrap())))
     return true;
 
-  // ext(and(opnd, cst)) --> and(ext(opnd), ext(cst))
-  if ((Inst->getOpcode() == Instruction::And ||
-       Inst->getOpcode() == Instruction::Or))
-    return true;
-
-  // ext(xor(opnd, cst)) --> xor(ext(opnd), ext(cst))
-  if (Inst->getOpcode() == Instruction::Xor) {
-    const ConstantInt *Cst = dyn_cast<ConstantInt>(Inst->getOperand(1));
-    // Make sure it is not a NOT.
-    if (Cst && !Cst->getValue().isAllOnesValue())
-      return true;
-  }
-
-  // zext(shrl(opnd, cst)) --> shrl(zext(opnd), zext(cst))
-  // It may change a poisoned value into a regular value, like
-  //     zext i32 (shrl i8 %val, 12)  -->  shrl i32 (zext i8 %val), 12
-  //          poisoned value                    regular value
-  // It should be OK since undef covers valid value.
-  if (Inst->getOpcode() == Instruction::LShr && !IsSExt)
-    return true;
-
-  // and(ext(shl(opnd, cst)), cst) --> and(shl(ext(opnd), ext(cst)), cst)
-  // It may change a poisoned value into a regular value, like
-  //     zext i32 (shl i8 %val, 12)  -->  shl i32 (zext i8 %val), 12
-  //          poisoned value                    regular value
-  // It should be OK since undef covers valid value.
-  if (Inst->getOpcode() == Instruction::Shl && Inst->hasOneUse()) {
-    const Instruction *ExtInst =
-        dyn_cast<const Instruction>(*Inst->user_begin());
-    if (ExtInst->hasOneUse()) {
-      const Instruction *AndInst =
-          dyn_cast<const Instruction>(*ExtInst->user_begin());
-      if (AndInst && AndInst->getOpcode() == Instruction::And) {
-        const ConstantInt *Cst = dyn_cast<ConstantInt>(AndInst->getOperand(1));
-        if (Cst &&
-            Cst->getValue().isIntN(Inst->getType()->getIntegerBitWidth()))
-          return true;
-      }
-    }
-  }
-
   // Check if we can do the following simplification.
   // ext(trunc(opnd)) --> ext(opnd)
   if (!isa<TruncInst>(Inst))
-- 
cgit v1.2.3