Index: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h
===================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h
+++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.h
@@ -1101,6 +1101,7 @@
     // tail call. This will cause the optimizers to attempt to move, or
     // duplicate return instructions to help enable tail call optimizations.
     bool mayBeEmittedAsTailCall(const CallInst *CI) const override;
+    bool isMaskAndCmp0FoldingBeneficial(const Instruction &AndI) const override;
   }; // end class PPCTargetLowering
 
   namespace PPC {
Index: llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
===================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
+++ llvm/trunk/lib/Target/PowerPC/PPCISelLowering.cpp
@@ -13978,3 +13978,17 @@
   // If the function is local then we have a good chance at tail-calling it
   return getTargetMachine().shouldAssumeDSOLocal(*Caller->getParent(), Callee);
 }
+
+bool PPCTargetLowering::
+isMaskAndCmp0FoldingBeneficial(const Instruction &AndI) const {
+  const Value *Mask = AndI.getOperand(1);
+  // If the mask is suitable for andi. or andis. we should sink the and.
+  if (const ConstantInt *CI = dyn_cast<ConstantInt>(Mask)) {
+    int64_t ConstVal = CI->getZExtValue();
+    return isUInt<16>(ConstVal) ||
+      (isUInt<16>(ConstVal >> 16) && !(ConstVal & 0xFFFF));
+  }
+
+  // For non-constant masks, we can always use the record-form and.
+  return true;
+}
Index: llvm/trunk/test/CodeGen/PowerPC/test-and-cmp-folding.ll
===================================================================
--- llvm/trunk/test/CodeGen/PowerPC/test-and-cmp-folding.ll
+++ llvm/trunk/test/CodeGen/PowerPC/test-and-cmp-folding.ll
@@ -0,0 +1,53 @@
+; RUN: llc < %s -mtriple=powerpc64le-unknown-unknown -mcpu=pwr8 \
+; RUN:   -verify-machineinstrs | FileCheck %s
+declare void @free()
+
+define dso_local fastcc void @test2() {
+; CHECK-LABEL: test2
+entry:
+  switch i16 undef, label %sw.default [
+    i16 10, label %sw.bb52
+    i16 134, label %sw.bb54
+  ]
+
+sw.default:                                       ; preds = %entry
+  unreachable
+
+
+sw.bb52:                                          ; preds = %entry, %entry, %entry, %entry, %entry, %entry
+  br i1 undef, label %if.then14.i, label %sw.epilog.i642
+
+if.then14.i:                                      ; preds = %sw.bb52
+  %call39.i = call i64 @test() #3
+  %and.i126.i = and i64 %call39.i, 1
+  br i1 undef, label %dummy.exit.i, label %if.then.i.i.i636
+
+if.then.i.i.i636:                                 ; preds = %if.then14.i
+  %0 = load i8*, i8** undef, align 8
+  call void @free() #3
+  br label %dummy.exit.i
+
+dummy.exit.i:               ; preds = %if.then.i.i.i636, %if.then14.i
+; CHECK: # %dummy.exit.i
+; CHECK-NEXT: andi.
+; CHECK-NEXT: bc 12
+  %cond82.i = icmp eq i64 %and.i126.i, 0
+  br i1 %cond82.i, label %if.end50.i, label %dummy.exit
+
+if.end50.i:                                       ; preds = %dummy.exit.i
+  unreachable
+
+sw.epilog.i642:                                   ; preds = %sw.bb52
+  unreachable
+
+dummy.exit: ; preds = %dummy.exit.i
+  unreachable
+
+sw.bb54:                                          ; preds = %entry, %entry
+  call fastcc void @test3()
+  unreachable
+}
+
+declare dso_local fastcc void @test3()
+
+declare i64 @test()