[llvm] 7dd4f03 - Use merge null and isa<> tests into isa_and_nonnull<>. NFCI.

[Simon Pilgrim via llvm-commits]

Author: Simon Pilgrim
Date: 2020-08-02T15:34:18+01:00
New Revision: 7dd4f03595d3687cab555d538c82a41f1c1043ce

URL: https://github.com/llvm/llvm-project/commit/7dd4f03595d3687cab555d538c82a41f1c1043ce
DIFF: https://github.com/llvm/llvm-project/commit/7dd4f03595d3687cab555d538c82a41f1c1043ce.diff

LOG: Use merge null and isa<> tests into isa_and_nonnull<>. NFCI.

Added: 
    

Modified: 
    llvm/lib/Target/X86/X86InstCombineIntrinsic.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/X86/X86InstCombineIntrinsic.cpp b/llvm/lib/Target/X86/X86InstCombineIntrinsic.cpp
index aea355a29731..c9e092e5deca 100644
--- a/llvm/lib/Target/X86/X86InstCombineIntrinsic.cpp
+++ b/llvm/lib/Target/X86/X86InstCombineIntrinsic.cpp
@@ -377,7 +377,7 @@ static Value *simplifyX86varShift(const IntrinsicInst &II,
   SmallVector<int, 8> ShiftAmts;
   for (int I = 0; I < NumElts; ++I) {
     auto *CElt = CShift->getAggregateElement(I);
-    if (CElt && isa<UndefValue>(CElt)) {
+    if (isa_and_nonnull<UndefValue>(CElt)) {
       ShiftAmts.push_back(-1);
       continue;
     }